diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/AMT_12.vgbx
index eb443cc31df18c3e99aa28e78b2656b6cc5814af..f20892252e971bdb8287bf8c6038d650f961cf2c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/AMT_12.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/AMT_12.vgbx
@@ -1,7 +1,7 @@
-{
+{
"Header": {
"CreatedBy": "",
- "Date": "2020-08-21T09:25:38.1210499Z",
+ "Date": "2021-08-13T16:22:15.8892079Z",
"AppVersion": "3",
"FileVersion": 6
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto
deleted file mode 100644
index ab3680f3fb09794d03465c33899f926d0e309377..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2021-08-03T13:36:05.6327467Z",
- "AppVersion": "3",
- "FileVersion": 9
- },
- "Body": {
- "SavedInDeclMode": false,
- "VehicleFile": "Class5_Tractor_PCC123EcoSS.vveh",
- "GearboxFile": "AMT_12.vgbx",
- "TCU": "AMT_12.vgbx",
- "Padd_electric": 3540.0,
- "VACC": "Truck.vacc",
- "EngineStopStartAtVehicleStopThreshold": 2.0,
- "EngineStopStartMaxOffTimespan": 120.0,
- "EngineStopStartUtilityFactor": 0.8,
- "EngineStopStartUtilityFactorDriving": 0.8,
- "EcoRollMinSpeed": 60.000000000000007,
- "EcoRollActivationDelay": 2.0,
- "EcoRollUnderspeedThreshold": 0.0,
- "EcoRollMaxAcceleration": 0.1,
- "PCCEnableSpeed": 80.0,
- "PCCMinSpeed": 50.0,
- "PCCUnderspeed": 8.0,
- "PCCOverSpeed": 5.0,
- "PCCPreviewDistanceUC1": 1500.0,
- "PCCPreviewDistanceUC2": 1000.0,
- "LAC": {
- "Enabled": true,
- "PreviewDistanceFactor": 10.0,
- "DF_offset": 2.5,
- "DF_scaling": 1.5,
- "DF_targetSpeedLookup": "",
- "Df_velocityDropLookup": "",
- "MinSpeed": 50.0
- },
- "OverSpeedEcoRoll": {
- "Mode": "Overspeed",
- "MinSpeed": 50.0,
- "OverSpeed": 2.5
- },
- "Cycles": [
- "CrestCoast1.vdri",
- "CrestCoast2.vdri",
- "Group5Eng_CaseA.vdri",
- "Group5Eng_CaseB.vdri",
- "Group5Eng_CaseC.vdri",
- "Group5Eng_CaseD.vdri",
- "Group5Eng_CaseE.vdri",
- "Group5Eng_CaseF.vdri",
- "Group5Eng_CaseG.vdri",
- "Group5Eng_CaseH.vdri",
- "Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri"
- ]
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vecto
similarity index 94%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vecto
index b41db95cdd1884c48bac40f8597b48e23cd96089..b7c99112e685d1c36bee4dd0b729377267ab835b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vecto
@@ -1,13 +1,13 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:42.4974927Z",
+ "Date": "2021-08-13T16:22:28.9151347Z",
"AppVersion": "3",
"FileVersion": 9
},
"Body": {
"SavedInDeclMode": false,
- "VehicleFile": "Class5_Tractor.vveh",
+ "VehicleFile": "Class5_Tractor_NoADAS.vveh",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
"Padd_electric": 3540.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vveh
similarity index 98%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vveh
index 4044f79c163fd6de87d7e0922080ef9b3f5c0030..455b06e9e68d6521446d1fc958ad388ec9ef1174 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_NoADAS.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:38.1830081Z",
+ "Date": "2021-08-13T16:22:06.7870666Z",
"AppVersion": "3",
"FileVersion": 10
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vecto
similarity index 97%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vecto
index 89bffd925a1a5d7d574e5443b6b84cf8b9f103b5..79112841f121912368301dc86b3cee83138f3053 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:29.5191308Z",
+ "Date": "2021-08-13T16:23:14.2014524Z",
"AppVersion": "3",
"FileVersion": 9
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh
index 1377bb07b11e9ddbe056b9b244380bc3611ff2bd..0a6c6dd8a406f2e320f39b30fd8c72267f00590d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC12.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:22.8339739Z",
+ "Date": "2021-08-13T16:23:11.1211845Z",
"AppVersion": "3",
"FileVersion": 10
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vecto
similarity index 97%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vecto
index e3872944cd452167faaa6b518ec5f5323b7fc31d..f95cfdfd4aff18e82d376539b7ff760b497b09e5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:52.9695437Z",
+ "Date": "2021-08-13T16:23:23.3388296Z",
"AppVersion": "3",
"FileVersion": 9
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh
index 4c1bb3f0ed2b03e25d401fd3c18c90ed2b416e4f..bf5fe6aa72e5d9b324dc1fdce985b18627707fe5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-03T13:35:48.7867075Z",
+ "Date": "2021-08-13T16:23:20.4378209Z",
"AppVersion": "3",
"FileVersion": 10
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh
deleted file mode 100644
index 469d977c37e5384acc078dd944c05373d653fa8c..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_Tractor_PCC123EcoSS.vveh
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2021-08-03T13:36:01.6503755Z",
- "AppVersion": "3",
- "FileVersion": 10
- },
- "Body": {
- "SavedInDeclMode": false,
- "VehCat": "Tractor",
- "LegislativeClass": "Unknown",
- "CurbWeight": 8229.0,
- "CurbWeightExtra": 7500.0,
- "MassMax": 18.0,
- "Loading": 19300.0,
- "rdyn": 492.0,
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "AxleConfig": {
- "Type": "4x2",
- "Axles": [
- {
- "Inertia": 14.9,
- "Wheels": "315/70 R22.5",
- "AxleWeightShare": 0.2,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 33350.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 14.9,
- "Wheels": "315/70 R22.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": true,
- "RRCISO": 0.0065,
- "FzISO": 33350.0,
- "Type": "VehicleDriven"
- },
- {
- "Inertia": 19.2,
- "Wheels": "385/65 R22.5",
- "AxleWeightShare": 0.18333,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 41690.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 19.2,
- "Wheels": "385/65 R22.5",
- "AxleWeightShare": 0.18333,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 41690.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 19.2,
- "Wheels": "385/65 R22.5",
- "AxleWeightShare": 0.18334,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 41690.0,
- "Type": "VehicleNonDriven"
- }
- ]
- },
- "EngineStopStart": false,
- "EcoRoll": "None",
- "PredictiveCruiseControl": "Option_1_2_3",
- "ATEcoRollReleaseLockupClutch": false,
- "VehicleHeight": 3.0,
- "InitialSoC": 80.0,
- "PowertrainConfiguration": "BatteryElectric",
- "ElectricMotors": [
- {
- "Count": 1,
- "Ratio": 2.0,
- "Position": "E2",
- "MotorFile": "Emo_325kW_2170Nm.vem",
- "MechanicalEfficiency": 0.97
- }
- ],
- "Batteries": [
- {
- "NumPacks": 2,
- "BatteryFile": "GenericBattery_243kWh_750V.vbat",
- "StreamId": 0
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 213f66dc9d8f4cb1e2e647e4c104777d2229d805..040bc5dfd416b7cbea2ab898b9da6bb6b0160aeb 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2719,28 +2719,22 @@
<None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Axle_4x2_Tractor.vtlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor.vveh">
+ <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_NoADAS.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG.vecto">
+ <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_NoADAS.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC12.vecto">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC123.vecto">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC123EcoSS.vecto">
+ <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC12.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC12.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC123.vveh">
+ <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC123.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC123EcoSS.vveh">
+ <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_PCC123.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\CrestCoast1.vdri">