diff --git a/VectoCore/Models/LoggingObject.cs b/VectoCore/Models/LoggingObject.cs index a0199a7878f145ed447bfc3cd0981ed2ea68bf15..d1eb9209907bc908cb8416e3bdd8382e13263d09 100644 --- a/VectoCore/Models/LoggingObject.cs +++ b/VectoCore/Models/LoggingObject.cs @@ -6,9 +6,12 @@ namespace TUGraz.VectoCore.Models { protected Logger Log { get; private set; } + protected Logger GUILogger { get; private set; } + protected LoggingObject() { Log = LogManager.GetLogger(GetType().FullName); + GUILogger = LogManager.GetLogger("GUI"); } protected static Logger Logger<T>() diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs index c4158ff5ce7a74f518c569f11c0636d1fd224d0a..48c387b3bd37fb1b0ccf5a352301b815e2122f43 100644 --- a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs +++ b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs @@ -156,6 +156,7 @@ namespace TUGraz.VectoCore.Tests.Integration [TestMethod] public void Truck12t_LongHaulCycle_RefLoad_Declaration() { + // TODO: fails due to interpolaion failure in Gear 4 var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, @"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto"); factory.WriteModalResults = true; @@ -167,5 +168,21 @@ namespace TUGraz.VectoCore.Tests.Integration Assert.IsTrue(run.FinishedWithoutErrors); } + + [TestMethod] + public void Truck12t_UrbanDeliveryCycle_RefLoad_Declaration() + { + // TODO: fails due to interpolaion failure in Gear 4 + var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, + @"c:\Users\Technik\Downloads\12t Delivery Truck\12t Delivery Truck.vecto"); + factory.WriteModalResults = true; + factory.SumWriter = new SummaryFileWriter("Test.vsum"); + var runs = factory.SimulationRuns().ToArray(); + + var run = runs[7]; + run.Run(); + + Assert.IsTrue(run.FinishedWithoutErrors); + } } } \ No newline at end of file diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCoreTest/Models/Simulation/AuxTests.cs index 0e022023bfecdef387921ba4457a994c77815bb8..30f2cdd8a020eec123623bbff4e6663878abd4af 100644 --- a/VectoCoreTest/Models/Simulation/AuxTests.cs +++ b/VectoCoreTest/Models/Simulation/AuxTests.cs @@ -56,6 +56,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation for (var i = 0; i < 11; i++) { aux.OutPort().Request(t, dt, torque, speed); + dataWriter[ModalResultField.dist] = i.SI<Meter>(); container.CommitSimulationStep(t, dt); t += dt; } diff --git a/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCoreTest/Models/Simulation/SimulationTests.cs index 32651371daee687c3d2c77030400a069400f5e41..f13aa51927e7b6b112848ecb35d6bc199cd25dd8 100644 --- a/VectoCoreTest/Models/Simulation/SimulationTests.cs +++ b/VectoCoreTest/Models/Simulation/SimulationTests.cs @@ -63,8 +63,10 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var dataWriter = new ModalDataWriter(resultFileName, SimulatorFactory.FactoryMode.EngineOnlyMode); var sumWriter = new SummaryFileWriter(sumFileName); - var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, EngineOnlyJob) { SumWriter = sumWriter }; - + var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, EngineOnlyJob) { + SumWriter = sumWriter + }; + return factory.SimulationRuns().First(); } @@ -74,11 +76,14 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var sumWriter = new SummaryFileWriter(@"24t Coach.vsum"); var jobContainer = new JobContainer(sumWriter); - var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, @"TestData\Jobs\24t Coach EngineOnly.vecto"); + var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, + @"TestData\Jobs\24t Coach EngineOnly.vecto"); jobContainer.AddRuns(runsFactory); jobContainer.Execute(); + jobContainer.WaitFinished(); + ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\24t Coach.vsum", @"24t Coach.vsum"); ResultFileHelper.TestModFiles(new[] {