diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs index aa78e2c8134211088851fa33c5493e8b88518594..75b1674888204c6aba330655833c28b3435c08ad 100644 --- a/VectoConsole/Properties/Version.cs +++ b/VectoConsole/Properties/Version.cs @@ -1,6 +1,6 @@ using System.Reflection; -// generated on 09.11.2015 10:21:43 -[assembly: AssemblyVersion("3.0.1.312")] -[assembly: AssemblyFileVersion("3.0.1.312")] +// generated on 11.11.2015 12:06:01 +[assembly: AssemblyVersion("3.0.1.314")] +[assembly: AssemblyFileVersion("3.0.1.314")] diff --git a/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs index f711e75172b179806442eaf1b717681ab6087721..365add8e0de8a7891c97656abaa9eddeb0912395 100644 --- a/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs +++ b/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs @@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl Log.Warn("distance field is not set!"); } else { var distance = (SI)writer[ModalResultField.dist]; - if (!distance.IsEqual(_currentState.Distance, 1e-6.SI<Meter>())) { + if (!distance.IsEqual(_currentState.Distance, 1e-12.SI<Meter>())) { Log.Warn("distance diverges: {0}, distance: {1}", (distance - _currentState.Distance).Value(), distance); } } diff --git a/VectoCore/Properties/Version.cs b/VectoCore/Properties/Version.cs index d1252b4226b28f046edfa9c7c817c807e2345380..a03ed8c29840ee658edc78d0d90a0ed4582bed44 100644 --- a/VectoCore/Properties/Version.cs +++ b/VectoCore/Properties/Version.cs @@ -1,5 +1,5 @@ using System.Reflection; -// generated on 09.11.2015 10:21:28 -[assembly: AssemblyVersion("3.0.1.312")] -[assembly: AssemblyFileVersion("3.0.1.312")] +// generated on 11.11.2015 12:05:58 +[assembly: AssemblyVersion("3.0.1.314")] +[assembly: AssemblyFileVersion("3.0.1.314")] diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs index 48c387b3bd37fb1b0ccf5a352301b815e2122f43..85c32a12b41cb95578fb499ef75fd7e0e7465a35 100644 --- a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs +++ b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs @@ -147,6 +147,7 @@ namespace TUGraz.VectoCore.Tests.Integration jobContainer.AddRuns(factory); jobContainer.Execute(); + jobContainer.WaitFinished(); foreach (var run in jobContainer.Runs) { Assert.IsTrue(run.Run.FinishedWithoutErrors); diff --git a/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs index bf03b90d46a275b6dfcd3972f429055e77523ff4..e04b2a2807cb83d67f573887fd266bb49922e7a7 100644 --- a/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs +++ b/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs @@ -48,7 +48,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent Tuple.Create((uint)i, new GearData { FullLoadCurve = FullLoadCurve.ReadFromFile(GearboxFullLoadCurveFile), - LossMap = TransmissionLossMap.ReadFromFile((i != 6) ? IndirectLossMap : DirectLossMap, ratio), + LossMap = TransmissionLossMap.ReadFromFile((i != 6) ? IndirectLossMap : DirectLossMap, ratio, + string.Format("Gear {0}", i)), Ratio = ratio, ShiftPolygon = ShiftPolygon.ReadFromFile(GearboxShiftPolygonFile) }))