From 42c1830bd2c8cd5ef9f0ed4207afe2c0ed72aa56 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 11 Nov 2015 14:05:28 +0100
Subject: [PATCH] update repo
---
VectoConsole/Properties/Version.cs | 6 +++---
VectoCore/Models/SimulationComponent/Impl/Vehicle.cs | 2 +-
VectoCore/Properties/Version.cs | 6 +++---
VectoCoreTest/Integration/FullCycleDeclarationTest.cs | 1 +
VectoCoreTest/Models/SimulationComponent/GearboxTest.cs | 3 ++-
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index aa78e2c813..75b1674888 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 f711e75172..365add8e0d 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 d1252b4226..a03ed8c298 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 48c387b3bd..85c32a12b4 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 bf03b90d46..e04b2a2807 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)
}))
--
GitLab