From 9c945355ee99e334aef316da050460089b63542b Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 30 Jan 2019 10:46:59 +0100
Subject: [PATCH] upating expected fuel consumption due to fix in driver model
---
.../Declaration/EngineInputDataTests.cs | 8 ++++----
.../Declaration/NaturalGasVehicles.cs | 4 ++--
.../VectoCoreTest/Integration/FuelTypesTest.cs | 18 +++++++++---------
.../Integration/TorqueLimitsTest.cs | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index be42fb5056..7e0be376e8 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.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
+ [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
]
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 8fc93a2b12..58fecf106f 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -65,8 +65,8 @@ 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.8, 700.4, TestName = "Class5 LNG 6"),
- TestCase(Class5NG, 6, TankSystem.Compressed, 258.6, 695.7, TestName = "Class5 CNG 6"),
+ 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"),
]
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 3d6302c740..93755b034e 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.000219919455699735, 0.000219919455699735, 26.3061549880066, 0.000688347896340172, 9390.5607583787,
+ 0.000219917746665248, 0.000219917746665248, 26.305950558044, 0.000688342547062226, 9390.48778260609,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
- 0.000219919455699735, 0.000222516929585952, 27.1362109251161, 0.000402755642550574, 5651.93001148319,
+ 0.000219917746665248, 0.000222515200366018, 27.1360000446364, 0.000402752512662493, 5651.88608929686,
TestName = "Ethanol/CI LH Low"),
TestCase(FuelType.DieselCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000254656206506391, 30.4612687208601, 0.000797073926365003, 10873.8200178229,
+ 0.000254729908208703, 0.000254729908208703, 30.4700847139597, 0.000797304612693239, 10876.9670805116,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000257663956976937, 31.4224337776753, 0.000466371762128257, 6544.66450721421,
+ 0.000254729908208703, 0.000257738529171796, 31.43152794778, 0.000466506737800951, 6546.55864096363,
TestName = "Ethanol/CI LH Ref"),
TestCase(FuelType.EthanolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000252917938885187, 32.1778548199983, 0.000531127671658892, 7410.49560933597,
+ 0.000254729908208703, 0.000252991137504206, 32.1871676214003, 0.000531281388758833, 7412.64032887325,
TestName = "Ethanol/PI LH Ref"),
TestCase(FuelType.PetrolPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000254656206506391, 34.0449473939025, 0.000774154867779428, 10568.2325700152,
+ 0.000254729908208703, 0.000254729908208703, 34.0548005626608, 0.000774378920954456, 10571.2911906612,
TestName = "Petrol/PI LH Ref"),
TestCase(FuelType.LPGPI, null,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000254656206506391, null, 0.0007690617436493, 11714.185499294,
+ 0.000254729908208703, 0.000254729908208703, null, 0.000769284322790282, 11717.5757776003,
TestName = "LPG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Liquefied,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000233910283369414, null, 0.000647931484933277, 11484.9949134382,
+ 0.000254729908208703, 0.000233977980859725, null, 0.000648119006981438, 11488.3188602125,
TestName = "LNG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Compressed,
@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
- 0.000254656206506391, 0.000239270727363297, null, 0.00064363825660727, 11484.9949134383,
+ 0.000254729908208703, 0.000239339976254428, null, 0.000643824536124411, 11488.3188602125,
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 06c95ad27a..ed8aa3a46d 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -258,9 +258,9 @@ namespace TUGraz.VectoCore.Tests.Integration
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.06219, view.Rows[3][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(224.26907, view.Rows[4][SummaryDataContainer.FCMAP_KM].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(254.53269, view.Rows[5][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);
}
[TestCase(EngineSpeedLimitJobATDecl)]
--
GitLab