From 16bb80c257a1848f3c5a653344c2c5f4623c2455 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <quaritsch@ivt.tugraz.at> Date: Tue, 14 Mar 2023 16:01:19 +0100 Subject: [PATCH] correcting engine files: set cold hot balancing factor to 1 --- .../JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng | 2 +- .../JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng | 2 +- .../JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng | 2 +- .../JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng | 2 +- .../JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng | 2 +- .../JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng | 2 +- .../2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng | 2 +- .../JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng | 2 +- .../JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng | 2 +- .../JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng | 2 +- .../JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng | 2 +- .../JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng | 2 +- .../JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng | 2 +- .../2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng | 2 +- .../2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng | 2 +- .../2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng | 2 +- .../2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng index e19874dff8..de7baa3cc3 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng @@ -17,6 +17,6 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0 + "ColdHotBalancingFactor": 1.0 } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng index 70ecc246a4..34612a508a 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng @@ -16,6 +16,6 @@ "WHTC-Urban": 1.0097, "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, - "ColdHotBalancingFactor": 0.0 + "ColdHotBalancingFactor": 1.0 } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng index b5f4f4af1c..3fbbeb9f0e 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng index b5f4f4af1c..3fbbeb9f0e 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng index 8e16d939cd..48bcee7184 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng index e03e40c09f..00b7d37dfd 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW_WHR.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng index fc8573fb7d..e2602a8477 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng @@ -17,6 +17,6 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0 + "ColdHotBalancingFactor": 1.0 } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng index e19874dff8..de7baa3cc3 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng @@ -17,6 +17,6 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0 + "ColdHotBalancingFactor": 1.0 } } \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng index a39e20cd17..0e75bad7db 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "175kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng index 483b48264b..c4a51621a6 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "325kW.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng index acc44d479b..0cb3639d54 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng index 85eb5a35a8..cbe4df0c5e 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0, "WHTC-Motorway": 1.0, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng index 22a2d3a9e2..3aa1264128 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng index 830af9bcf3..60fc788afb 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 0.0, "WHTC-Motorway": 0.0, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "Group2_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng index 85eb5a35a8..cbe4df0c5e 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0, "WHTC-Motorway": 1.0, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng index 86732a1a88..e2abfd670a 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0035, "WHTC-Motorway": 1.0035, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng index 4f4e49114a..70cb5d25fc 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 1.0, "WHTC-Motorway": 1.0, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map_WHR.vmap", "FuelType": "DieselCI" diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng index 0a713cd0c3..e47d3115f0 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng @@ -17,7 +17,7 @@ "WHTC-Rural": 0.0, "WHTC-Motorway": 0.0, "WHTC-Engineering": 1.0090832895, - "ColdHotBalancingFactor": 0.0, + "ColdHotBalancingFactor": 1.0, "CFRegPer": 1.0, "FuelMap": "209kW_ICE_Map.vmap", "FuelType": "DieselCI" -- GitLab