From 9aa9d366f4f32fbda93bb35a60c0c284bbb85333 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 11 Apr 2022 10:23:13 +0200
Subject: [PATCH] updating testcases after changing whtc correction weighting
factors
---
.../Integration/Declaration/EngineInputDataTests.cs | 8 ++++----
.../Models/Declaration/DeclarationDataTest.cs | 6 +++---
.../Models/Simulation/DeclarationSimulationFactoryTest.cs | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index ad450866bf..b00b103ae2 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
@@ -66,10 +66,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- [TestCase(null, 1.0, 44.9120687, TestName = "Engine CF - NONE"),
- TestCase("CFRegPer", 1.2, 44.9120687 * 1.2, TestName = "Engine CF - CFRegPer"),
- TestCase("BFColdHot", 1.2, 44.9120687 * 1.2, TestName = "Engine CF - BFColdHod"),
- TestCase("CFNCV", 1.2, 44.9120687, TestName = "Engine CF - CFNCV") // has no influence - only for documentation purpose
+ [TestCase(null, 1.0, 44.96201185, TestName = "Engine CF - NONE"),
+ TestCase("CFRegPer", 1.2, 44.96201185 * 1.2, TestName = "Engine CF - CFRegPer"),
+ TestCase("BFColdHot", 1.2, 44.96201185 * 1.2, TestName = "Engine CF - BFColdHod"),
+ TestCase("CFNCV", 1.2, 44.96201185, 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/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index bc7e026ca4..a27e36cf25 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -129,9 +129,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var whtc = DeclarationData.WHTCCorrection;
var factors = new {
- urban = new[] { 0.11, 0.17, 0.69, 0.98, 0.62, 1.0, 1.0, 1.0, 0.45, 0.0 },
+ urban = new[] { 0.0, 0.17, 0.69, 0.98, 0.62, 1.0, 1.0, 1.0, 0.45, 0.0 },
rural = new[] { 0.0, 0.3, 0.27, 0.0, 0.32, 0.0, 0.0, 0.0, 0.36, 0.22 },
- motorway = new[] { 0.89, 0.53, 0.04, 0.02, 0.06, 0.0, 0.0, 0.0, 0.19, 0.78 }
+ motorway = new[] { 1.0, 0.53, 0.04, 0.02, 0.06, 0.0, 0.0, 0.0, 0.19, 0.78 }
};
var r = new Random();
@@ -148,7 +148,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void WHTCLookupTestLongHaul()
{
- var expected = 1.015501;
+ var expected = 1.0057;
var rural = 1.0265;
var urban = 1.0948;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
index 163948ede6..fd78a173dc 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
@@ -103,7 +103,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var runs = factory.SimulationRuns().ToArray();
- var expected = new[] { 1.018867, 1.018867, 1.018867, 1.018867, 1.013299, 1.013299, 1.013299, 1.013299 };
+ var expected = new[] { 1.02, 1.02, 1.02, 1.02, 1.013299, 1.013299, 1.013299, 1.013299 };
for (var i = 0; i < 8; i++)
Assert.AreEqual(
--
GitLab