From 18c3f3fcd2968deab3e212d988d000df40e7b7bc Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 20 Feb 2019 11:20:00 +0100
Subject: [PATCH] updated testcases with expected fuel consumption (slight
changes due to shorter effective traction interruption)
---
.../Declaration/EngineInputDataTests.cs | 8 ++++----
.../Declaration/NaturalGasVehicles.cs | 8 ++++----
.../VectoCoreTest/Integration/FuelTypesTest.cs | 18 +++++++++---------
.../Integration/TorqueLimitsTest.cs | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index 7e0be376e8..50730bd1bc 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.5317321, TestName = "Engine CF - NONE"),
- TestCase("CFRegPer", 1.2, 45.5317321 * 1.2, TestName = "Engine CF - CFRegPer"),
- TestCase("BFColdHot", 1.2, 45.5317321 * 1.2, TestName = "Engine CF - BFColdHod"),
- TestCase("CFNCV", 1.2, 45.5317321, TestName = "Engine CF - CFNCV") // has no influence - only for documentation purpose
+ [TestCase(null, 1.0, 45.542369, TestName = "Engine CF - NONE"),
+ TestCase("CFRegPer", 1.2, 45.542369 * 1.2, TestName = "Engine CF - CFRegPer"),
+ TestCase("BFColdHot", 1.2, 45.542369 * 1.2, TestName = "Engine CF - BFColdHod"),
+ TestCase("CFNCV", 1.2, 45.542369, 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 58fecf106f..bfa47d417a 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -63,10 +63,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[
- TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.8, TestName = "Class5 LNG 2"),
- TestCase(Class5NG, 2, TankSystem.Compressed, 259.5, 698.1, TestName = "Class5 CNG 2"),
- TestCase(Class5NG, 6, TankSystem.Liquefied, 252.9, 700.6, TestName = "Class5 LNG 6"),
- TestCase(Class5NG, 6, TankSystem.Compressed, 258.7, 696.0, TestName = "Class5 CNG 6"),
+ TestCase(Class5NG, 2, TankSystem.Liquefied, 253.8, 703.0, TestName = "Class5 LNG 2"),
+ TestCase(Class5NG, 2, TankSystem.Compressed, 259.6, 698.3, 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/FuelTypesTest.cs b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
index 93755b034e..8671217967 100644
--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -59,40 +59,40 @@ namespace TUGraz.VectoCore.Tests.Integration
[Category("Integration")]
[TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.000219917746665248, 0.000219917746665248, 26.305950558044, 0.000688342547062226, 9390.48778260609,
+ 0.000219921110821829, 0.000219921110821829, 26.3063529691184, 0.000688353076872326, 9390.63143209212,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.000219917746665248, 0.000222515200366018, 27.1360000446364, 0.000402752512662493, 5651.88608929686,
+ 0.000219921110821829, 0.000222518604256733, 27.1364151532601, 0.000402758673704687, 5651.97254812102,
TestName = "Ethanol/CI LH Low"),
TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000254729908208703, 30.4700847139597, 0.000797304612693239, 10876.9670805116,
+ 0.000254735249582656, 0.000254735249582656, 30.4707236342891, 0.000797321331193715, 10877.1951571794,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000257738529171796, 31.43152794778, 0.000466506737800951, 6546.55864096363,
+ 0.000254735249582656, 0.000257743933632844, 31.4321870283957, 0.000466516519875449, 6546.69591427425,
TestName = "Ethanol/CI LH Ref"),
TestCase(FuelType.EthanolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000252991137504206, 32.1871676214003, 0.000531281388758833, 7412.64032887325,
+ 0.000254735249582656, 0.00025299644241827, 32.1878425468536, 0.000531292529078366, 7412.7957628553,
TestName = "Ethanol/PI LH Ref"),
TestCase(FuelType.PetrolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000254729908208703, 34.0548005626608, 0.000774378920954456, 10571.2911906612,
+ 0.000254735249582656, 0.000254735249582656, 34.0555146500878, 0.000774395158731276, 10571.5128576802,
TestName = "Petrol/PI LH Ref"),
TestCase(FuelType.LPGPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000254729908208703, null, 0.000769284322790282, 11717.5757776003,
+ 0.000254735249582656, 0.000254735249582656, null, 0.000769300453739622, 11717.8214808022,
TestName = "LPG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Liquefied,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000233977980859725, null, 0.000648119006981438, 11488.3188602125,
+ 0.000254735249582656, 0.000233982887091198, null, 0.000648132597242618, 11488.5597561778,
TestName = "LNG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Compressed,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254729908208703, 0.000239339976254428, null, 0.000643824536124411, 11488.3188602125,
+ 0.000254735249582656, 0.000239344994920373, null, 0.000643838036335802, 11488.5597561779,
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 ed8aa3a46d..d62f0b7cdf 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -257,10 +257,10 @@ namespace TUGraz.VectoCore.Tests.Integration
Console.WriteLine(string.Join("; ", view.AsEnumerable().Select(x => x[SummaryDataContainer.FCMAP_KM].ToString().ToDouble())));
Assert.AreEqual(201.39195, view.Rows[0][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
Assert.AreEqual(239.28546, view.Rows[1][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(170.15249, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(183.03570, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(224.26897, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(254.53251, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(170.16912, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(183.03651, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(224.27081, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(254.52511, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
}
[TestCase(EngineSpeedLimitJobATDecl)]
--
GitLab