Merge pull request #500 in VECTO/vecto-sim from...

Merge pull request #500 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-557-engine-speed-simulated-too-high to develop

* commit '3d349a6a':
  adapt testcases due to modified simulation of stop time

VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs

@@ -49,10 +49,10 @@ namespace TUGraz.VectoCore.Tests.Integration
 			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.00040262, 5652.5200,
 			TestName = "Ethanol LH Low"),
 		TestCase(FuelType.DieselCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0007971, 10877.1820,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0007971, 10876.9518,
 			TestName = "Diesel LH Ref"),
 		TestCase(FuelType.EthanolCI,
-			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004660, 6546.6880,
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004660, 6546.5494,
 			TestName = "Ethanol LH Ref"),]
 		public void TestFuelTypesCO2(FuelType fuelType, string jobName, int runIdx, double expectedCo2, double expectedMJ)
 		{
@@ -85,4 +85,4 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.AreEqual(expectedMJ, modContainer.EnergyPerMeter().Value(), 1e-3);
 		}
 	}
-}
\ No newline at end of file
+}

VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs

@@ -164,30 +164,19 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var startDistance = container.CycleStartDistance.Value();
 			var absTime = 0.SI<Second>();
 
-			// waiting time of 40 seconds is split up to 3 steps: 0.5, 39, 0.5
-			var response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
-			Assert.IsInstanceOfType(response, typeof(ResponseSuccess));
-			Assert.AreEqual(0, driver.LastRequest.TargetVelocity.Value(), Tolerance);
-			Assert.AreEqual(0.028416069495827, driver.LastRequest.Gradient.Value(), 1E-12);
-			Assert.AreEqual(0.5, driver.LastRequest.dt.Value(), Tolerance);
-			container.CommitSimulationStep(absTime, response.SimulationInterval);
-			absTime += response.SimulationInterval;
 
-			response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
-			Assert.IsInstanceOfType(response, typeof(ResponseSuccess));
-			Assert.AreEqual(0, driver.LastRequest.TargetVelocity.Value(), Tolerance);
-			Assert.AreEqual(0.028416069495827, driver.LastRequest.Gradient.Value(), 1E-12);
-			Assert.AreEqual(39, driver.LastRequest.dt.Value(), Tolerance);
-			container.CommitSimulationStep(absTime, response.SimulationInterval);
-			absTime += response.SimulationInterval;
+			IResponse response;
 
-			response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
-			Assert.IsInstanceOfType(response, typeof(ResponseSuccess));
-			Assert.AreEqual(0, driver.LastRequest.TargetVelocity.Value(), Tolerance);
-			Assert.AreEqual(0.028416069495827, driver.LastRequest.Gradient.Value(), 1E-12);
-			Assert.AreEqual(0.5, driver.LastRequest.dt.Value(), Tolerance);
-			container.CommitSimulationStep(absTime, response.SimulationInterval);
-			absTime += response.SimulationInterval;
+			// waiting 40s in 1s steps
+			for (var i = 0; i < 40; i++) {
+				response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
+				Assert.IsInstanceOfType(response, typeof(ResponseSuccess));
+				Assert.AreEqual(0, driver.LastRequest.TargetVelocity.Value(), Tolerance);
+				Assert.AreEqual(0.028416069495827, driver.LastRequest.Gradient.Value(), 1E-12);
+				Assert.AreEqual(1, driver.LastRequest.dt.Value(), Tolerance);
+				container.CommitSimulationStep(absTime, response.SimulationInterval);
+				absTime += response.SimulationInterval;
+			}
 
 			response = cycle.OutPort().Request(absTime, 1.SI<Meter>());
 
@@ -231,4 +220,4 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			absTime += response.SimulationInterval;
 		}
 	}
-}
\ No newline at end of file
+}