From 221ac88c13ed43b1f259a1bc8fa442ac0249b1d8 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <quaritsch@ivt.tugraz.at> Date: Mon, 20 Mar 2023 11:11:15 +0100 Subject: [PATCH] flattening directory structure in JSON xEV testdata --- .../Electric components/GenericBattery_10kWh_658V.vbat | 0 .../Electric components/GenericBattery_10kWh_658V.vbatr | 0 .../Electric components/GenericBattery_10kWh_658V.vbatv | 0 .../Electric components/GenericDrag_140kW_936Nm.vemd | 0 .../Electric components/GenericDrag_30kW_50Nm.vemd | 0 .../Electric components/GenericEMotor_140kW_936Nm.vem | 0 .../Electric components/GenericEMotor_140kW_936Nm.vemp | 0 .../Electric components/GenericEMotor_30kW_50Nm.vem | 0 .../Electric components/GenericEMotor_30kW_50Nm.vemp | 0 .../Electric components/GenericMap_140kW_936Nm.vemo | 0 .../Electric components/GenericMap_30kW_50Nm.vemo | 0 .../Electric components/Hybrid_Parameters.vhctl | 0 .../Electric components/MaxCurrent.vimax | 0 .../JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh | 4 ++-- .../2x125kW 485Nm/GenericBattery_243kWh_750V.vbat | 0 .../2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp | 0 .../2x125kW 485Nm/GenericMap_125kW_485Nm.vemo | 0 .../Electric components/GenericBattery_10kWh_658V.vbat | 0 .../Electric components/GenericBattery_10kWh_658V.vbatr | 0 .../Electric components/GenericBattery_10kWh_658V.vbatv | 0 .../Electric components/GenericDrag_140kW_936Nm.vemd | 0 .../Electric components/GenericEMotor_140kW_936Nm.vem | 0 .../Electric components/GenericEMotor_140kW_936Nm.vemp | 0 .../Electric components/GenericMap_140kW_936Nm.vemo | 0 .../Electric components/Hybrid_Parameters.vhctl | 0 .../Electric components/MaxCurrent.vimax | 0 .../JSON/P_HEV/Group5_P2/P2 Group 5_325kW.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_325kW_WHR.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_325kW_noESS.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto | 2 +- .../Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_BoostingLimit.vecto | 2 +- .../P_HEV/Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_1.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_EMLossMap_2.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_GbxTqLimit.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto | 2 +- .../JSON/P_HEV/Group5_P2/P2 Group 5_noESS.vecto | 2 +- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh | 4 ++-- .../Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh | 4 ++-- .../Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh | 4 ++-- .../Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh | 4 ++-- .../Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh | 4 ++-- .../JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV_noESS.vveh | 4 ++-- .../2x125kW 485Nm/GenericBattery_243kWh_750V.vbat | 0 .../2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp | 0 .../2x125kW 485Nm/GenericMap_125kW_485Nm.vemo | 0 .../Electric components/GenericBattery_10kWh_658V.vbat | 0 .../Electric components/GenericBattery_10kWh_658V.vbatr | 0 .../Electric components/GenericBattery_10kWh_658V.vbatv | 0 .../Electric components/GenericDrag_140kW_936Nm.vemd | 0 .../Electric components/GenericEMotor_140kW_936Nm.vem | 0 .../Electric components/GenericEMotor_140kW_936Nm.vemp | 0 .../Electric components/GenericMap_140kW_936Nm.vemo | 0 .../Electric components/Hybrid_Parameters.vhctl | 0 .../Electric components/MaxCurrent.vimax | 0 .../2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto | 2 +- .../JSON/P_HEV/Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto | 2 +- .../JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh | 4 ++-- .../Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh | 4 ++-- .../2x125kW 485Nm/GenericBattery_243kWh_750V.vbat | 0 .../2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp | 0 .../2x125kW 485Nm/GenericMap_125kW_485Nm.vemo | 0 .../Electric components/GenericBattery_10kWh_658V.vbat | 0 .../Electric components/GenericBattery_10kWh_658V.vbatr | 0 .../Electric components/GenericBattery_10kWh_658V.vbatv | 0 .../Electric components/GenericDrag_140kW_936Nm.vemd | 0 .../Electric components/GenericEMotor_140kW_936Nm.vem | 0 .../Electric components/GenericEMotor_140kW_936Nm.vemp | 0 .../Electric components/GenericMap_140kW_936Nm.vemo | 0 .../Electric components/Hybrid_Parameters.vhctl | 0 .../Electric components/MaxCurrent.vimax | 0 .../JSON/P_HEV/Group5_P3_APT/P3 APT Group 5.vecto | 2 +- .../JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW.vecto | 2 +- .../JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto | 2 +- .../Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto | 2 +- .../Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto | 2 +- .../JSON/P_HEV/Group5_P3_APT/P3 APT Group 5_noESS.vecto | 2 +- .../JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh | 4 ++-- .../JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh | 4 ++-- .../P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh | 4 ++-- .../Group5_P3_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh | 4 ++-- .../Group5_P3_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh | 4 ++-- .../JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh | 4 ++-- .../2x125kW 485Nm/GenericBattery_243kWh_750V.vbat | 0 .../2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem | 0 .../2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp | 0 .../2x125kW 485Nm/GenericMap_125kW_485Nm.vemo | 0 .../Electric components/GenericBattery_10kWh_658V.vbat | 0 .../Electric components/GenericBattery_10kWh_658V.vbatr | 0 .../Electric components/GenericBattery_10kWh_658V.vbatv | 0 .../Electric components/GenericDrag_140kW_936Nm.vemd | 0 .../Electric components/GenericEMotor_140kW_936Nm.vem | 0 .../Electric components/GenericEMotor_140kW_936Nm.vemp | 0 .../Electric components/GenericMap_140kW_936Nm.vemo | 0 .../Electric components/Hybrid_Parameters.vhctl | 0 .../Electric components/MaxCurrent.vimax | 0 .../2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto | 2 +- .../JSON/P_HEV/Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto | 2 +- .../JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh | 4 ++-- .../Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh | 4 ++-- 114 files changed, 67 insertions(+), 67 deletions(-) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatr (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatv (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericDrag_140kW_936Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericDrag_30kW_50Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_30kW_50Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_30kW_50Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericMap_140kW_936Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/GenericMap_30kW_50Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/Hybrid_Parameters.vhctl (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/{ElectricMotor/Inputdaten P2 Group 5 => }/Electric components/MaxCurrent.vimax (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatr (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatv (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericDrag_140kW_936Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/GenericMap_140kW_936Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/Hybrid_Parameters.vhctl (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/{Inputdaten P2 Group 5 => }/Electric components/MaxCurrent.vimax (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatr (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatv (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericDrag_140kW_936Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericMap_140kW_936Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/Hybrid_Parameters.vhctl (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/MaxCurrent.vimax (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatr (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatv (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericDrag_140kW_936Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericMap_140kW_936Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/Hybrid_Parameters.vhctl (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/MaxCurrent.vimax (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten B4 => }/2x125kW 485Nm/GenericMap_125kW_485Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbat (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatr (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericBattery_10kWh_658V.vbatv (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericDrag_140kW_936Nm.vemd (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vem (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericEMotor_140kW_936Nm.vemp (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/GenericMap_140kW_936Nm.vemo (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/Hybrid_Parameters.vhctl (100%) rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/ElectricMotor/{Inputdaten P3 Group 5 => }/Electric components/MaxCurrent.vimax (100%) 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 cd7fcbe718..8908289613 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 8ca62f5833..6a2375cd1c 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 9658cf63c1..0fb555a043 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 0005eccdf1..9c09e186d3 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 d66661d6b1..8fdd44d019 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 9c4f0bb490..a631dc4a10 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 d2cae00641..e55e87cfd7 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 57a7e1cca3..91222caf2f 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 e511a4332a..72fdc20307 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 a54449c9e3..ebfec0b7d5 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 550f25ea3c..5926958d19 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 6fd08286b5..cf909d9441 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 9b09ef7cf1..254751e02c 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 cd2de67757..0898258ec3 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 18cab04f71..fc98b3ae61 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 cc61ef8866..05ebd077d4 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 2486bfdea7..1922cabd6d 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 d5f121b4c8..ccd0d9289f 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 00e33fe2f8..47c8467692 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 0329315b88..34ea043f36 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 ca50346c32..af3c5dad38 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 8acac2c37b..9dc177f1fd 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 471edba719..11be11dcb3 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 2cb126ac86..f2e2154fc3 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 4d430b031b..34565358c9 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 a6419ea0bd..d8520303d3 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 042b0c3c79..979927408f 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 b4ccca37f4..f256fcc674 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 edb6d41dad..ce0fb62abb 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 ffa9f9e0a9..b34ae3581a 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 bd23cadcea..e0d8098562 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 e06679f7e6..b9631359cb 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 2decf7da11..20347db6f0 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 a739bc00dc..ddd3c95509 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 7e9a9d5e7b..b45af7e48f 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 b4ccca37f4..f256fcc674 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 74a3b8e3ba..c07d6c4f43 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 1d8e0ccf1e..f4cbf7c92e 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 842ddb9ed1..6aadb9a60e 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 e3dcf43a5a..92780a8059 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 1ea59c6aca..f8deb9720e 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 a6419ea0bd..d8520303d3 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 042b0c3c79..979927408f 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 b5969454c9..b46621f416 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 53e9c64264..92a71f37e5 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 -- GitLab