diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs index b36d9440a8be6660a878cbfb452b791090729d37..aa78e2c8134211088851fa33c5493e8b88518594 100644 --- a/VectoConsole/Properties/Version.cs +++ b/VectoConsole/Properties/Version.cs @@ -1,6 +1,6 @@ using System.Reflection; -// generated on 07.11.2015 21:12:54 -[assembly: AssemblyVersion("3.0.1.310")] -[assembly: AssemblyFileVersion("3.0.1.310")] +// generated on 09.11.2015 10:21:43 +[assembly: AssemblyVersion("3.0.1.312")] +[assembly: AssemblyFileVersion("3.0.1.312")] diff --git a/VectoCore/Properties/Version.cs b/VectoCore/Properties/Version.cs index 3f913b040844e50d1f62d65b505304451f2a75cf..d1252b4226b28f046edfa9c7c817c807e2345380 100644 --- a/VectoCore/Properties/Version.cs +++ b/VectoCore/Properties/Version.cs @@ -1,5 +1,5 @@ using System.Reflection; -// generated on 07.11.2015 22:40:05 -[assembly: AssemblyVersion("3.0.1.310")] -[assembly: AssemblyFileVersion("3.0.1.310")] +// generated on 09.11.2015 10:21:28 +[assembly: AssemblyVersion("3.0.1.312")] +[assembly: AssemblyFileVersion("3.0.1.312")] diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs index 6e27ea4acbe2f40a25644aa6bbc8ce4f2c5d4346..104464d3d6bb66cddb165b95e2393f25c79e4b26 100644 --- a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs +++ b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs @@ -1,4 +1,5 @@ using System.IO; +using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using NLog; using TUGraz.VectoCore.Configuration; @@ -40,6 +41,22 @@ namespace TUGraz.VectoCore.Tests.Integration Assert.IsTrue(run.FinishedWithoutErrors); } + [TestMethod] + public void Truck40t_RegionalDeliveryCycle_RefLoad_Declaration() + { + var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, + @"c:\Users\Technik\Downloads\40t Long Haul Truck\40t_Long_Haul_Truck.vecto"); + factory.WriteModalResults = true; + factory.SumWriter = new SummaryFileWriter("Test.vsum"); + var runs = factory.SimulationRuns().ToArray(); + + var run = runs[4]; + run.Run(); + + Assert.IsTrue(run.FinishedWithoutErrors); + } + + [TestMethod] public void Truck40t_UrbanDeliveryCycle_RefLoad() { diff --git a/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCoreTest/Reports/SumWriterTest.cs index 2ed42e90ead614669dcf25fd5acd4cfe8be69858..e6bf52553d1dc477eb069d463771b40baab10ed5 100644 --- a/VectoCoreTest/Reports/SumWriterTest.cs +++ b/VectoCoreTest/Reports/SumWriterTest.cs @@ -1,6 +1,7 @@ using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using TUGraz.VectoCore.Models.Simulation.Data; +using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Utils; namespace TUGraz.VectoCore.Tests.Reports @@ -35,7 +36,7 @@ namespace TUGraz.VectoCore.Tests.Reports sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>()); - modData.Finish(); + modData.Finish(VectoRun.Status.Success); sumWriter.Finish(); var sumData = VectoCSVFile.Read("testsumcalc_fixed.vsum", false, true); @@ -83,7 +84,7 @@ namespace TUGraz.VectoCore.Tests.Reports sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>()); - modData.Finish(); + modData.Finish(VectoRun.Status.Success); sumWriter.Finish(); var sumData = VectoCSVFile.Read("testsumcalc_var.vsum", false, true);