From 84f102a6aa160837931da7a53a69b6d9d55310d3 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Sat, 29 Dec 2018 16:11:55 +0100
Subject: [PATCH] adapt expected FC in testcases due to fix in gearbox
---
.../Declaration/EngineInputDataTests.cs | 8 ++++----
.../Declaration/NaturalGasVehicles.cs | 8 ++++----
.../VectoCoreTest/Integration/FuelTypesTest.cs | 18 +++++++++---------
.../Integration/TorqueLimitsTest.cs | 12 ++++++------
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index 1608900fd8..ad992367d9 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.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
+ [TestCase(null, 1.0, 45.52476184, TestName = "Engine CF - NONE"),
+ TestCase("CFRegPer", 1.2, 45.52476184 * 1.2, TestName = "Engine CF - CFRegPer"),
+ TestCase("BFColdHot", 1.2, 45.52476184 * 1.2, TestName = "Engine CF - BFColdHod"),
+ TestCase("CFNCV", 1.2, 45.52476184, 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 f1760d4ded..869ac7fbb1 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.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"),
+ 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.8, 700.4, TestName = "Class5 LNG 6"),
+ TestCase(Class5NG, 6, TankSystem.Compressed, 258.6, 695.7, 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 7fe1a54d7c..46175a7e03 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.307161, 0.0006886, 9390.92006,
+ 0.0002199424, 0.0002199424, 26.3060719, 0.0006886, 9390.531125,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.0002199424, 0.0002225401, 27.137249, 0.000402797, 5652.146266,
+ 0.0002199424, 0.0002225401, 27.136125, 0.000402797, 5651.912176,
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.4606493, 0.0007971, 10873.5989299,
+ 0.0002547295, 0.0002547295, 30.4611849, 0.0007971, 10873.790098,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.0002547295, 0.000257738, 31.4217948, 0.00046650, 6544.5314402,
+ 0.0002547295, 0.000257738, 31.4223473, 0.00046650, 6544.646499,
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.177200578, 0.0005312806, 7410.344938,
+ 0.0002547295, 0.00025299078, 32.17776628, 0.0005312806, 7410.475219,
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.044255, 0.0007743778, 10568.0176954,
+ 0.0002547295, 0.00025472954, 34.0448537, 0.0007743778, 10568.203491,
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.947325,
+ 0.0002547295, 0.0002547295, double.NaN, 0.00076928, 11714.1532673,
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.761399,
+ 0.0002547295, 0.00023397765, double.NaN, 0.00064811809, 11484.963312,
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.761399,
+ 0.0002547295, 0.0002393396, double.NaN, 0.000643823, 11484.963312,
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 bdaf479e09..1aedb2dd04 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -255,12 +255,12 @@ 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();
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);
+ 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.11718, view.Rows[2][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(183.02680, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(224.07271, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(254.35646, view.Rows[5][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
}
[TestCase(EngineSpeedLimitJobATDecl)]
--
GitLab