Merge branch 'bugfix/VECTO-813-error-infinity-is-not-allowed-for-si-value'...

Merge branch 'bugfix/VECTO-813-error-infinity-is-not-allowed-for-si-value' into bugfix/VECTO-822-simulation-run-aborted-by-infinity

VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

@@ -198,7 +198,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			var halted = DataBus.DrivingAction == DrivingAction.Halt;
 			var driverDeceleratingNegTorque = DataBus.DriverBehavior == DrivingBehavior.Braking &&
-											(DataBus.BrakePower.IsGreater(0) || inTorque < 0);
+											(DataBus.BrakePower.IsGreater(0) || inTorque.IsSmaller(0));
 			var vehiclespeedBelowThreshold =
 				DataBus.VehicleSpeed.IsSmaller(Constants.SimulationSettings.ClutchDisengageWhenHaltingSpeed);
 			if (halted || (driverDeceleratingNegTorque && vehiclespeedBelowThreshold)) {

VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs

@@ -102,7 +102,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 				GearboxData = gearboxData,
 				EngineData = engineData,
 				AirdragData = airDragData,
-				SimulationType = SimulationType.DistanceCycle
+				SimulationType = SimulationType.DistanceCycle,
+				Cycle = cycleData
 			};
 
 			container.RunData = runData;

VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs

@@ -58,10 +58,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
-		[TestCase(null, 1.0, 45.53793),
-		TestCase("CFRegPer", 1.2, 45.53793 * 1.2),
-		TestCase("BFColdHot", 1.2, 45.53793 * 1.2),
-		TestCase("CFNCV", 1.2, 45.53793)  // has no influence - only for documentation purpose
+		[TestCase(null, 1.0, 45.5309587),
+		TestCase("CFRegPer", 1.2, 45.5309587 * 1.2),
+		TestCase("BFColdHot", 1.2, 45.5309587 * 1.2),
+		TestCase("CFNCV", 1.2, 45.5309587)  // has no influence - only for documentation purpose
 			]
 		public void TestEngineCorrectionFactors(string correctionFactor, double value, double expectedFc)
 		{

VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs

@@ -34,8 +34,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 		[
 		 TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.4),
 		 TestCase(Class5NG, 2, TankSystem.Compressed, 259.4, 697.7),
-		TestCase(Class5NG, 6, TankSystem.Liquefied, 252.7, 700.0),
-		TestCase(Class5NG, 6, TankSystem.Compressed, 258.5, 695.4),
+		TestCase(Class5NG, 6, TankSystem.Liquefied, 252.7, 699.8),
+		TestCase(Class5NG, 6, TankSystem.Compressed, 258.4, 695.4),
 			]
 		public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
 		{