diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_140kW_936Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_140kW_936Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_30kW_50Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_30kW_50Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_30kW_50Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_30kW_50Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_30kW_50Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_30kW_50Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_30kW_50Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_30kW_50Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_140kW_936Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_140kW_936Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_140kW_936Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_30kW_50Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_30kW_50Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_30kW_50Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_30kW_50Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/MaxCurrent.vimax
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 cd7fcbe7180029a79fe41728c92971521959f48d..89082896132e91b1bf32c08fa09e0c6657a2dc05 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
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2_5",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\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.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 8ca62f583337a55b06f591767f72149fb830cc9e..6a2375cd1cbe1f0467e7384f18f198147aa85843 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
@@ -99,12 +99,12 @@
"Ratio": 3.077,
"MechanicalEfficiency": 0.98,
"Position": "P2_5",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_30kW_50Nm.vem"
+ "MotorFile": "..\\Electric components\\GenericEMotor_30kW_50Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\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/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_140kW_936Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Inputdaten P2 Group 5/Electric components/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/Electric components/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW.vecto
index 9658cf63c138079cce3e1ed0c1221d71586b034a..0fb555a043ac6ded1c4cf55137345d126497692c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_WHR.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_WHR.vecto
index 0005eccdf1427d25c04e3fe5df6053d6d93c9438..9c09e186d3bddf64c839b648e3adb2b4230cb080 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_WHR.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_WHR.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_noESS.vecto
index d66661d6b14625604dc3d345e9b7b5159f902ddd..8fdd44d0197f7baeedf1161320320808ab6a15c2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_325kW_noESS.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
index 9c4f0bb490fbaedbea7637db8862aa079d8edfb0..a631dc4a10b27da9b799f6672e6dff51ce7c1b85 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
index d2cae00641cb348e2566d015b4f49591e66d6f52..e55e87cfd770153ee923937f6040e6802d103ce0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimit.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimit.vecto
index 57a7e1cca33b3352a4bf739d507ac1d08ee19594..91222caf2fc93e7d86c66657834f2a5bcb465af0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimit.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
index e511a4332a39bc8e950d34e94fbe19595d0bf6eb..72fdc20307293136f7f3347b341689f369a02937 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_1.vecto
index a54449c9e3bcdda566ac7141d7ee78349b889319..ebfec0b7d53f60e990c0552838239b780ff6eade 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_1.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_2.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_2.vecto
index 550f25ea3c9897c5bd24a9c30e1bf43dcfae1ab6..5926958d199a090289dbfebc225ae7609a036e9b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_2.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_GbxTqLimit.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_GbxTqLimit.vecto
index 6fd08286b5a4c75dee6a399ee498f4508c5f0ccb..cf909d9441aa32d403525e3d550fb93c17d50239 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_GbxTqLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_GbxTqLimit.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
index 9b09ef7cf1deceefb325a7a5f6667b5fc92878ba..254751e02cb7e0d1de5d8d49308f74db430dfded 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
index cd2de6775748e972587df0f68c1ba5fbb00f6b56..0898258ec30f2e9004a13a9d8bc0248868219e92 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_noESS.vecto
index 18cab04f712d8235e8707deb9200a94823066e36..fc98b3ae613234f44c5ddb528f317e13f1c9fd5e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/P2 Group 5_noESS.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
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 cc61ef88660ecb06c5ac0870adba0388b95555bb..05ebd077d4f5852c7f0e2dfd6cb94d99dc57033f 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh
index 2486bfdea74a13acb41c040cbb8eaaf7f89ad028..1922cabd6dfc482e6a5650385a114b9f58e03179 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
index d5f121b4c85896b7bc696073b5b71390fbd54014..ccd0d9289f1ac6f7d3f4f152fb174da79bfed85d 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_EMLossMap_1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
index 00e33fe2f85bc8b8d7d2994cc707b9cc24054e53..47c846769281944e8c4eca6a04d2bb176255b57c 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalTransmissionLossMap": "GenericADC_1.vtlm",
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_EMLossMap_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
index 0329315b8899d1677d4cda87d782729ab7970391..34ea043f36d3cb934329351045a6f4cb1bfc6252 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalTransmissionLossMap": "GenericADC_2.vtlm",
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index ca50346c32a71a71bbfed3dd41052bf1578be461..af3c5dad3848c1019391c48e1e868491cd327bf2 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
@@ -102,12 +102,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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 8acac2c37bbf3a4354a28c4ebccfce50e6027d1c..9dc177f1fd0b0517ced50bb18ef38b7b4db10565 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
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
index 471edba719bcdf8320ea1c0075da1a98798d7145..11be11dcb3688004e5c8b1e6b8ce9ae79d3d8176 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
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_TopTorque.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
index 2cb126ac86f4a49a8b9c825aa19e1473649848d3..f2e2154fc3e26984b18a684d542236e0dcd9a28f 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
@@ -107,12 +107,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh
index 4d430b031b679d7b2c11f0f02a2d0ab5dcf567a3..34565358c9be3e206ce32e2a92faa62134af5d6d 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
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/Electric components/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto
index a6419ea0bdc90bdf269f19bb4e3f3b9d31ed6bbc..d8520303d375bf354932c34051083625261eeb56 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
index 042b0c3c79da7910018666b2d558de77f556c46a..979927408faf75894b35a16fc057ea799140011e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
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 b4ccca37f48fe1179294bc0de7d28562a0788eec..f256fcc67449c707f79b45a766b2a389213e2e65 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
@@ -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\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_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 edb6d41dad2fa647cec6019569c7c743d6e0148d..ce0fb62abb8b80916d9e823615532a2d2702a9b5 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
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/Electric components/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5.vecto
index ffa9f9e0a92837558f7245021905f9516654a28e..b34ae3581aed101c5f83d932cf9237d6dce95050 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW.vecto
index bd23cadceae79a314e31ab0b34786041adf1a3b8..e0d809856281b4019c66972bffedce9ff3c94596 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
index e06679f7e61ad6892af7045476b12b9058507884..b9631359cbee0b5399d370b0f4ec65f4422b6b2b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
index 2decf7da11076eda49316e5eb2ab997aefa2796c..20347db6f0997944f0a69c5d7abd96a2cb2af864 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
index a739bc00dcfaf077175efacf28c2cb83ba953020..ddd3c9550955add9d69ec1dea76a54efdd95cfa7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_noESS.vecto
index 7e9a9d5e7b9d9996c1cd55050d264ae093f8d0f7..b45af7e48fcda9095e9620f53a8afe5eae656e9d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_noESS.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
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 b4ccca37f48fe1179294bc0de7d28562a0788eec..f256fcc67449c707f79b45a766b2a389213e2e65 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
@@ -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\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_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 74a3b8e3ba33202c710c30125cf146dbb19e4374..c07d6c4f4336512b62eeb14c78026d7ae788a166 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
@@ -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\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_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 1d8e0ccf1ee2b221220541dc801e22aa511c4dc4..f4cbf7c92e5678668e620238bd0475eaddaa88c3 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
@@ -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\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_P3_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index 842ddb9ed101f2d7b055eaa27b5fdec38f7cf5c0..6aadb9a60e146f21657f3aa5d8bdf961d062581c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
@@ -102,12 +102,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_P3_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index e3dcf43a5a5bf70bfcf4b1bbf2ec2045a58b979f..92780a8059d566599149958d0588022526466823 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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_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 1ea59c6aca83aa19e807b289a0cb25002446f07d..f8deb9720ec82f0aaabcf120f39a0432d63f4846 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
@@ -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\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericBattery_10kWh_658V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericDrag_140kW_936Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericMap_140kW_936Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/GenericMap_140kW_936Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/Electric components/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto
index a6419ea0bdc90bdf269f19bb4e3f3b9d31ed6bbc..d8520303d375bf354932c34051083625261eeb56 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
index 042b0c3c79da7910018666b2d558de77f556c46a..979927408faf75894b35a16fc057ea799140011e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
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 b5969454c91a4c0f6c0c7ecf6b242f8e3633217a..b46621f41698ba515aa8c3037a0386495a9b2590 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
@@ -98,12 +98,12 @@
"Ratio": 4.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\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/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 53e9c642646cdf4658bf07f61e098d4db54be767..92a71f37e59ba6081fe90a712de8bdcbe106b424 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
@@ -99,12 +99,12 @@
"Ratio": 4.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..\\ElectricMotor\\Electric components\\GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file