diff --git a/VectoConsole/Components/24t Coach.vveh b/VectoConsole/Components/24t Coach.vveh
index 5f1793c50ad591e866e840aa2559c5a2d3db35ea..08db92c08423ae2309875b6f093996cec54055db 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 3ecc37bf709586789c7718efe3864b38a702ea37..2c9a8cacfdcfada7d3215880265590fadaeecca5 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 bfe9e793fdb6c0629e8d938b4375baa36eb15063..0d292bfd53059af2034b03fbc108ca8c7ac4114b 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 d24e3cc1fb92ddfdcc8135e45d96e4c10c58e6e2..d519d575c0289bceab029c89d79ea11eb1d3dcc9 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 304087ef77a7bc0228d3cc739fd662c7b0c325c6..7572c880f2c76c470db67ab43a8e8ef68c2cf25f 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 3bf156969e9b30846e6765fca601a6e3cc99b35b..55d49f80f56b8267b121e9081b1b68d1a4b03e59 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 3ca2ea6a86b60aca80b60c4736ccc0708437997a..e147c1c47afcda5d36971781d9e6c4c8dbde0cfa 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 7ea4e7402ab9fb94f0d1cb78e250176c035e8a9d..d785cbcd966bc12888a010271d1349653f98480e 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 596d5f768f377ef723c5e35cd12ede22dc1d012e..174cb9a8d46569c031024a06fa79f54ba54f488c 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 d3b99d52c9d58fcc9c78ddaaacee45be25c9123c..b1d61447eb8335cfd3bf068e447791caa13f6135 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 880bb724f08f6bf9341db6ce4c3aaa8b3075da7a..382361132b48a77f0ad9a15c8c21904844271436 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 940dd8d01bf8f5e96ae78074802e1e8eefb54b5a..69ad42ebeec788b12d95042bc7843823436386cc 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 145ccc032357d469223b51e91e879da92ef666bf..64d94a00a4055fc3a1db11f06327d6ccd40033c7 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 caf96e7215ebe59d0818720b872139ca6066834c..4535b71d627d391673860845362f5ee54ad471e5 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 caf96e7215ebe59d0818720b872139ca6066834c..4535b71d627d391673860845362f5ee54ad471e5 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 ccd0032781c097d325247e56e448f540d3d59be7..889eb0f460ce3af2137aebf385ccf7d4b54708d5 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 40f7f08ce9c3f977d7627701f0f66d4c886b4537..c58622fc20316cf4b5cf07665a1d8415b99fcae8 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 12adf968708e781f847be2b414df1ff6e5687791..d40561ae01d765bdd745d45c66a1642a0d249e9f 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 74503285f56623bf66d9895d7ce51bc40e79cd61..4de6633ab5b9402bf8ef74d8a3b5bdc50991ddb8 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 86df6d1a341876a4c80fc19b81c3e2ec0d853ad4..055faaa1d8804c5212d54bd6ff6e47964ae7f0e5 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 49a23b3542a006015a2c395acf552d277e491813..ab8488388370e6711435f85e2dbd3cd54998f476 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 0286a631b162674c7eb29cb901c479bfe697da9b..5bf9651befdb6503854c28ad9004442eb9b113eb 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 d620cbafdbd021cf53dd3485a065145e8145d4eb..b839bf58c0a8354e122d86cd7c207769ef90d60e 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 1c26b4d2ba4e252678eadaafa7b49ecc2eb010bf..3a7512f8a3f64a88f057652455937c4896e1ac9d 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 d620cbafdbd021cf53dd3485a065145e8145d4eb..b839bf58c0a8354e122d86cd7c207769ef90d60e 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 50fdc0d3eca049c3ce81f9614044ed75ba5159b7..3b7ceb548d5b421aeb37b70bdf6cf1cf568fe806 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 3f63af3987cad9631c8757c40fff5aed79ccbbbb..eb4483e5e0198dd0e6dc74aba8e1b5b84395bf92 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 21e4a64e6e14dbfbd928cb2a319599cbebdb3d47..1d160ce752d28f5fe55c5f6ed03a39620b94800b 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 22522fd502c2d93b9f7f3bbeeb4e49b2d9bed137..6d0386bc9ceed559ca39be7ec4779be14de39b60 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 fe20437262a45622b391f79ef558a631f124206a..9643ed0efcd5a139ef65c239fbbe0b047eb36f45 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 34ed6d8ab8bf5eca6ab8d58a3e3eb8505df0fc7e..d2b7fdc0b6d249aaabc68786fe76fb7dd3c2c6d1 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 d6448dac8d88d6e9ec800255042dc712482f0f06..7e49b794b7983e45fc8cfe8387b365472f9701b8 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 a60756a2434882cd35e5446bfec62e864b3ff550..1284dde6dbd451c5a94580b32684d4feab28c676 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 07111b495bed79049e69513b8c55727dd71d2171..c20cfa9613d117d67169abfdfc756a3d32bba27c 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 4aee343895310245e7993cc17e4eda720eff652d..41573f7b4098abeb7b57dda22a9a3eaa4b01b70c 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 e475077fd7aaca0bd14a65a07a189158233cb2cb..87bb860393908eeffa5ed8890cb50b2eaf9a36a9 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 495317cde2009e52514c60787ff68ef8440e7801..2da1ca45934cec6a007307f6749909318c232a1e 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 2fb1ac246f7e4344df7f59452bb17442dbc94a45..65eb063b32a27c4e9c39408d7e5d9b4302aeb1cb 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 a09afe3f633f94b40de04992f72e0baa3bb761fc..f6489a47fadd25b894bcd4eff67d7513173f2781 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 66b2094898284f1421a9dc011cadd6657f6903de..f629507b1466f446773ea18862e8ebbd7511c18a 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 cfb13988ce331d1927ea9bfedf3cef81a2563305..af6ad38a311ca90396df94035877094e18aa1d0b 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 22a694626fa007c104dd2d709e82db0e0fe2c6e1..9a3083ec27b088e9a97558f8d067af3085d7dac2 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 1f27defc739513aa86f68e0de1141b8b9f8ea0ff..415ed568d758ebdc24a16c76cf105b5c8b97dc43 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 62b96216fe4a1a5d4d908d32e13745bc1c0747fa..1911395b056411986ef09e5752b82dce59f3591c 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 94622846b552ed61d81fff828a3b68de9dae39c6..217ba849304b89ad57473dd1acb1c81a27848e4b 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 9edc0421106cb1f924a38de10540c860eb14b724..9705d516947b15f624b8293caed72f2cea89852d 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 d01a2b7415dd7d2d823bea04f9fae421271fe0b4..caa19395baf4eeff4f90bc7666f62bbb4d6a45d5 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 822cf72445696b6fa33bc07e254be7c82eefac17..3391ad04d559454ec758a7816596d62c9f8a9cef 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 f4d4c6d0cc21dd19d4c2053f73d1b608325f5a14..87144d9aa378d7bea241dfc7455d8ed63a0c6a71 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 913be3ea1bdc50de2dfd2fb5f2468f69b851b2f8..19ef6f71acd6165dd4be295a7b4c4f36d61d702b 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 5d53dcbfdc4923855c4e8715bd423e294ee03edf..360eaac7312e9679c8ce851003dca97e0b719684 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 32e2582c0b8a5e1a05e22f4885b1853698055692..b0b75eade14fa8a7e5a2bf0ac8a2bb4aef9d4585 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 f5f6ad4d1e032dbea0c0204d922939a54b198e8b..37962a31f54d2b05f532d58841fb354ab7d9f376 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 1f9520e3c33d5ba46ec0db3d0b58da6e184b80b8..d0663b908a17feea86bb065bcd3e4ce951469891 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 21f48b43a33171c7fde954f93f5a3df4360dde48..66da3d8b963dae0c8baefbf30143c6acebff3f6d 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 5c848bed496e129bbda7dd82d706f82ee0958f72..e8207634d47508450e4c0e5de688b5adb46654e3 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 34fa21cb6c4bdb23d91f8142459826b5c88235b6..49539eb0a2434949904fbd6f17aa431c0c2b0968 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 57a6896f41dd80db873fd2367e3d722300d9da58..b2a5825259be6bae7604d83f0759bae62b7d8db4 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 9494e16c98bbec9263894c3d6ef5fa14d702782a..ed92e6cf80304f6eb337c4fc2c4fa1b15f516161 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 f7e5fa481027ebb6066e0091ddd8cddc09b900c1..93968c3e3f78846aa0e7a86dc6d5a00a4cc90f6d 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 0055426ec2eb5ce31a937b850234aed08cab49ce..ba4ba43727fb285c1409ddbf8c2f8c9cf4151856 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 2f481ca5a99a17e79b152b2afe48c4ef5e885aef..cd70eb741627ea9e6dec3cc38a432723c37c9946 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 5903da3fb6ce7d9b99052aa9a97fff566eba7cff..12289445339207110c355fe6d4b8b71ec90d04a3 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 b685e31cf69847557b9db61358c2229c71339b83..c5383241aa91ba5919a42b618c7f873194186610 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 a9621a287dd2a35e8501d1e9dfad06cdc0ad40b5..dee1c393e806926ef86601e2495bea72f4b52363 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 5c15ae2e6e4bb474f05b85750923deb5d0e1b38b..3d1e1cd8722aea5bdf2ddeb270ace6912042850b 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 963fff4dd0b55ce0dedcee406fb4ff92b935cf36..06bd5d8fc62a01d14acf464b954e7a3d20eb531a 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 7dcc15b80d9c741e62d5fd1ced4bba3f55143ce3..3e112db8b10e9f93019a526871629e412b415bef 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 963fff4dd0b55ce0dedcee406fb4ff92b935cf36..06bd5d8fc62a01d14acf464b954e7a3d20eb531a 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 28ec6d171fb51b1cd5611c80640e62c1ee141d99..0a79cf4f3704543da1d00e9bb51cc1561a659395 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 4b79088cb790d3ca4831324b1538f24e587e87d2..2887a95c0bf9010b81eecb22cc2d9cbc5392ea2c 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 b685e31cf69847557b9db61358c2229c71339b83..c5383241aa91ba5919a42b618c7f873194186610 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 062b673831e995a8dcdf0e99b6f369ee0b8fc229..ef22af7f3d7574cf033c746ac86227095cfc8c94 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 628f825994109762a7553daf77c82e66ba3d9d3b..9923427b2fe4c5277188c08a13a89c500932ab7a 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 0583f60a606b4767e4efefec9252b1f147a2db1e..86e0f2065de940f3f2b934ab969564cee75348d2 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 1f6a673ed5f296837f228328a3fe4050227f46ce..7ccf0aaf73a5d3019eb30b0ca82505c5d11e5c43 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 28ec6d171fb51b1cd5611c80640e62c1ee141d99..0a79cf4f3704543da1d00e9bb51cc1561a659395 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 4b79088cb790d3ca4831324b1538f24e587e87d2..2887a95c0bf9010b81eecb22cc2d9cbc5392ea2c 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 b685e31cf69847557b9db61358c2229c71339b83..c5383241aa91ba5919a42b618c7f873194186610 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 01711a12dc09e380b08baafa5bbcd641721be862..400ad40c7c0240a1d85808b7adc1bcb513fbbb6c 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 37e8118274680cb2d2ab25124b2ad1ec9575b439..eb45c00c981cac4c506912dd912e1bb053abdfa3 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 65f262813babe00971e7295491e827939a5e0aa6..037524f24a82911bf61417f35028c6b86dfde61d 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 65f262813babe00971e7295491e827939a5e0aa6..037524f24a82911bf61417f35028c6b86dfde61d 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 eb1a89d768b5c8934bb224c3d7dee4ca127b54be..6f71b7e42075cd886e92d353551cf2b31b99c34d 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 2798829bcdf02e9d5bf4f652d46cea17c277031a..4f65a8a70f7197cf9b95ffe47c623c9d2e261cfd 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 ea9889c7a7800677b19f42ee6c2e893a2b23597d..5c5e01e04adacb0cc7d312b865d0b45f54582f05 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 6242650fe472280cf3b5cda2df4356cc0eed0afb..814f1d63527bb24ded3ff2981c626b05e1ee522a 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 348394003e6c7f7fe5a7592d9ba631c4b0186f2d..113f6214a9c010acd4906af3fd77e9408ba020f7 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 7b37b82cfe4fadb3238a8357f3a6c83df5b4ce31..78dfe78367dda1da7bf552098b93ce1137cb0852 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 2784c11531b541c0df2ae199d0e1fa35a2183778..b0b1093842bdec8a122ef46fdbbd01886fe58a7f 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 f0c777b019a6d54190e9a55fd5e911b90e3dc945..b73e722367fe76e407a9f5814c1d6126e1367082 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 22ac011731c0b64e0746d7b47807b98ae4929527..31df7e5d22b842db5ab8e0a7db23e1e20e34579f 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 e9070625b07de2e80369dcb79a9dd295b1502333..bc784cedab76bd5d928dc5398094395a2c4e9be6 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 fa2ee72ab34beacc50831f0d921266d43e475c5b..1ba7b8b2664d05b42c93002426baad99548e83ea 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 09e13559ea2d313dd132ddaad4aeba8e1f76aec3..cabe6684ef862e03befed75d1e2dcad6e8fde8a0 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 366b72a1ac806e476a5c58047309b7a8d9d14cf4..c0213953dd112ac5dc0b076cd533d2ec93ab7146 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 db87930dd9e462f4aae630569f3baf4b9a5e1b94..78b0f83d44e128cd51be04ae53f9c26dee87ee92 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 d5378f00c83235f341720fb2667e429bbf77e7e0..1230b7b441fbb49da41b0beb4baf70370d79b039 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 cde3723ef5f8f6fef93d47f77562c1c65ff6cd81..7940ec7b6b90299ddaa298d2d92a0947a27b9910 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 7b1eabb67965a38a11b54d9e84f2979db899313d..c744c2e175e05fb5bb40976c1f2cfc0f7cc0a55d 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 de026e99b17aec114e906c4e97a1790b4f0593a4..e3ce5fe603357b1ff3a5d769ddfe228d1b8afd07 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 92ed7e4281e2693ca3f00ea54293fe6ff9349873..f1e12851b39e49a2d6e1ae2f7230d5a621d9450b 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 6fb1308955c8744e1c18d7175e25851e19084ab5..f17d263ed4b6523d3c689139f27771a0688e1915 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 0cf69fa8af85ce8599a5e40f91063c6b81d8ef25..e2a9c9147d3d87782814aa27f7960ace781dda4c 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 5b38a20ff6d694904d980e790d638aa146bb60cf..e5e80b477f3ae82526fadfd32c3d69d57848dda6 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 168a6beb5f6ff456f0d0cf04a7c1ed3c39d184df..b1b4175cae4aefa861d1bf62ca6274e5bd9f5757 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 754975ef503a6fcc182819e94687fe57fdd2cd1e..5d752f38271c2f13258af6f57e21a75936107b0b 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 193f9b05496f1a3d4e78d0e09a7b6c006d4a0d8d..b6dab28e2c0ec87300a80332384f48a0a42c8b17 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 19f7e2685662a9d63d6f42871700310202fa70da..9fa908c3f04863dde1f4fdf362d876f567ff65a9 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 1f2fa906e9a2ed6397435fbd24d58f09931af75e..9947102307d3cae154dc0b8ef69476888ef23e30 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 9a59dfffc461f620cec0604473ae873b5a183549..bd2dbca5a9e725990f7da8af6f97fd8ef5d63bac 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 721494785f2d20797f7f7fb992541020ef0937fb..2d3137bb47ef777dacbd7d583df1c1c62cf91483 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 d8ef049f148e537689bc9c50b99d3f80ad2fe25c..c408c9f8360882cfe48ce115d06b90ceea8185e8 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 455b06e9e68d6521446d1fc958ad388ec9ef1174..52e1129828d2848d86a7970bc2cfe4971ee6c69b 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 0a6c6dd8a406f2e320f39b30fd8c72267f00590d..41471f26950b232c8fc19f6f98dd2d142ca85998 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 bf5fe6aa72e5d9b324dc1fdce985b18627707fe5..9bdb2eb63dc9ff0bb016f67ac73b4552a040fb81 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 cd5182d1b50b74217a80e9f8835716002bb8fd93..8851094dfdd2c4732052fab3e87e023ff5aecbb1 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 db56b4c08f3c4075e797e0aa0c72006a3cb0f209..cb40b405965c43b621453b31486de33cd1665832 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 758bc72cb82f197bd2c93a518363fe9adc7cbeab..e6929a2eb4bdc6d76049c54c32750173ecae5423 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 dcff67a1b0166d9ec00f3f280fac541e4bbb8146..9c34ddaeccf298a4c81c04720ab1e4114d2dd3d2 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 79f9738517afaeefab8a7b1f86a6459872b0008b..df8f642f05705a4b318b86b35896ce7e68c36310 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 a6f5a36b681fdcbbd4950292cd2f235e56d31dc7..18df36cee773ba12aa8bbdb47ee4690eeb680247 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 5f439f3d39a29a73451ae05e4ff017702241d648..60ef92d1089ed3c77af5d9fbcb8e806328780dac 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 e475077fd7aaca0bd14a65a07a189158233cb2cb..d4c465d9d8e5a72b562556649fca760052c59fe5 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 b0777972db7853fc3f7273d173bbcfc6e517a88f..462bdeece381420437b7f7e4655c3c11818253bc 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 4874a70c2940041631f3cf90b27b08d064160311..5e46487bce7e8429a41d5e020a85735886b3afcd 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 0be795478f5062f7f10927c42064dd2d04a2f849..3744d98277a55af9b7bc9e022cb5813c47976c6d 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 80a1ef698ae407d5398982bcab4a2dfc46550d2f..cf83b798b643e8134b25c63f26687f476ba0df3c 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 7c28066d2b3651fbfe3aa05191dcb91042f7088b..9daa5f09bd496be4c3e0aefb6e869dcf5045e4ff 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 8ea974dab03493d70b7362080116122af34de914..80edd0bf8bc8161aa440e1457103c34fe719b8d4 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 ea33d0b37cb0a37ec91b92b6c41eed7b2f1e78f1..cd7fcbe7180029a79fe41728c92971521959f48d 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 d50e10193163416f8ebdde8fc62d00502ce7a4b4..8ca62f583337a55b06f591767f72149fb830cc9e 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 6c0a6d6d4461cb81f36a7bfd9aa25ab6a623bd11..cc61ef88660ecb06c5ac0870adba0388b95555bb 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 2ae852382cde93a73e5567ae9fbbb2e717e202e6..2486bfdea74a13acb41c040cbb8eaaf7f89ad028 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 4c63190fc40e9d269debe84876d24e12f5ddd099..d5f121b4c85896b7bc696073b5b71390fbd54014 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 14d46a034593351bf7218d4c9c138c4591568534..00e33fe2f85bc8b8d7d2994cc707b9cc24054e53 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 014d4853df7221d065e82917c6b2662b7653ae83..0329315b8899d1677d4cda87d782729ab7970391 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 b14c2f2d29a4293811bb9c3621c169b7d832ba89..ca50346c32a71a71bbfed3dd41052bf1578be461 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 6f57928ead8204698d97272c6af4c0fae6555c25..8acac2c37bbf3a4354a28c4ebccfce50e6027d1c 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 b763c4fd0ba46ff595cf119ff786345790c834cd..471edba719bcdf8320ea1c0075da1a98798d7145 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 98afe6572f10eb799d8bcb9fb87ce1225b288b3e..2cb126ac86f4a49a8b9c825aa19e1473649848d3 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 0a20cd6767d913b2b5a650a5fd2ebe27fed76f46..4d430b031b679d7b2c11f0f02a2d0ab5dcf567a3 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 8640584526189e5ee98ee086bfac53622cd23afd..2ccef63030c23995bfd6baf2c6180a5b7e0e2406 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 8f06c981c3bd1e59c4f9aa8f4a2deb13afe28d86..42f9ac2cef1e35f054a384b223bf377dc5d84c3e 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 3d2a7a750e602f3c78ab777886387eb8ee048882..b4ccca37f48fe1179294bc0de7d28562a0788eec 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 2fa7e23a2b03e7653b38c724138fc60e69af78b6..edb6d41dad2fa647cec6019569c7c743d6e0148d 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 3d2a7a750e602f3c78ab777886387eb8ee048882..b4ccca37f48fe1179294bc0de7d28562a0788eec 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 9c76aa596e93df60485a2ee414c0050e0bdcb7c9..74a3b8e3ba33202c710c30125cf146dbb19e4374 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 9495087a844b81dd9d1e6700cc4bea79c45132bd..1d8e0ccf1ee2b221220541dc801e22aa511c4dc4 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 0a20cd6767d913b2b5a650a5fd2ebe27fed76f46..1ea59c6aca83aa19e807b289a0cb25002446f07d 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 519f00b321266b3e578634337094e8488106f3c0..b5969454c91a4c0f6c0c7ecf6b242f8e3633217a 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 75d1444f405f0b60ae93e5a1988666f4b198178f..53e9c642646cdf4658bf07f61e098d4db54be767 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 563f38b1ca12802f1f24ebe17f86e9dfd582b590..217e7e1e7c5f44b12c6ae61a1158b8f83dc91d09 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 5b415e6f8be4c591221fd2239d3c46f27ca79dc3..3ddb29e5a927dce8a34604447e7fca64dc3f45d7 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 c2ccb9a343c035591215b56cc6e54ba1573fcc57..bccf2cc18f4f235e55f5fb35e2a1ca0ec47437bf 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 d9e29866204e82ddc4508ae4872c1ac4ab9c2df0..ee366ce6abd65f3545189522fe69ecd8c1f8a93d 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 73eb80fae5e48ed53eb5696c370812a2386940d7..37b2ebae0d14c635528582812a54ced7bb068844 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 1f8d2b31a53fb72cbb05a1f84a4767f946448201..542fcb7d55dfdd8bdae73c608f8a53cca6b8e895 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 85f67109156f895ba56ce5b5e7fc6aad68d0569d..93ca1065c761ed9afc7e05c5e2fb2a8b8a7b0d31 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 8fde47f1dfbd4387e4292fa7c17a5711911089d0..fdc9ed199d9cf94ac77a4e844b496e1f8ef022db 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 9c76aa596e93df60485a2ee414c0050e0bdcb7c9..b8d9f36dac09e66d038b19ce021cdc325513a41c 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 9495087a844b81dd9d1e6700cc4bea79c45132bd..5bccfe937134076f6626443f3387c764dcd0a145 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 c13c24af4742350e5608cd7d8b2b753b1c3f3df4..6674d5d0425266d797f98a460bd4efdf9a9d6a76 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 0a20cd6767d913b2b5a650a5fd2ebe27fed76f46..23fec1688938a053b1ff212f1b230bb68fe8f369 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 14e68f6f63f92ac64d64bf7c27a6b36cdd4dc053..90fd86231e5ef1fbef2a1ea1ec8fecdf5dedeb6f 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 76585bdb8267761559596921ae56e631430b64c3..942933861c63b05e559b618b9c17b408a7e65b4e 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 b2e7ca079298a491fc49c53fc43da95ed809d435..2c3d9dabc8810049d77467ca5632cd0c72c1eab0 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 598701dc40b8ad9ea887244aec7da9430fab01bf..cadaf63eadaeb6541770253625d671dfabd90116 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 b8bc21158f814079823d04f276a8658a8cecf38e..4f0ed849d85ffcb284f64697f1debf9211fb65f1 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 4f0ac61252fc8909c3513b75841903b0c0edb22d..689f5beeade1219eff386cd263e970977c245a08 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 fb634f6a2a75d6c93bbd2fe303222c5766d07934..7075f293e8ea378894f96e9e30586ad2c82fa811 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 b75469c0ded71caa05b1b9bc4166a84e8dd40dcc..1bfa7006194247ba28404d7cc27872b0b4a9c00d 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 808359b35a64529ce6ee12d71964180034149837..785c0f5d16a59e0a2ddd0bbb3179dfc1a82a7b25 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 769374998a6f73fd589cff36798ae7fdf349cded..a3621d019a704afbf7654384bf4620cb7056431f 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 45e977db5ff7adf3c9435f4b14070e46205aa3ec..79b3b82ca316789611b377722fa1c52c106fba8b 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 c5633765b63e7447450c4e03d76044c824658578..e67da9e6ad122fa3f789538e1f5438831f2ee533 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 90326d4e0fa098909fc1e641e2f9cf01a4f6023a..620acfe0db4c26fd97d2f36848de689535f94982 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 769374998a6f73fd589cff36798ae7fdf349cded..a3621d019a704afbf7654384bf4620cb7056431f 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 7086ccc5f6b51bcb9b5eade1d13e143d0fcc3d0e..75b0e45ffdca9087b47500b8710a5205e3cb1793 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 fba8a6195b6c47b7d788066a49d31243949dec7e..1a0e9925c2e3d04c5708b10f42d1d55f206ca658 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 0e213268e69cf4950b81a94ff3894d621f09038b..b87cd97debc8164cdcb932d9f8808820ab303b1b 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 b59ce775bc0beee72a96983cb7036deaf2b099ab..f873701b36f198e85b001ec8f5a1bea72312d5cb 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 50c7841bafc24a59826e9cfe7680aa0fb8068793..25207b2885dbf56444997bc3983c7e4442f759c6 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 4dce2e29b33f0eddb0a41461a87953df2322f1a3..89c8f8f0cf551fc8ccde4887ec8efebd002ca1b6 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 f9fae5e0aa2f6825ffadf9eb5f64d6d4b612f842..839a09652f403374db739b365f73e01411769277 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 e4417aadc5129ad5a6f0258acd4a08b748c7b7c6..76bea6067ed657ae94d5bc379f0ace81224c60b9 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 bcf8c3572513208251225e81f20cc3220f61a1f8..cea678bd5db7effb420d06622b31029fb481bcd5 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 bcf8c3572513208251225e81f20cc3220f61a1f8..cea678bd5db7effb420d06622b31029fb481bcd5 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 fe485af8ad6344cb5b25641e34c6c940831946ca..c00113c3d2b9fa2f8623f8dbcb73116ec35ffc7c 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 560b805e5902cd557456c77ef5e73cc9f465808f..e7ad4ae51f5978605838d15984a77c350d6d1378 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 8549bfb7a25366306b0d0b1ea24d20b53edd5185..c8f503ad131bab32e1623297bd512f4fcd639094 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 a2c4e6d8ea486da3001529ec23ad069a2730e95a..ba9b5e57494bde755cdabb949e3b5e516b7823bd 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 78c46e88c5f193362a7e946b42f560fb2a4f7620..d53cb98488d75912d3e7fcfdc110719b8fb2ff99 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 612fec3e785c0fd6990b03da6a5ac01e92b413d3..7299714f6d7dfd516793da5a1bc9be8d6c308929 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 1ca045ec131b28f44b34f206806b23637fd61ec5..2e100b88d6b7549bf9d12774f332a593ee7cce36 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 c2a7815b4f25b8475aa62ee87a283c2d330cd867..593840779909f343ad116c8af86e797c5df57d40 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 bcf8c3572513208251225e81f20cc3220f61a1f8..cea678bd5db7effb420d06622b31029fb481bcd5 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 c58ea8991971af2b39bf90958a3f1472fe7c6085..6bbd04b6db7311a82ce31318daeff9e1a72e9ffb 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 d710eb812a5e42830c316b75f2a2e795482e4f73..87648c42cf1d9d33bc102e3b1ba50f4e4e09edf7 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 d5c9bf98c9128b8b6d66feb25685edcd0eb95dee..14182c05a5a04c883bb928a1e5db648f962e96f9 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 e6f03b92c68ff98c8b1a23f71df9c92159aca258..96179c9667323689a4e10c721bf164e1099ac496 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 6abcc695e69bf6b15eed555b57c9133cd6e8f728..73578668ad0670099426058aebd4228f13032de1 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 b4eca959af256a6f72032d43e5872412bce55bdc..267ac6c869f1bc544f0ca75c89476126acbe7afb 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 7b0030b58c492424911079bc06cfcd0bce170a22..df396567dd68380b7dae06500c4556b1bde20c84 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 7b0030b58c492424911079bc06cfcd0bce170a22..df396567dd68380b7dae06500c4556b1bde20c84 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 4825014ff15e0e222204e100ba8ad831bfe9738d..c47b4a024222334cc5f1ca7650038b5fd14af413 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 4825014ff15e0e222204e100ba8ad831bfe9738d..c47b4a024222334cc5f1ca7650038b5fd14af413 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 7d5e83d3e7c3f40cb2f542f761c9d53979a72b17..81cac2462c53b7c9e9737d29d92a56aa00cd13aa 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 e9015588c11c0005a7f22b3b7b7572411f62054d..bea5cb18f525358af285885d4d4e07467bb9eaeb 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 28a7c92d337967a3f59a8e96c006c4531378dde1..425c879ee75cba9382362e2a7f50bf01ce54c8e0 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 9d06b4875b5010db7a98338e2c3dbc83ac075756..86a3aea68142dddfd1b1b84e479a3255a36fb100 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 79a10a591c479f21df5533aac7458c1a7580ce20..d136d52b6907661628d0727b59080911f60e8acc 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 2802ed7d5714e9b6993da428954c121048e42a87..580b0557dbd109df53db03f977b654a67e12656e 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 6d57e7ad9a4060224589ed0a62b4e33fe93e3f40..547a927e6b615c1c4114298681d611fe6ba53bd1 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 57726484df89cc8e7e7f6ab01cf8d32cdeb55302..f5c01b26b9c1afb5fc63961fbcdc80c6d4fa3aab 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 e1282c86a3adb000c7ce23f1d467e061cb17cad0..cd57ee9eb9ac7cba85172b3fc5874d7dfa1c7cbd 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 b3da9adf7f624da519cfa5f8f1240491d9bb2292..677dbf8fbbb59572a78b38bdb3212134e8196518 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 14a7bbcd65ffbbaf756b0d478ab6db0011e63799..fa23e066e7138898540b42a83060cc0ec1741176 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 3f2f72020c8cf4a0c39d115577fba54daf7227ef..27821c1b24178ac7aad3037fec6f27a2924bbc96 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 9cda1d6055d299a5ab7970a8e694799a5bac1069..4ccd72e456d09e958941bf4b950fd6222e9bf157 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 32eac5d477d59d2124895159e4d4cd146a97b273..684464c4f7a29c8ae2632f60db67788fd85f3f8f 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 bf6783dea4e9142a99a53661e104396cd1144f58..962aaa80f6de3bc083b287e18d34289a32d4b1db 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 5ef57a2c37f1edbaa19aa85413074c5002a99686..9bfb51c5607a54c59ddf19399f5720750f23c2db 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 1e043b9b28b9d40bed0f43f78bd2c316b4fb1b22..f2022929e5b39a6761d3885b5f3dd30f6c73d479 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 1e043b9b28b9d40bed0f43f78bd2c316b4fb1b22..f2022929e5b39a6761d3885b5f3dd30f6c73d479 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 7e831d05b71a865f709837df989b6517dbc5db37..fc33ab97ab7ea88c0dcdc0bae217c156b6671712 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 3c939dfce67b6e895c24b74ff440aba6eb1efeea..59dbd9e7fcea5519000c0caf2c414b414309057e 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 7e831d05b71a865f709837df989b6517dbc5db37..fc33ab97ab7ea88c0dcdc0bae217c156b6671712 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 3c939dfce67b6e895c24b74ff440aba6eb1efeea..59dbd9e7fcea5519000c0caf2c414b414309057e 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 9cda1d6055d299a5ab7970a8e694799a5bac1069..4ccd72e456d09e958941bf4b950fd6222e9bf157 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 3bf156969e9b30846e6765fca601a6e3cc99b35b..c22846f485bc18d92b2e73fb7d44ffd8a6f47c4a 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 3ca2ea6a86b60aca80b60c4736ccc0708437997a..ef547f89f328a2addf2399906d28c147030e875b 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 7ea4e7402ab9fb94f0d1cb78e250176c035e8a9d..f9d698aea82d245683793397a1248fd2d7b38db2 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 596d5f768f377ef723c5e35cd12ede22dc1d012e..174cb9a8d46569c031024a06fa79f54ba54f488c 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 880bb724f08f6bf9341db6ce4c3aaa8b3075da7a..82cf435bbf0f6098488d75c25f2033efdae0316b 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 40f7f08ce9c3f977d7627701f0f66d4c886b4537..cabfe9027879371dbfb9e7b8c92082d226397d31 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 74503285f56623bf66d9895d7ce51bc40e79cd61..d8d9931bd73d68e92425e84178d0377124a2dae9 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 64e546f5c6b2df0e1f2e7a74371c39244dd216a7..4092988361c2a4ea997379546ed356d71a5dc55c 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 2da3ae2b59dcf52901ce610bd836ef95c41f08f1..b38f1760a12cfff88435dbd3742bebb470c9d6a0 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 8251e4239ea688981df7c3e9ba227534bb8a871e..be3a38046255ce4036d168e2b9c90db7c2920720 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 71dc0171f0fa95fdcd7f57017239b3890558a4c0..320c4d5eea6bf3e7bbd0c070ffa2352a201a56e2 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 39c05e27fb8b205c9437cdc5a15d1072995e3d99..aecbc339f6f81994db3289d0801a5f444c9bb40f 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 303a40252664f8c7b8d0fd9ec4e2a5362dd2524f..7bc076b69b3e5387bb1dafe9bca80ee5f08200c3 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 9cda1d6055d299a5ab7970a8e694799a5bac1069..4ccd72e456d09e958941bf4b950fd6222e9bf157 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 c1ca5d7bda29a48cd6910a051b06dbfbcfe3b72b..44b7c86783e26c941a304607ec5c74246ba81e09 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 99006bf02a4b7cf7b928b5d01d3f6be339fa9c36..f254e428b24de5b5f35b5a29f6e890df380257cb 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 0c2f89126fcf70810253e5827fe94be0b563db76..96299b7042d3c9fdc6aa28bf011a08fd19ad4e1a 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 9cda1d6055d299a5ab7970a8e694799a5bac1069..4ccd72e456d09e958941bf4b950fd6222e9bf157 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,