From 692c63b0003ec4589f5d65885ecb65d75ec16e34 Mon Sep 17 00:00:00 2001
From: amogoda <david.amo-gonzalez@ext.ec.europa.eu>
Date: Wed, 15 Nov 2023 09:47:03 +0000
Subject: [PATCH] Remove duplicate EM map entries to fix Auxiliaries tests
---
.../VectoCoreTest/Integration/Auxiliaries.cs | 20 +++++++++----------
.../12SpeedGbx/GenericMap_140kW_936Nm.vemo | 1 -
.../GenericMap_140kW_936Nm.vemo | 1 -
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs b/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs
index 5184cfa73e..f054ce869f 100644
--- a/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs
+++ b/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs
@@ -111,13 +111,13 @@ namespace TUGraz.VectoCore.Tests.Integration
[Category("Integration")]
[
- TestCase(HYBRID_P2_Group_5, TestName = "GenericVehicle Group5 P2 Padd_hv"),
- TestCase(HYBRID_SerialHybrid_S2, TestName = "GenericVehicle S2 Job Padd_hv"),
- TestCase(HYBRID_SerialHybrid_S4, TestName = "GenericVehicle S4 Job Padd_hv"),
- TestCase(HYBRID_IEPC_S_GBX3, TestName = "IEPC-S 3 Speed Gearbox Padd_hv"),
- TestCase(HYBRID_IHPC_G5_12SPEED, TestName = "IHPC Group 5 12 Speed Gearbox Padd_hv"),
+ TestCase(HYBRID_P2_Group_5, TestName = "GenericVehicle Group5 P2 Padd_hv"),
+ TestCase(HYBRID_SerialHybrid_S2, TestName = "GenericVehicle S2 Job Padd_hv"),
+ TestCase(HYBRID_SerialHybrid_S4, TestName = "GenericVehicle S4 Job Padd_hv"),
+ TestCase(HYBRID_IEPC_S_GBX3, TestName = "IEPC-S 3 Speed Gearbox Padd_hv"),
+ TestCase(HYBRID_IHPC_G5_12SPEED, TestName = "IHPC Group 5 12 Speed Gearbox Padd_hv"),
]
- public void HighVoltageAuxiliaries_IncreaseConsumption_ForHybrid(String jobFile)
+ public void HighVoltageAuxiliaries_IncreaseConsumption_ForHybrid(string jobFile)
{
// Arrange.
var fileWriter = new FileOutputWriter(jobFile);
@@ -154,9 +154,9 @@ namespace TUGraz.VectoCore.Tests.Integration
string pWheelCycle = "PWheel";
AssertHVElectricAxuliariesForHybrids(summaryData, pWheelCycle);
- }
+ }
- private void AssertHVElectricAxuliaries(Dictionary<object, DataRow> summaryData, string drivingCycle)
+ private void AssertHVElectricAxuliaries(Dictionary<object, DataRow> summaryData, string drivingCycle)
{
string extendedSuffix = "Extended";
string cycle = $"{drivingCycle}.vdri";
@@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Tests.Integration
return;
}
- TestContext.WriteLine($"Testing cycle: {cycle}");
+ TestContext.WriteLine($"Tested cycle: {cycle}");
var absoluteTime = (ConvertedSI)summaryData[extendedCycle][SumDataFields.TIME];
@@ -192,7 +192,7 @@ namespace TUGraz.VectoCore.Tests.Integration
return;
}
- TestContext.WriteLine($"Testing cycle: {cycle}");
+ TestContext.WriteLine($"Tested cycle: {cycle}");
var absoluteTime = (ConvertedSI)summaryData[extendedCycle][SumDataFields.TIME];
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
index 029526d8db..b520ba77b6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
@@ -44,7 +44,6 @@ n [rpm] , T [Nm] , P_el [kW]
0.00,855.00,6.413
0.00,900.00,6.894
0.00,0.00,6.413
-0.00,0.00,5.946
29.70,-990.00,0.000
29.70,-945.00,0.000
29.70,-900.00,0.000
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo
index ddf2e473de..5e3d00ec31 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo
@@ -44,7 +44,6 @@ n [rpm] , T [Nm] , P_el [kW]
0.00,855.00,6.392
0.00,900.00,6.871
0.00,0.00,6.392
-0.00,0.00,5.926
29.60,-990.00,0.000
29.60,-945.00,0.000
29.60,-900.00,0.000
--
GitLab