From ffd970fbf2f0d7f7e49f4da66ab869cb18f8e7f5 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Thu, 23 Feb 2023 14:20:53 +0100
Subject: [PATCH] setting legislative class to a valid value in all test files
---
VectoConsole/Components/24t Coach.vveh | 1 +
.../IEPCVehicle_Gbx1Axl.vveh | 2 +-
.../IEPCVehicle_Gbx1Whl1.vveh | 2 +-
.../IEPCVehicle_Gbx1Whl2.vveh | 2 +-
.../IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh | 2 +-
.../IEPCVehicle_Gbx3Axl.vveh | 12 +--
.../IEPCVehicle_Gbx3Whl1.vveh | 12 +--
.../IEPCVehicle_Gbx3Whl2.vveh | 12 +--
.../IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh | 2 +-
.../IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh | 12 +--
.../BatteryElectricVehicle.vveh | 24 ++---
.../BatteryElectricVehicle_Cont30kW.vveh | 22 ++--
.../BatteryElectricVehicle_PTO.vveh | 24 ++---
.../BEV_B2_Group5_LH_rl.vveh | 2 +-
.../BEV_B2_Group5_LH_rl.vveh | 2 +-
.../BEV_B2_Group5_LH_rl_APTP.vveh | 2 +-
.../BatteryElectricVehicle.vveh | 22 ++--
.../BatteryElectricVehicle_Cont30kW.vveh | 10 +-
.../BatteryElectricVehicle.vveh | 24 ++---
.../BatteryElectricVehicle_Cont30kW.vveh | 24 ++---
.../Components/12t Delivery Truck.vveh | 3 +-
.../TestData/Components/24t Coach.vveh | 5 +-
.../TestData/Components/24t CoachNoAng.vveh | 3 +-
.../Components/24t Coach_Ang_Efficiency.vveh | 5 +-
.../TestData/Components/24t Coach_NoAng.vveh | 3 +-
.../40t_Long_Haul_Truck AngleEfficiency.vveh | 3 +-
.../Components/40t_Long_Haul_Truck.vveh | 3 +-
.../Components/40t_Long_Haul_Truck_NoAng.vveh | 5 +-
.../Class4_40t_Long_Haul_Truck.vveh | 7 +-
.../E3/E3WithAxlegearInputRetarder.vveh | 2 +-
.../E3/E3WithoutAxlegearInputRetarder.vveh | 2 +-
.../S3/S3WithAxlegearInputRetarder.vveh | 2 +-
.../S3/S3WithoutAxlegearInputRetarder.vveh | 2 +-
.../40t_Long_Haul_Truck.vveh | 5 +-
.../Engineering Mode/24t Coach/24t Coach.vveh | 3 +-
.../BusAuxEngineeringMode/InterurbanBus.vveh | 3 +-
.../InterurbanBus_ESS.vveh | 2 +-
.../InterurbanBus_P1.vveh | 3 +-
.../CityBus_AT-P.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx1Axl.vveh | 20 ++--
.../IEPC-S_Vehicle_Gbx1Whl1.vveh | 20 ++--
.../IEPC-S_Vehicle_Gbx1Whl2.vveh | 20 ++--
.../IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx3Axl.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx3Whl1.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx3Whl2.vveh | 2 +-
.../IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh | 20 ++--
.../IEPC-S_Vehicle_Gbx3_drag.vveh | 2 +-
.../GenericIHPC/12SpeedGbx/Group5_HEV.vveh | 2 +-
.../GenericIHPC/6SpeedGbx/Group5_HEV.vveh | 2 +-
.../Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh | 2 +-
.../Class2_RigidTruck.vveh | 4 +-
.../Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 4 +-
.../Vehicle/Group5_HEV_2.vveh | 4 +-
.../GenericVehicle_Group5_P2/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 2 +-
.../Vehicle/Group5_HEV_EMLossMap_1.vveh | 2 +-
.../Vehicle/Group5_HEV_EMLossMap_2.vveh | 2 +-
.../Group5_HEV_LimitEMTorqueDrive.vveh | 4 +-
.../Group5_HEV_LimitVehiclePropTq.vveh | 4 +-
.../Group5_HEV_LimitVehiclePropTq_2.vveh | 4 +-
...oup5_HEV_LimitVehiclePropTq_TopTorque.vveh | 4 +-
.../Vehicle/Group5_HEV_noESS.vveh | 2 +-
.../Group5_HEV.vveh | 2 +-
.../Group5_HEV_2.vveh | 2 +-
.../GenericVehicle_Group5_P3/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 2 +-
.../Group5_HEV_LimitVehiclePropTq.vveh | 2 +-
.../Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 2 +-
.../Vehicle/Group5_HEV_noESS.vveh | 2 +-
.../GenericVehicle_Group5_P4/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 2 +-
.../Group5_HEV_LimitVehiclePropTq.vveh | 2 +-
.../Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 2 +-
.../Vehicle/Group5_HEV_noESS.vveh | 2 +-
.../GenericVehicle_P1-APT/CityBus_AT_PS.vveh | 2 +-
.../GenericVehicle_P1-APT/CityBus_AT_Ser.vveh | 2 +-
.../HEV_S2_Group5_LH_rl.vveh | 2 +-
.../HEV_S2_Group5_LH_rl.vveh | 2 +-
.../HEV_S2_Group5_LH_rl_APTS.vveh | 2 +-
.../SerialHybrid_S2.vveh | 18 ++--
.../SerialHybrid_S2_PTO.vveh | 18 ++--
.../GenericVehicle_Sx/BEV_E4_Group31a.vveh | 2 +-
.../SerialHybrid_S4.vveh | 2 +-
.../Hyb_P2_Group2/Class2_RigidTruck.vveh | 4 +-
.../Class2_RigidTruck.vveh | 4 +-
.../Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh | 2 +-
.../Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh | 2 +-
.../Group5EcoRollEng/Class5_Tractor.vveh | 7 +-
.../Class5_EcoRollEngineStop.vveh | 2 +-
.../Class5_EcoRollWithoutEngineStop.vveh | 2 +-
.../Group5PCCEng/Class5_NoADAS.vveh | 2 +-
.../Group5PCCEng/Class5_PCC12.vveh | 2 +-
.../Group5PCCEng/Class5_PCC123.vveh | 2 +-
.../Class5_PCC123EcoRollEngineStop.vveh | 2 +-
...Class5_PCC123EcoRollWithoutEngineStop.vveh | 2 +-
.../Group5EcoRollEng/Class5_Tractor.vveh | 6 +-
.../Class5_EcoRollEngineStop.vveh | 2 +-
.../Class5_EcoRollWithoutEngineStop.vveh | 2 +-
.../ADAS-HEV/Group5PCCEng/Class5_NoADAS.vveh | 2 +-
.../Class5_P25_PCC123EcoRollEngineStop.vveh | 4 +-
.../Class5_P3_PCC123EcoRollEngineStop.vveh | 2 +-
.../Class5_P4_PCC123EcoRollEngineStop.vveh | 2 +-
.../ADAS-HEV/Group5PCCEng/Class5_PCC12.vveh | 2 +-
.../ADAS-HEV/Group5PCCEng/Class5_PCC123.vveh | 2 +-
.../Class5_PCC123EcoRollEngineStop.vveh | 2 +-
...Class5_PCC123EcoRollWithoutEngineStop.vveh | 2 +-
.../VECTO-1484/P2_Group5_rep_Payload.vveh | 2 +-
.../ADAS-HEV/VECTO-1493/P1_Group31a.vveh | 4 +-
.../Group5PCCEng/Class5_E2_NoADAS.vveh | 2 +-
.../Group5PCCEng/Class5_E2_PCC12.vveh | 2 +-
.../Group5PCCEng/Class5_E2_PCC123.vveh | 2 +-
.../Group5PCCEng/Class5_E3_PCC123.vveh | 2 +-
.../Group5PCCEng/Class5_E4_PCC123.vveh | 2 +-
.../ADAS-PEV/VECTO-1483/E4_Group5_LH_ll.vveh | 2 +-
.../ADAS/Group5PCCEng/Class5_Tractor.vveh | 7 +-
.../Group5PCCEng/Class5_Tractor_PCC12.vveh | 7 +-
.../Group5PCCEng/Class5_Tractor_PCC123.vveh | 7 +-
.../Class5_Tractor_PCC123EcoSS.vveh | 7 +-
.../Buses/EngineeringMode/InterurbanBus.vveh | 1 +
.../12t Truck/12t Delivery Truck.vveh | 5 +-
.../GenericIHPC/12SpeedGbx/Group5_HEV.vveh | 2 +-
.../GenericIHPC/6SpeedGbx/Group5_HEV.vveh | 2 +-
.../P_HEV/Group2_P2/Class2_RigidTruck.vveh | 4 +-
.../P_HEV/Group2_P2_EM/Class2_RigidTruck.vveh | 2 +-
.../JSON/P_HEV/Group5_P2.5/Group5_HEV.vveh | 2 +-
.../JSON/P_HEV/Group5_P2.5/Group5_HEV_2.vveh | 4 +-
.../P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh | 4 +-
.../Group5_P2.5/Vehicle/Group5_HEV_2.vveh | 4 +-
.../JSON/P_HEV/Group5_P2/Group5_HEV.vveh | 2 +-
.../P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh | 2 +-
.../Group5_P2/Vehicle/Group5_HEV_325kW.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 2 +-
.../Vehicle/Group5_HEV_EMLossMap_1.vveh | 2 +-
.../Vehicle/Group5_HEV_EMLossMap_2.vveh | 2 +-
.../Group5_HEV_LimitEMTorqueDrive.vveh | 35 +++---
.../Group5_HEV_LimitVehiclePropTq.vveh | 4 +-
.../Group5_HEV_LimitVehiclePropTq_2.vveh | 4 +-
...oup5_HEV_LimitVehiclePropTq_TopTorque.vveh | 4 +-
.../Group5_P2/Vehicle/Group5_HEV_noESS.vveh | 2 +-
.../P_HEV/Group5_P2_BatSystem/Group5_HEV.vveh | 2 +-
.../Group5_P2_BatSystem/Group5_HEV_2.vveh | 2 +-
.../JSON/P_HEV/Group5_P3/Group5_HEV.vveh | 2 +-
.../P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh | 2 +-
.../Group5_HEV_LimitVehiclePropTq.vveh | 2 +-
.../JSON/P_HEV/Group5_P3_APT/Group5_HEV.vveh | 2 +-
.../Group5_P3_APT/Vehicle/Group5_HEV.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW.vveh | 2 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 2 +-
.../Vehicle/Group5_HEV_noESS.vveh | 8 +-
.../JSON/P_HEV/Group5_P4/Group5_HEV.vveh | 2 +-
.../P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh | 2 +-
.../Group5_HEV_LimitVehiclePropTq.vveh | 2 +-
.../Hyb_P2_Group2/Class2_RigidTruck.vveh | 4 +-
.../Class2_RigidTruck.vveh | 4 +-
.../P_HEV/Hyb_P2_Group5/Hyb_P2_Group5.vveh | 2 +-
.../Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh | 2 +-
.../JSON/P_HEV/P1-APT/CityBus_AT_PS.vveh | 2 +-
.../JSON/P_HEV/P1-APT/CityBus_AT_Ser.vveh | 2 +-
.../JSON/P_HEV/P4_APT/Group5_HEV.vveh | 2 +-
.../JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh | 6 +-
.../P4_APT/Vehicle/Group5_HEV_325kW.vveh | 6 +-
.../Vehicle/Group5_HEV_325kW_noESS.vveh | 6 +-
.../Group5_HEV_LimitEMTorqueDrive.vveh | 7 +-
.../P4_APT/Vehicle/Group5_HEV_noESS.vveh | 8 +-
.../IEPC-S_Vehicle_Gbx1Axl.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx1Whl1.vveh | 20 ++--
.../IEPC-S_Vehicle_Gbx1Whl2.vveh | 2 +-
.../IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh | 22 ++--
.../IEPC-S_Vehicle_Gbx3Axl.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx3Whl1.vveh | 2 +-
.../IEPC-S_Vehicle_Gbx3Whl2.vveh | 2 +-
.../IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh | 20 ++--
.../IEPC-S_Vehicle_Gbx3_drag.vveh | 2 +-
.../HEV_S2_Group5_LH_rl.vveh | 2 +-
.../HEV_S2_Group5_LH_rl_APTS.vveh | 2 +-
.../SerialHybrid_S4.vveh | 2 +-
.../GenericVehicle_Sx/BEV_E4_Group31a.vveh | 2 +-
.../S_HEV/S2_APTN/HEV_S2_Group5_LH_rl.vveh | 2 +-
.../JSON/S_HEV/S2_Job/SerialHybrid_S2.vveh | 101 ++++++++----------
.../S_HEV/S2_Job/SerialHybrid_S2_PTO.vveh | 18 ++--
.../JSON/S_HEV/Sx_Job/SerialHybrid_S4.vveh | 2 +-
.../40t Truck/40t_Long_Haul_Truck.vveh | 5 +-
.../Class2_RigidTruck.vveh | 5 +-
.../Class2_RigidTruck_NoAirdrag.vveh | 5 +-
.../Class2_RigidTruck.vveh | 3 +-
.../Class2_RigidTruck_NoAirdrag.vveh | 1 +
.../Class2_RigidTruck.vveh | 3 +-
.../Class2_RigidTruck.vveh | 3 +-
.../Class2_RigidTruck_tqLimit-850.vveh | 21 ++--
.../Class2_RigidTruck_tqLimit-910.vveh | 21 ++--
...igidTruck_tqLimit-disableGear1invalid.vveh | 7 +-
...igidTruck_tqLimit-disableGear4invalid.vveh | 7 +-
...igidTruck_tqLimit-disableGear5invalid.vveh | 7 +-
...lass2_RigidTruck_tqLimit-disableGear6.vveh | 7 +-
...Truck_tqLimit-disableGear6and4invalid.vveh | 9 +-
...2_RigidTruck_tqLimit-disableGear6and5.vveh | 9 +-
.../Class2_RigidTruck.vveh | 3 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 3 +-
.../Class5_Tractor_NoAirdrag.vveh | 5 +-
.../Class5_Tractor_primRet.vveh | 5 +-
.../Class5_Tractor_topTorque.vveh | 29 ++---
.../Class9_RigidTruck.vveh | 3 +-
.../Class9_RigidTruck_NoAirdrag.vveh | 3 +-
.../40t Truck/40t_Long_Haul_Truck.vveh | 1 +
.../40t_Long_Haul_Truck.vveh | 1 +
.../Vecto2.2/Coach/24t Coach.vveh | 1 +
.../Vecto2.2/Coach_Overspeed/24t Coach.vveh | 1 +
.../CityBus_AT/CityBus_AT_PS.vveh | 1 +
.../CityBus_AT/CityBus_AT_Ser.vveh | 1 +
.../Class2_RigidTruck.vveh | 3 +-
.../Class2_RigidTruck.vveh | 1 +
.../Class2_RigidTruck_tqLimit-850.vveh | 17 +--
.../Class2_RigidTruck_tqLimit-910.vveh | 17 +--
...igidTruck_tqLimit-disableGear1invalid.vveh | 7 +-
...igidTruck_tqLimit-disableGear4invalid.vveh | 7 +-
...igidTruck_tqLimit-disableGear5invalid.vveh | 7 +-
...lass2_RigidTruck_tqLimit-disableGear6.vveh | 7 +-
...Truck_tqLimit-disableGear6and4invalid.vveh | 9 +-
...2_RigidTruck_tqLimit-disableGear6and5.vveh | 9 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 3 +-
.../Class9_RigidTruck.vveh | 3 +-
.../P1_Group5_AMT/P1_Group5.vveh | 2 +-
.../P1_Group5_AMT/P1_Group5_ESSoff.vveh | 2 +-
.../Integration/FullPowerTrain/24t Coach.vveh | 1 +
.../MinimalPowerTrain/24t Coach.vveh | 1 +
.../CityBus_AT_FCOpt/CityBus_AT_PS.vveh | 3 +-
.../CityBus_AT_FCOpt/CityBus_AT_Ser.vveh | 3 +-
.../CityBus_AT_GSVoith/CityBus_AT_PS.vveh | 3 +-
.../CityBus_AT_GSVoith/CityBus_AT_Ser.vveh | 3 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 3 +-
.../IEPCVehicle_Gbx3Axl.vveh | 2 +-
.../IEPCVehicle_Gbx3Whl1.vveh | 2 +-
.../IEPCVehicle_Gbx3Whl2.vveh | 2 +-
.../IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh | 2 +-
.../BatteryElectricVehicle.vveh | 2 +-
.../BatteryElectricVehicle.vveh | 2 +-
.../BatteryElectricVehicle.vveh | 2 +-
.../TestData/MeasuredSpeed/Vehicle.vveh | 3 +-
.../TestData/MeasuredSpeed/VehicleAT.vveh | 1 +
.../TestData/MeasuredSpeed/VehicleVair.vveh | 3 +-
.../VectoCoreTest/TestData/Pwheel/Atego.vveh | 1 +
.../Class9_RigidTruck.vveh | 5 +-
.../Class9_RigidTruck_SideLoader.vveh | 5 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 3 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 9 +-
.../Class5_Tractor_angledrive.vveh | 9 +-
.../Class5_Tractor-FULL.vveh | 3 +-
.../Class5_Tractor_4x2/Class5_Tractor.vveh | 3 +-
258 files changed, 699 insertions(+), 631 deletions(-)
diff --git a/VectoConsole/Components/24t Coach.vveh b/VectoConsole/Components/24t Coach.vveh
index 5f1793c50a..08db92c084 100644
--- a/VectoConsole/Components/24t Coach.vveh
+++ b/VectoConsole/Components/24t Coach.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
+ "LegislativeClass": "M3",
"CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
index 3ecc37bf70..2c9a8cacfd 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
index bfe9e793fd..0d292bfd53 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
index d24e3cc1fb..d519d575c0 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
index 304087ef77..7572c880f2 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
index 3bf156969e..55d49f80f5 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -24,11 +24,11 @@
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 1
- }
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
],
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
index 3ca2ea6a86..e147c1c47a 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -24,11 +24,11 @@
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 1
- }
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
],
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
index 7ea4e7402a..d785cbcd96 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -24,11 +24,11 @@
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 1
- }
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
],
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
index 596d5f768f..174cb9a8d4 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
index d3b99d52c9..b1d61447eb 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -24,11 +24,11 @@
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 1
- }
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
],
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
index 880bb724f0..382361132b 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -17,18 +17,18 @@
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "B2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- }
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
index 940dd8d01b..69ad42ebee 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -18,17 +18,17 @@
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "B2",
- "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
- }
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B2",
+ "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
index 145ccc0323..64d94a00a4 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -17,18 +17,18 @@
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "B2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- }
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
index caf96e7215..4535b71d62 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
index caf96e7215..4535b71d62 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
index ccd0032781..889eb0f460 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
index 40f7f08ce9..c58622fc20 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,17 +25,17 @@
"VehicleHeight": 3.0,
"ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 8.56,
- "MechanicalEfficiency": 0.97,
- "Position": "B3",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- }
+ {
+ "Count": 2,
+ "Ratio": 8.56,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B3",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
index 12adf96870..d40561ae01 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -17,7 +17,7 @@
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
+ "ElectricMotors": [
{
"Count": 2,
"Ratio": 8.56,
@@ -26,9 +26,9 @@
"MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
}
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
index 74503285f5..4de6633ab5 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -17,18 +17,18 @@
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 22.6,
- "MechanicalEfficiency": 0.97,
- "Position": "B4",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- }
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 22.6,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B4",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
index 86df6d1a34..055faaa1d8 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -17,18 +17,18 @@
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 22.6,
- "MechanicalEfficiency": 0.97,
- "Position": "B4",
- "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
- }
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 22.6,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B4",
+ "MotorFile": "GenericEMotor_125kW_485Nm_Cont30kW.vem"
+ }
],
- "Battery": {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
},
"InitialSoC": 80,
"TorqueLimits": {},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh
index 49a23b3542..ab84883883 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 5850.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -32,7 +33,7 @@
"TwinTyres": false,
"RRCISO": 0.008343465,
"FzISO": 20800.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 6.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
index 0286a631b1..5bf9651bef 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
- "CurbWeight": 15700.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
"MassMax": 24.0,
@@ -23,7 +24,7 @@
"File": "Retarder.vrlm"
},
"Angledrive": {
- "Type" : "SeparateAngledrive",
+ "Type": "SeparateAngledrive",
"Ratio": 3.5,
"LossMap": "AngleGear.vtlm"
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
index d620cbafdb..b839bf58c0 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
- "CurbWeight": 15700.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
"MassMax": 24.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
index 1c26b4d2ba..3a7512f8a3 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
- "CurbWeight": 15700.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
"MassMax": 24.0,
@@ -23,7 +24,7 @@
"File": "Retarder.vrlm"
},
"Angledrive": {
- "Type" : "SeparateAngledrive",
+ "Type": "SeparateAngledrive",
"Ratio": 3.5,
"Efficiency": "0.95"
},
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
index d620cbafdb..b839bf58c0 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
- "CurbWeight": 15700.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
"MassMax": 24.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
index 50fdc0d3ec..3b7ceb548d 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "CurbWeight": 7100.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 40.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
index 3f63af3987..eb4483e5e0 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -25,7 +26,7 @@
"Angledrive": {
"Type": "SeparateAngledrive",
"Ratio": 1.0,
- "LossMap": "AngleGear.vtlm"
+ "LossMap": "AngleGear.vtlm"
},
"AxleConfig": {
"Type": "4x2",
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
index 21e4a64e6e..1d160ce752 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "CurbWeight": 7100.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 40.0,
@@ -32,7 +33,7 @@
"TwinTyres": false,
"RRCISO": 0.00555,
"FzISO": 31300.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Class4_40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/Class4_40t_Long_Haul_Truck.vveh
index 22522fd502..6d0386bc9c 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Class4_40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Class4_40t_Long_Haul_Truck.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "CurbWeight": 7100.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 40.0,
@@ -32,7 +33,7 @@
"TwinTyres": false,
"RRCISO": 0.00555,
"FzISO": 31300.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
@@ -41,7 +42,7 @@
"TwinTyres": true,
"RRCISO": 0.00628,
"FzISO": 31300.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
index fe20437262..9643ed0efc 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vveh
index 34ed6d8ab8..d2b7fdc0b6 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
index d6448dac8d..7e49b794b7 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
index a60756a243..1284dde6db 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
index 07111b495b..c20cfa9613 100644
--- a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -32,7 +33,7 @@
"TwinTyres": false,
"RRCISO": 0.00555,
"FzISO": 31300.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
@@ -41,7 +42,7 @@
"TwinTyres": true,
"RRCISO": 0.00628,
"FzISO": 31300.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
index 4aee343895..41573f7b40 100644
--- a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
- "CurbWeight": 15700.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
"MassMax": 24.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus.vveh
index e475077fd7..87bb860393 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "CurbWeight": 14800.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 14800.0,
"CurbWeightExtra": 0.0,
"Loading": 5170.0,
"MassMax": 25.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ESS.vveh
index 495317cde2..2da1ca4593 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 14800.0,
"CurbWeightExtra": 0.0,
"MassMax": 25.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_P1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_P1.vveh
index 2fb1ac246f..65eb063b32 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_P1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_P1.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "CurbWeight": 14800.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 14800.0,
"CurbWeightExtra": 0.0,
"Loading": 5170.0,
"MassMax": 25.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vveh
index a09afe3f63..f6489a47fa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12000.0,
"CurbWeightExtra": 0.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
index 66b2094898..f629507b14 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
index cfb13988ce..af6ad38a31 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
index 22a694626f..9a3083ec27 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
index 1f27defc73..415ed568d7 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
index 62b96216fe..1911395b05 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
index 94622846b5..217ba84930 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
index 9edc042110..9705d51694 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
index d01a2b7415..caa19395ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
index 822cf72445..3391ad04d5 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
index f4d4c6d0cc..87144d9aa3 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
index 913be3ea1b..19ef6f71ac 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
index 5d53dcbfdc..360eaac731 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 13200.0,
"CurbWeightExtra": 0.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
index 32e2582c0b..b0b75eade1 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"PowertrainConfiguration": "ParallelHybrid",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
@@ -69,7 +69,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh
index f5f6ad4d1e..37962a31f5 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
{
"Count": 1,
"RatioPerGear": [ 3.52, 3.52, 3.52, 3.52, 3.52, 3.52, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8 ],
- "Ratio": 1.0,
+ "Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2_5",
"MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh
index 1f9520e3c3..d0663b908a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
{
"Count": 1,
"RatioPerGear": [ 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125 ],
- "Ratio": 3.077,
+ "Ratio": 3.077,
"MechanicalEfficiency": 0.98,
"Position": "P2_5",
"MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_30kW_50Nm.vem"
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
index 21f48b43a3..66da3d8b96 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh
index 5c848bed49..e8207634d4 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
index 34fa21cb6c..49539eb0a2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
index 57a6896f41..b2a5825259 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
index 9494e16c98..ed92e6cf80 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index f7e5fa4810..93968c3e3f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,7 @@
"Cycle": ""
},
"TorqueLimits": {},
- "EMTorqueLimits": "EM_TorqueLimits.vemp",
+ "EMTorqueLimits": "EM_TorqueLimits.vemp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 0055426ec2..ba4ba43727 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,7 @@
"Cycle": ""
},
"TorqueLimits": {},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
index 2f481ca5a9..cd70eb7416 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,7 @@
"Cycle": ""
},
"TorqueLimits": {},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
index 5903da3fb6..1228944533 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -97,7 +97,7 @@
"11": 1900
},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf6..c5383241aa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV.vveh
index a9621a287d..dee1c393e8 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV_2.vveh
index 5c15ae2e6e..3d1e1cd872 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Group5_HEV_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh
index 963fff4dd0..06bd5d8fc6 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 7dcc15b80d..3e112db8b1 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh
index 963fff4dd0..06bd5d8fc6 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
index 28ec6d171f..0a79cf4f37 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 4b79088cb7..2887a95c0b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf6..c5383241aa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh
index 062b673831..ef22af7f3d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 628f825994..9923427b2f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Group5_HEV.vveh
index 0583f60a60..86e0f2065d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh
index 1f6a673ed5..7ccf0aaf73 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh
index 28ec6d171f..0a79cf4f37 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 4b79088cb7..2887a95c0b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf6..c5383241aa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
index 01711a12dc..400ad40c7c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
index 37e8118274..eb45c00c98 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
index 65f262813b..037524f24a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
index 65f262813b..037524f24a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
index eb1a89d768..6f71b7e420 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
index 2798829bcd..4f65a8a70f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -22,14 +22,14 @@
"Ratio": 1.0,
"File": ""
},
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "E2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- },
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ },
{
"Count": 1,
"Ratio": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh
index ea9889c7a7..5c5e01e04a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -22,14 +22,14 @@
"Ratio": 1.0,
"File": ""
},
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "E2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- },
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ },
{
"Count": 1,
"Ratio": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vveh
index 6242650fe4..814f1d6352 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vveh
index 348394003e..113f6214a9 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
index 7b37b82cfe..78dfe78367 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
@@ -36,7 +36,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
index 2784c11531..b0b1093842 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
@@ -36,7 +36,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
index f0c777b019..b73e722367 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
index 22ac011731..31df7e5d22 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor.vveh
index e9070625b0..bc784cedab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -16,9 +17,9 @@
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "EngineStopStart": false,
+ "EngineStopStart": false,
"EcoRoll": "WithoutEngineStop",
- "PredictiveCruiseControl": "none",
+ "PredictiveCruiseControl": "none",
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -44,7 +45,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollEngineStop.vveh
index fa2ee72ab3..1ba7b8b266 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
index 09e13559ea..cabe6684ef 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_NoADAS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_NoADAS.vveh
index 366b72a1ac..c0213953dd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_NoADAS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_NoADAS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC12.vveh
index db87930dd9..78b0f83d44 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC12.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC12.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123.vveh
index d5378f00c8..1230b7b441 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
index cde3723ef5..7940ec7b6b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
index 7b1eabb679..c744c2e175 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor.vveh
index de026e99b1..e3ce5fe603 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -37,7 +37,7 @@
"RRCISO": 0.0065,
"FzISO": 33350.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 19.2,
@@ -68,7 +68,7 @@
}
]
},
- "EngineStopStart": false,
+ "EngineStopStart": false,
"EcoRoll": "WithoutEngineStop",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollEngineStop.vveh
index 92ed7e4281..f1e12851b3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
index 6fb1308955..f17d263ed4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_EcoRollWithoutEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_NoADAS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_NoADAS.vveh
index 0cf69fa8af..e2a9c9147d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_NoADAS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_NoADAS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P25_PCC123EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P25_PCC123EcoRollEngineStop.vveh
index 5b38a20ff6..e5e80b477f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P25_PCC123EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P25_PCC123EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
"ElectricMotors": [
{
"Count": 1,
- "Ratio": 3.077,
+ "Ratio": 3.077,
"Position": "P2.5",
"MotorFile": "GenericEMotor_140kW_936Nm.vem",
"MechanicalEfficiency": 1.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P3_PCC123EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P3_PCC123EcoRollEngineStop.vveh
index 168a6beb5f..b1b4175cae 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P3_PCC123EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P3_PCC123EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P4_PCC123EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P4_PCC123EcoRollEngineStop.vveh
index 754975ef50..5d752f3827 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P4_PCC123EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_P4_PCC123EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC12.vveh
index 193f9b0549..b6dab28e2c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC12.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC12.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123.vveh
index 19f7e26856..9fa908c3f0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
index 1f2fa906e9..9947102307 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
index 9a59dfffc4..bd2dbca5a9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_PCC123EcoRollWithoutEngineStop.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1484/P2_Group5_rep_Payload.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1484/P2_Group5_rep_Payload.vveh
index 721494785f..2d3137bb47 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1484/P2_Group5_rep_Payload.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1484/P2_Group5_rep_Payload.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 7747.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh
index d8ef049f14..c408c9f836 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 11975,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
@@ -74,7 +74,7 @@
"MotorFile": "GenericEMotor.vem",
"MechanicalEfficiency": 0.98
}
- ],
+ ],
"Batteries": [
{
"NumPacks": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vveh
index 455b06e9e6..52e1129828 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vveh
index 0a6c6dd8a4..41471f2695 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vveh
index bf5fe6aa72..9bdb2eb63d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vveh
index cd5182d1b5..8851094dfd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vveh
index db56b4c08f..cb40b40596 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group5_LH_ll.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group5_LH_ll.vveh
index 758bc72cb8..e6929a2eb4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group5_LH_ll.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group5_LH_ll.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 9000.0,
"CurbWeightExtra": 7500.0,
"MassMax": 40.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor.vveh
index dcff67a1b0..9c34ddaecc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -16,9 +17,9 @@
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "EngineStopStart": false,
+ "EngineStopStart": false,
"EcoRoll": "none",
- "PredictiveCruiseControl": "1,2",
+ "PredictiveCruiseControl": "1,2",
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -44,7 +45,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC12.vveh
index 79f9738517..df8f642f05 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC12.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC12.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -16,9 +17,9 @@
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "EngineStopStart": false,
+ "EngineStopStart": false,
"EcoRoll": "none",
- "PredictiveCruiseControl": "Option_1_2",
+ "PredictiveCruiseControl": "Option_1_2",
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -44,7 +45,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123.vveh
index a6f5a36b68..18df36cee7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -16,9 +17,9 @@
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "EngineStopStart": false,
+ "EngineStopStart": false,
"EcoRoll": "none",
- "PredictiveCruiseControl": "Option_1_2_3",
+ "PredictiveCruiseControl": "Option_1_2_3",
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -44,7 +45,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh
index 5f439f3d39..60ef92d108 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -16,9 +17,9 @@
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "EngineStopStart": true,
+ "EngineStopStart": true,
"EcoRoll": "withEngineStop",
- "PredictiveCruiseControl": "Option_1_2_3",
+ "PredictiveCruiseControl": "Option_1_2_3",
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -52,7 +53,7 @@
"TwinTyres": true,
"RRCISO": 0.0065,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 19.2,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/InterurbanBus.vveh b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/InterurbanBus.vveh
index e475077fd7..d4c465d9d8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/InterurbanBus.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/InterurbanBus.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 14800.0,
"CurbWeightExtra": 0.0,
"Loading": 5170.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vveh
index b0777972db..462bdeece3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 5850.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -32,8 +33,8 @@
"TwinTyres": false,
"RRCISO": 0.008343465,
"FzISO": 20800.0,
- "Steered": true
-
+ "Steered": true
+
},
{
"Inertia": 6.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
index 4874a70c29..5e46487bce 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
index 0be795478f..3744d98277 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck.vveh
index 80a1ef698a..cf83b798b6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"PowertrainConfiguration": "ParallelHybrid",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
@@ -69,7 +69,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Class2_RigidTruck.vveh
index 7c28066d2b..9daa5f09bd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV_2.vveh
index 8ea974dab0..80edd0bf8b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Group5_HEV_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
{
"Count": 1,
"RatioPerGear": [ 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125 ],
- "Ratio": 3.077,
+ "Ratio": 3.077,
"MechanicalEfficiency": 0.98,
"Position": "P2_5",
"MotorFile": "GenericEMotor_30kW_50Nm.vem"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh
index ea33d0b37c..cd7fcbe718 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
{
"Count": 1,
"RatioPerGear": [ 3.52, 3.52, 3.52, 3.52, 3.52, 3.52, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8 ],
- "Ratio": 1.0,
+ "Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2_5",
"MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh
index d50e101931..8ca62f5833 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -96,7 +96,7 @@
{
"Count": 1,
"RatioPerGear": [ 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125, 1.0259, 0.8125 ],
- "Ratio": 3.077,
+ "Ratio": 3.077,
"MechanicalEfficiency": 0.98,
"Position": "P2_5",
"MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_30kW_50Nm.vem"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh
index 6c0a6d6d44..cc61ef8866 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh
index 2ae852382c..2486bfdea7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
index 4c63190fc4..d5f121b4c8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
index 14d46a0345..00e33fe2f8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
index 014d4853df..0329315b88 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index b14c2f2d29..ca50346c32 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,22 +89,25 @@
"Cycle": ""
},
"TorqueLimits": {},
- "EMTorqueLimits": "EM_TorqueLimits.vemp",
+ "EMTorqueLimits": {
+ "400": "EM_TorqueLimits.vemp",
+ "800": "EM_TorqueLimits.vemp"
+ },
"InitialSoC": 80.0,
- "PowertrainConfiguration": "ParallelHybrid",
- "MaxDrivetrainPower": 500000.0,
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1.0,
- "MechanicalEfficiency": 1.0,
- "Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "PowertrainConfiguration": "ParallelHybrid",
+ "MaxDrivetrainPower": 500000.0,
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "MechanicalEfficiency": 1.0,
+ "Position": "P2",
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
- ],
- "Battery": {
- "NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
- }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 6f57928ead..8acac2c37b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,7 @@
"Cycle": ""
},
"TorqueLimits": {},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
index b763c4fd0b..471edba719 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,7 @@
"Cycle": ""
},
"TorqueLimits": {},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
index 98afe6572f..2cb126ac86 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -97,7 +97,7 @@
"11": 1900
},
- "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
+ "MaxPropulsionTorque": "VehicleMaxPropulsionTorque_2.vtqp",
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh
index 0a20cd6767..4d430b031b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV.vveh
index 8640584526..2ccef63030 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV_2.vveh
index 8f06c981c3..42f9ac2cef 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Group5_HEV_2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh
index 3d2a7a750e..b4ccca37f4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 2fa7e23a2b..edb6d41dad 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh
index 3d2a7a750e..b4ccca37f4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
index 9c76aa596e..74a3b8e3ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 9495087a84..1d8e0ccf1e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
index 0a20cd6767..1ea59c6aca 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -97,13 +97,13 @@
"Count": 1,
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
- "Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "Position": "P3",
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh
index 519f00b321..b5969454c9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 75d1444f40..53e9c64264 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck.vveh
index 563f38b1ca..217e7e1e7c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
@@ -36,7 +36,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
index 5b415e6f8b..3ddb29e5a9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"MassMax": 11.99,
@@ -36,7 +36,7 @@
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven",
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 4.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5.vveh
index c2ccb9a343..bccf2cc18f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
index d9e2986620..ee366ce6ab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_PS.vveh
index 73eb80fae5..37b2ebae0d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_PS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_Ser.vveh
index 1f8d2b31a5..542fcb7d55 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/CityBus_AT_Ser.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Group5_HEV.vveh
index 85f6710915..93ca1065c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
index 8fde47f1df..fdc9ed199d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
index 9c76aa596e..b8d9f36dac 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 9495087a84..5bccfe9371 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index c13c24af47..6674d5d042 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -89,7 +89,10 @@
"Cycle": ""
},
"TorqueLimits": {},
- "EMTorqueLimits": "EM_TorqueLimits.vemp",
+ "EMTorqueLimits": {
+ "400": "EM_TorqueLimits.vemp",
+ "800": "EM_TorqueLimits.vemp"
+ },
"InitialSoC": 80.0,
"PowertrainConfiguration": "ParallelHybrid",
"MaxDrivetrainPower": 500000.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
index 0a20cd6767..23fec16889 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
@@ -97,13 +97,13 @@
"Count": 1,
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
- "Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "Position": "P4",
+ "MotorFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
index 14e68f6f63..90fd86231e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
index 76585bdb82..942933861c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
index b2e7ca0792..2c3d9dabc8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
index 598701dc40..cadaf63ead 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -24,16 +24,16 @@
"BatteryFile": "../Common/GenericBattery.vbat",
"StreamId": 0
}
- ],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
index b8bc21158f..4f0ed849d8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
index 4f0ac61252..689f5beead 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
index fb634f6a2a..7075f293e8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
index b75469c0de..1bfa700619 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -25,15 +25,15 @@
"StreamId": 0
}
],
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "../Common/GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
"InitialSoC": 80,
"TorqueLimits": {},
"IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
index 808359b35a..785c0f5d16 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
index 769374998a..a3621d019a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
index 45e977db5f..79b3b82ca3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/HEV_S2_Group5_LH_rl_APTS.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vveh
index c5633765b6..e67da9e6ad 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/BEV_E4_Group31a.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/BEV_E4_Group31a.vveh
index 90326d4e0f..620acfe0db 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/BEV_E4_Group31a.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/BEV_E4_Group31a.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/HEV_S2_Group5_LH_rl.vveh
index 769374998a..a3621d019a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/HEV_S2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/HEV_S2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 10143.4,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2.vveh
index 7086ccc5f6..75b0e45ffd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2.vveh
@@ -1,60 +1,28 @@
-{
+{
"Header": {
"CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
+ "Date": "2023-02-17T08:23:54.5137328Z",
"AppVersion": "3",
"FileVersion": 10
},
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
+ "CurbWeightExtra": 0.0,
"MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "SerialHybrid",
+ "Loading": 0.0,
+ "rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "Retarder": {
- "Type": "None",
- "Ratio": 1.0,
- "File": ""
- },
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "E2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- },
- {
- "Count": 1,
- "Ratio": 1,
- "Position": "GEN",
- "MotorFile": "GenericGen.vem",
- "MechanicalEfficiency": 1
- }
- ],
- "Batteries": [
- {
- "NumPacks": 1,
- "StreamId": 0,
- "BatteryFile": "GenericBattery.vreess"
- }
- ],
- "InitialSoC": 80,
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.2,
+ "AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
@@ -63,29 +31,11 @@
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.3,
+ "AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
}
]
},
@@ -94,6 +44,39 @@
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 4.83,
- "VehicleHeight": 3.0
+ "VehicleHeight": 3.0,
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "TankSystem": "Compressed",
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "SerialHybrid",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2.0,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem",
+ "MechanicalEfficiency": 0.97
+ },
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "Position": "GEN",
+ "MotorFile": "GenericGen.vem",
+ "MechanicalEfficiency": 1.0
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "GenericBattery.vreess",
+ "StreamId": 0
+ }
+ ],
+ "OvcHev": false,
+ "MaxChargingPower": 0.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_PTO.vveh
index fba8a6195b..1a0e9925c2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_PTO.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -22,14 +22,14 @@
"Ratio": 1.0,
"File": ""
},
- "ElectricMotors": [
- {
- "Count": 2,
- "Ratio": 2,
- "MechanicalEfficiency": 0.97,
- "Position": "E2",
- "MotorFile": "GenericEMotor_125kW_485Nm.vem"
- },
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ },
{
"Count": 1,
"Ratio": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/SerialHybrid_S4.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/SerialHybrid_S4.vveh
index 0e213268e6..b87cd97deb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/SerialHybrid_S4.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/SerialHybrid_S4.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "CityBus",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 12841.5,
"CurbWeightExtra": 0.0,
"MassMax": 19.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh
index b59ce775bc..f873701b36 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 7100.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -32,7 +33,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 31300.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
@@ -41,7 +42,7 @@
"TwinTyres": true,
"RRCISO": 0.0065,
"FzISO": 31300.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index 50c7841baf..25207b2885 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
@@ -50,7 +51,7 @@
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
- "Steered" : false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_NoAirdrag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_NoAirdrag.vveh
index 4dce2e29b3..89c8f8f0cf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_NoAirdrag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_NoAirdrag.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -40,7 +41,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 6.5,
@@ -49,7 +50,7 @@
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh
index f9fae5e0aa..839a09652f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh
index e4417aadc5..76bea6067e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxSpeedLimits/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxSpeedLimits/Class2_RigidTruck.vveh
index bcf8c35725..cea678bd5d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxSpeedLimits/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxSpeedLimits/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck.vveh
index bcf8c35725..cea678bd5d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
index fe485af8ad..c00113c3d2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,14 +32,14 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 850,
- "2": 850,
- "3": 850,
- "4": 850,
- "5": 850,
- "6": 850
- },
+ "TorqueLimits": {
+ "1": 850,
+ "2": 850,
+ "3": 850,
+ "4": 850,
+ "5": 850,
+ "6": 850
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -49,7 +50,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 6.5,
@@ -58,7 +59,7 @@
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
index 560b805e59..e7ad4ae51f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,14 +32,14 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 910,
- "2": 910,
- "3": 910,
- "4": 910,
- "5": 910,
- "6": 910
- },
+ "TorqueLimits": {
+ "1": 910,
+ "2": 910,
+ "3": 910,
+ "4": 910,
+ "5": 910,
+ "6": 910
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -49,7 +50,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 6.5,
@@ -58,7 +59,7 @@
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
- "Steered": false
+ "Steered": false
}
]
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
index 8549bfb7a2..c8f503ad13 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 0
- },
+ "TorqueLimits": {
+ "1": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
index a2c4e6d8ea..ba9b5e5749 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "4": 0
- },
+ "TorqueLimits": {
+ "4": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
index 78c46e88c5..d53cb98488 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "5": 0
- },
+ "TorqueLimits": {
+ "5": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
index 612fec3e78..7299714f6d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "6": 0
- },
+ "TorqueLimits": {
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
index 1ca045ec13..2e100b88d6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,10 +32,10 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "4": 0,
- "6": 0
- },
+ "TorqueLimits": {
+ "4": 0,
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
index c2a7815b4f..5938407799 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,10 +32,10 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "5": 0,
- "6": 0
- },
+ "TorqueLimits": {
+ "5": 0,
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_engineSpeedlimit/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_engineSpeedlimit/Class2_RigidTruck.vveh
index bcf8c35725..cea678bd5d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_engineSpeedlimit/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_engineSpeedlimit/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor.vveh
index c58ea89919..6bbd04b6db 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_NoAirdrag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_NoAirdrag.vveh
index d710eb812a..87648c42cf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_NoAirdrag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_NoAirdrag.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "CurbWeight": 8229.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 18.0,
@@ -40,7 +41,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_primRet.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_primRet.vveh
index d5c9bf98c9..14182c05a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_primRet.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_primRet.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
- "CurbWeight": 8229.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 18.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2_TopTorque/Class5_Tractor_topTorque.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2_TopTorque/Class5_Tractor_topTorque.vveh
index e6f03b92c6..96179c9667 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2_TopTorque/Class5_Tractor_topTorque.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2_TopTorque/Class5_Tractor_topTorque.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,19 +32,19 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 1950,
- "2": 1950,
- "3": 1950,
- "4": 1950,
- "5": 1950,
- "6": 1950,
- "7": 1950,
- "8": 1950,
- "9": 1950,
- "10": 1950,
- "11": 1950
- },
+ "TorqueLimits": {
+ "1": 1950,
+ "2": 1950,
+ "3": 1950,
+ "4": 1950,
+ "5": 1950,
+ "6": 1950,
+ "7": 1950,
+ "8": 1950,
+ "9": 1950,
+ "10": 1950,
+ "11": 1950
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -54,7 +55,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
index 6abcc695e6..73578668ad 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 9300.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -42,7 +43,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_NoAirdrag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_NoAirdrag.vveh
index b4eca959af..267ac6c869 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_NoAirdrag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_NoAirdrag.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 9300.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh
index 7b0030b58c..df396567dd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 7100.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh
index 7b0030b58c..df396567dd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 7100.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh
index 4825014ff1..c47b4a0242 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
+ "LegislativeClass": "M3",
"CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh
index 4825014ff1..c47b4a0242 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
+ "LegislativeClass": "M3",
"CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_PS.vveh
index 7d5e83d3e7..81cac2462c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_PS.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_Ser.vveh
index e9015588c1..bea5cb18f5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_Ser.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index 28a7c92d33..425c879ee7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 6.5,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck.vveh
index 9d06b4875b..86a3aea681 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
index 79a10a591c..d136d52b69 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-850.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,14 +32,14 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 850,
- "2": 850,
- "3": 850,
- "4": 850,
- "5": 850,
- "6": 850
- },
+ "TorqueLimits": {
+ "1": 850,
+ "2": 850,
+ "3": 850,
+ "4": 850,
+ "5": 850,
+ "6": 850
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
index 2802ed7d57..580b0557db 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-910.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -31,14 +32,14 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 910,
- "2": 910,
- "3": 910,
- "4": 910,
- "5": 910,
- "6": 910
- },
+ "TorqueLimits": {
+ "1": 910,
+ "2": 910,
+ "3": 910,
+ "4": 910,
+ "5": 910,
+ "6": 910
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
index 6d57e7ad9a..547a927e6b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear1invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "1": 0
- },
+ "TorqueLimits": {
+ "1": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
index 57726484df..f5c01b26b9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear4invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "4": 0
- },
+ "TorqueLimits": {
+ "4": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
index e1282c86a3..cd57ee9eb9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear5invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "5": 0
- },
+ "TorqueLimits": {
+ "5": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
index b3da9adf7f..677dbf8fbb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,9 +32,9 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "6": 0
- },
+ "TorqueLimits": {
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
index 14a7bbcd65..fa23e066e7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and4invalid.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,10 +32,10 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "4": 0,
- "6": 0
- },
+ "TorqueLimits": {
+ "4": 0,
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
index 3f2f72020c..27821c1b24 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_tqLimit-disableGear6and5.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
@@ -31,10 +32,10 @@
"LossMap": "",
"Cycle": ""
},
- "TorqueLimits": {
- "5": 0,
- "6": 0
- },
+ "TorqueLimits": {
+ "5": 0,
+ "6": 0
+ },
"AxleConfig": {
"Type": "4x2",
"Axles": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9cda1d6055..4ccd72e456 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
index 32eac5d477..684464c4f7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 9300.0,
"CurbWeightExtra": 2200.0,
"Loading": 7100.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh
index bf6783dea4..962aaa80f6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 7747,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_ESSoff.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_ESSoff.vveh
index 5ef57a2c37..9bfb51c560 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_ESSoff.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_ESSoff.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 7747.0,
"CurbWeightExtra": 7500.0,
"MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh
index 1e043b9b28..f2022929e5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
+ "LegislativeClass": "M3",
"CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh
index 1e043b9b28..f2022929e5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Coach",
+ "LegislativeClass": "M3",
"CurbWeight": 15700.0,
"CurbWeightExtra": 0.0,
"Loading": 3300.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vveh
index 7e831d05b7..fc33ab97ab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vveh
@@ -8,12 +8,13 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
"MassMax": 11.99,
"CdA": 4.83,
- "VehicleHeight": 4,
+ "VehicleHeight": 4,
"rdyn": 421.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vveh
index 3c939dfce6..59dbd9e7fc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vveh
@@ -8,12 +8,13 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
"MassMax": 11.99,
"CdA": 4.83,
- "VehicleHeight": 4,
+ "VehicleHeight": 4,
"rdyn": 421.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_PS.vveh
index 7e831d05b7..fc33ab97ab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_PS.vveh
@@ -8,12 +8,13 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
"MassMax": 11.99,
"CdA": 4.83,
- "VehicleHeight": 4,
+ "VehicleHeight": 4,
"rdyn": 421.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_Ser.vveh
index 3c939dfce6..59dbd9e7fc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_Ser.vveh
@@ -8,12 +8,13 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "CityBus",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
"MassMax": 11.99,
"CdA": 4.83,
- "VehicleHeight": 4,
+ "VehicleHeight": 4,
"rdyn": 421.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9cda1d6055..4ccd72e456 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
index 3bf156969e..c22846f485 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
index 3ca2ea6a86..ef547f89f3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
index 7ea4e7402a..f9d698aea8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
index 596d5f768f..174cb9a8d4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh
index 880bb724f0..82cf435bbf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh
index 40f7f08ce9..cabfe90278 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh
index 74503285f5..d8d9931bd7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
+ "LegislativeClass": "M3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh
index 64e546f5c6..4092988361 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "CurbWeight": 8862.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 8862.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 11.9,
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleAT.vveh b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleAT.vveh
index 2da3ae2b59..b38f1760a1 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleAT.vveh
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleAT.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Citybus",
+ "LegislativeClass": "M3",
"CurbWeight": 17000.0,
"CurbWeightExtra": 0.0,
"Loading": 4800.0,
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh
index 8251e4239e..be3a380462 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh
@@ -8,7 +8,8 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
- "CurbWeight": 8862.0,
+ "LegislativeClass": "M3",
+ "CurbWeight": 8862.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 11.9,
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh b/VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh
index 71dc0171f0..320c4d5eea 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 12000.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
index 39c05e27fb..aecbc339f6 100644
--- a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 9300.0,
"CurbWeightExtra": 2200.0,
"Loading": 7100.0,
@@ -17,7 +18,7 @@
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"GearDuringPTODrive": 4,
- "EngineSpeedDuringPTODrive": 1000,
+ "EngineSpeedDuringPTODrive": 1000,
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -43,7 +44,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_SideLoader.vveh b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_SideLoader.vveh
index 303a402526..7bc076b69b 100644
--- a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_SideLoader.vveh
+++ b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_SideLoader.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
"CurbWeight": 9300.0,
"CurbWeightExtra": 2200.0,
"Loading": 7100.0,
@@ -17,7 +18,7 @@
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"GearDuringPTODrive": 4,
- "EngineSpeedDuringPTODrive": 1000,
+ "EngineSpeedDuringPTODrive": 1000,
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
@@ -44,7 +45,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered": true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/XML/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9cda1d6055..4ccd72e456 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/XML/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor.vveh
index c1ca5d7bda..44b7c86783 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -27,9 +28,9 @@
"LossMap": ""
},
"PTO": {
- "Type": "None",
- "LossMap": "",
- "Cycle": ""
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
},
"IdlingSpeed": 900.0,
"AxleConfig": {
@@ -42,7 +43,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_angledrive.vveh b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_angledrive.vveh
index 99006bf02a..f254e428b2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_angledrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_angledrive.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": true,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 0.0,
"Loading": 0.0,
@@ -27,9 +28,9 @@
"LossMap": "Axle_4x2_Tractor.vtlm"
},
"PTO": {
- "Type": "None",
- "LossMap": "",
- "Cycle": ""
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
},
"IdlingSpeed": 900.0,
"AxleConfig": {
@@ -42,7 +43,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor-FULL.vveh b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor-FULL.vveh
index 0c2f89126f..96299b7042 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor-FULL.vveh
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor-FULL.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9cda1d6055..4ccd72e456 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -8,6 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehCat": "Tractor",
+ "LegislativeClass": "M3",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
"Loading": 19300.0,
@@ -41,7 +42,7 @@
"TwinTyres": false,
"RRCISO": 0.0055,
"FzISO": 33350.0,
- "Steered" : true
+ "Steered": true
},
{
"Inertia": 14.9,
--
GitLab