diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index e85dda0689b2847f816e082ca53ed9c29fc39d4f..88666ee92da983e7f72b228afb91a7fb2a15c771 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -100,7 +100,8 @@ namespace TUGraz.VectoCore.Tests.Integration
AirdragData = airdragData,
GearboxData = gearboxData,
EngineData = engineData,
- SimulationType = SimulationType.DistanceCycle
+ SimulationType = SimulationType.DistanceCycle,
+ Cycle = cycleData
};
container.RunData = runData;
cycle.AddComponent(new Driver(container, driverData, new DefaultDriverStrategy()))
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index df6189b37a2a06810a60e1ddd804152b5be584a0..1608900fd8e318a0a07f98adf8f5b6bcc0ac0b8d 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+++ b/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.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
+ [TestCase(null, 1.0, 45.5275128, TestName = "Engine CF - NONE"),
+ TestCase("CFRegPer", 1.2, 45.5275128 * 1.2, TestName = "Engine CF - CFRegPer"),
+ TestCase("BFColdHot", 1.2, 45.5275128 * 1.2, TestName = "Engine CF - BFColdHod"),
+ TestCase("CFNCV", 1.2, 45.5275128, TestName = "Engine CF - CFNCV") // has no influence - only for documentation purpose
]
public void TestEngineCorrectionFactors(string correctionFactor, double value, double expectedFc)
{
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 5b5b2483e3f3d1b3c06e0e5a94585ba9fdcdaf83..f1760d4ded3ffbe581b51de4aa2209dad2d023db 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -32,10 +32,10 @@ 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, 699.8),
- TestCase(Class5NG, 6, TankSystem.Compressed, 258.4, 695.4),
+ TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.9, TestName = "Class5 LNG 2"),
+ TestCase(Class5NG, 2, TankSystem.Compressed, 259.6, 698.2, TestName = "Class5 CNG 2"),
+ TestCase(Class5NG, 6, TankSystem.Liquefied, 253.0, 700.7, TestName = "Class5 LNG 6"),
+ TestCase(Class5NG, 6, TankSystem.Compressed, 258.8, 696.1, TestName = "Class5 CNG 6"),
]
public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
{
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
index 0fae5ebdca22ac5529c0dedde165c60574e3f95b..863a4b492877be9fef326025b173bd1a087c8fec 100644
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
+++ b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
@@ -62,8 +62,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
GraphWriter.Series1Label = "Vecto 3";
GraphWriter.Series2Label = "Vecto 2.2";
- Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
- }
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ }
private static string GetSlopeString(double slope)
{
diff --git a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
index 3db15189ec8d9256fd1bf90e30074af2c002b2ea..7fe1a54d7c76de2779d505cd316f5ba755e50ff0 100644
--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -58,40 +58,40 @@ namespace TUGraz.VectoCore.Tests.Integration
[Category("Integration")]
[TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.0002199424, 0.0002199424, 26.311041667, 0.0006886, 9392.305166,
+ 0.0002199424, 0.0002199424, 26.307161, 0.0006886, 9390.92006,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.0002199424, 0.0002225401, 27.1412517, 0.000402797, 5652.9799242,
+ 0.0002199424, 0.0002225401, 27.137249, 0.000402797, 5652.146266,
TestName = "Ethanol/CI LH Low"),
TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.0002547295, 30.4604632, 0.0007971, 10873.5324987,
+ 0.0002547295, 0.0002547295, 30.4606493, 0.0007971, 10873.5989299,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.000257738, 31.421602924, 0.00046650, 6544.4914570,
+ 0.0002547295, 0.000257738, 31.4217948, 0.00046650, 6544.5314402,
TestName = "Ethanol/CI LH Ref"),
TestCase(FuelType.EthanolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.00025299078, 32.177003992, 0.0005312806, 7410.299665,
+ 0.0002547295, 0.00025299078, 32.177200578, 0.0005312806, 7410.344938,
TestName = "Ethanol/PI LH Ref"),
TestCase(FuelType.PetrolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.00025472954, 34.04404719, 0.0007743778, 10567.9531310,
+ 0.0002547295, 0.00025472954, 34.044255, 0.0007743778, 10568.0176954,
TestName = "Petrol/PI LH Ref"),
TestCase(FuelType.LPGPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.0002547295, double.NaN, 0.00076928, 11713.8757597,
+ 0.0002547295, 0.0002547295, double.NaN, 0.00076928, 11713.947325,
TestName = "LPG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Liquefied,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.00023397765, double.NaN, 0.00064811809, 11484.69123399,
+ 0.0002547295, 0.00023397765, double.NaN, 0.00064811809, 11484.761399,
TestName = "LNG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Compressed,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.0002393396, double.NaN, 0.000643823, 11484.69123399,
+ 0.0002547295, 0.0002393396, double.NaN, 0.000643823, 11484.761399,
TestName = "CNG/PI LH Ref"),
]
public void TestFuelTypesCO2(FuelType fuelType, TankSystem? tankSystem, string jobName, int runIdx,
diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
index b57287d849de805ec7b9f071f361d9973b268f88..bdaf479e0910a5f18991a39622a04faf458cfffe 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System;
using System.Data;
using System.IO;
using System.Linq;
@@ -253,12 +254,13 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
var view = new DataView(sumData.Table, "", SummaryDataContainer.SORT, DataViewRowState.CurrentRows).ToTable();
- Assert.AreEqual(201.3972, view.Rows[0][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(239.2911, view.Rows[1][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(170.1334, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(183.0126, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(224.1216, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(254.3299, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Console.WriteLine(string.Join("; ", view.AsEnumerable().Select(x => x[SummaryDataContainer.FCMAP_KM].ToString().ToDouble())));
+ Assert.AreEqual(201.4184, view.Rows[0][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(239.1483, view.Rows[1][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(170.2168, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(183.0987, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(224.5330, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(254.7605, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
}
[TestCase(EngineSpeedLimitJobATDecl)]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index 4bd32375a629848bf95e0b145f5078d0b3c22b16..3ddeb15118463c27e67964cc67f22941565d0e2e 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -488,12 +488,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var response = gearbox.OutPort().Request(absTime, dt, outTorque, angularVelocity);
Assert.IsTrue(response.GetType() == responseType);
- if (responseType == typeof(ResponseSuccess)) {
- AssertHelper.AreRelativeEqual(absTime, port.AbsTime);
- AssertHelper.AreRelativeEqual(dt, port.Dt);
- AssertHelper.AreRelativeEqual(expectedN, port.AngularVelocity);
- AssertHelper.AreRelativeEqual(t, port.Torque, toleranceFactor: 1e-5);
- }
+ AssertHelper.AreRelativeEqual(absTime, port.AbsTime);
+ AssertHelper.AreRelativeEqual(dt, port.Dt);
+ AssertHelper.AreRelativeEqual(expectedN, port.AngularVelocity);
+ AssertHelper.AreRelativeEqual(t, port.Torque, toleranceFactor: 1e-5);
}
[TestCase(8, 7, 1800, 750, typeof(ResponseGearShift)),