From 29193189ca126597028fe2709ab625674370d591 Mon Sep 17 00:00:00 2001
From: Stefanos Doumpoulakis <dubulak@gmail.com>
Date: Wed, 6 Jul 2022 05:06:39 +0300
Subject: [PATCH] a)renamed testdata folders, b)bugfix: roll during gearshift
for PWheel E2
---
.../Impl/MeasuredSpeedDrivingCycle.cs | 2 +-
.../Models/SimulationComponent/Impl/PWheelCycle.cs | 8 ++++----
.../Integration/BatteryElectric/BEVTimeRunTest.cs | 12 ++++++------
.../{GenericVehicleB2 => GenericVehicleE2}/AMT.vgbx | 0
.../Axle_4x2_Tractor.vtlm | 0
.../BEV_ENG.vecto | 0
.../BatteryElectricVehicle.vveh | 0
.../Default.vrlm | 0
.../Gear_1.vtlm | 0
.../Gear_2.vtlm | 0
.../GenericBattery_243kWh.vbatr | 0
.../GenericBattery_243kWh.vbatv | 0
.../GenericBattery_243kWh_750V.vbat | 0
.../GenericDrag_125kW_485Nm.vemd | 0
.../GenericEMotor_125kW_485Nm.vem | 0
.../GenericEMotor_125kW_485Nm.vemp | 0
.../GenericEMotor_125kW_485Nm_Cont30kW.vem | 0
.../GenericMap_125kW_485Nm.vemo | 0
.../MaxCurrent.vimax | 0
.../MeasuredSpeedGear_LongHaul.vdri | 0
.../MeasuredSpeedGear_RegionalDelivery.vdri | 0
.../MeasuredSpeedGear_UrbanDelivery.vdri | 0
.../MeasuredSpeed_LongHaul.vdri | 0
.../MeasuredSpeed_RegionalDelivery.vdri | 0
.../MeasuredSpeed_UrbanDelivery.vdri | 0
.../PTO-idle.vptol | 0
.../PWheel_LongHaul.vdri | 0
.../PWheel_RegionalDelivery.vdri | 0
.../PWheel_UrbanDelivery.vdri | 0
.../Truck.vacc | 0
.../distance.vsum | 0
.../{GenericVehicleB3 => GenericVehicleE3}/Axle.vgbx | 0
.../Axle_4x2_Tractor.vtlm | 0
.../BEV_ENG.vecto | 0
.../BatteryElectricVehicle.vveh | 0
.../GenericBattery_243kWh.vbatr | 0
.../GenericBattery_243kWh.vbatv | 0
.../GenericBattery_243kWh_750V.vbat | 0
.../GenericDrag_125kW_485Nm.vemd | 0
.../GenericEMotor_125kW_485Nm.vem | 0
.../GenericEMotor_125kW_485Nm.vemp | 0
.../GenericEMotor_125kW_485Nm_Cont30kW.vem | 0
.../GenericMap_125kW_485Nm.vemo | 0
.../MaxCurrent.vimax | 0
.../MeasuredSpeed_LongHaul.vdri | 0
.../MeasuredSpeed_RegionalDelivery.vdri | 0
.../MeasuredSpeed_UrbanDelivery.vdri | 0
.../PWheel_LongHaul.vdri | 0
.../PWheel_RegionalDelivery.vdri | 0
.../PWheel_UrbanDelivery.vdri | 0
.../Truck.vacc | 0
.../distance.vsum | 0
.../BEV_ENG.vecto | 0
.../BatteryElectricVehicle.vveh | 0
.../GenericBattery_243kWh.vbatr | 0
.../GenericBattery_243kWh.vbatv | 0
.../GenericBattery_243kWh_750V.vbat | 0
.../GenericDrag_125kW_485Nm.vemd | 0
.../GenericEMotor_125kW_485Nm.vem | 0
.../GenericEMotor_125kW_485Nm.vemp | 0
.../GenericEMotor_125kW_485Nm_Cont30kW.vem | 0
.../GenericMap_125kW_485Nm.vemo | 0
.../MaxCurrent.vimax | 0
.../MeasuredSpeed_LongHaul.vdri | 0
.../MeasuredSpeed_RegionalDelivery.vdri | 0
.../MeasuredSpeed_UrbanDelivery.vdri | 0
.../PWheel_LongHaul.vdri | 0
.../PWheel_RegionalDelivery.vdri | 0
.../PWheel_UrbanDelivery.vdri | 0
.../Truck.vacc | 0
.../distance.vsum | 0
71 files changed, 11 insertions(+), 11 deletions(-)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/AMT.vgbx (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/Axle_4x2_Tractor.vtlm (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/BEV_ENG.vecto (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/BatteryElectricVehicle.vveh (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/Default.vrlm (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/Gear_1.vtlm (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/Gear_2.vtlm (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericBattery_243kWh.vbatr (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericBattery_243kWh.vbatv (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericBattery_243kWh_750V.vbat (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericDrag_125kW_485Nm.vemd (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericEMotor_125kW_485Nm.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericEMotor_125kW_485Nm.vemp (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericEMotor_125kW_485Nm_Cont30kW.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/GenericMap_125kW_485Nm.vemo (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MaxCurrent.vimax (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeedGear_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeedGear_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeedGear_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeed_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeed_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/MeasuredSpeed_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/PTO-idle.vptol (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/PWheel_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/PWheel_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/PWheel_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/Truck.vacc (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB2 => GenericVehicleE2}/distance.vsum (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/Axle.vgbx (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/Axle_4x2_Tractor.vtlm (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/BEV_ENG.vecto (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/BatteryElectricVehicle.vveh (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericBattery_243kWh.vbatr (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericBattery_243kWh.vbatv (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericBattery_243kWh_750V.vbat (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericDrag_125kW_485Nm.vemd (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericEMotor_125kW_485Nm.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericEMotor_125kW_485Nm.vemp (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericEMotor_125kW_485Nm_Cont30kW.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/GenericMap_125kW_485Nm.vemo (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/MaxCurrent.vimax (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/MeasuredSpeed_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/MeasuredSpeed_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/MeasuredSpeed_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/PWheel_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/PWheel_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/PWheel_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/Truck.vacc (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB3 => GenericVehicleE3}/distance.vsum (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/BEV_ENG.vecto (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/BatteryElectricVehicle.vveh (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericBattery_243kWh.vbatr (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericBattery_243kWh.vbatv (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericBattery_243kWh_750V.vbat (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericDrag_125kW_485Nm.vemd (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericEMotor_125kW_485Nm.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericEMotor_125kW_485Nm.vemp (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericEMotor_125kW_485Nm_Cont30kW.vem (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/GenericMap_125kW_485Nm.vemo (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/MaxCurrent.vimax (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/MeasuredSpeed_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/MeasuredSpeed_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/MeasuredSpeed_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/PWheel_LongHaul.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/PWheel_RegionalDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/PWheel_UrbanDelivery.vdri (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/Truck.vacc (100%)
rename VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/{GenericVehicleB4 => GenericVehicleE4}/distance.vsum (100%)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
index 252658630f..d3aa78f699 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
@@ -102,7 +102,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public IResponse Initialize()
{
- if (DataBus.GearboxCtl != null) {
+ if ((RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) && (DataBus.GearboxCtl != null)) {
DataBus.GearboxCtl.GearShiftTriggered -= GearShiftTriggered;
DataBus.GearboxCtl.GearShiftTriggered += GearShiftTriggered;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
index 85a792007a..05ba89e381 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
@@ -87,7 +87,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IResponse Initialize()
{
- if (DataBus.GearboxCtl != null) {
+ if ((RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) && (DataBus.GearboxCtl != null)) {
DataBus.GearboxCtl.GearShiftTriggered -= GearShiftTriggered;
DataBus.GearboxCtl.GearShiftTriggered += GearShiftTriggered;
}
@@ -117,8 +117,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return new ResponseCycleFinished(this);
}
- DetermineDriverAction();
-
// interval exceeded
if (CycleIterator.RightSample != null && (absTime + dt).IsGreater(CycleIterator.RightSample.Time)) {
return new ResponseFailTimeInterval(this) {
@@ -127,6 +125,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
};
}
+ DetermineDriverAction();
+
return DoHandleRequest(absTime, dt, CycleIterator.LeftSample.WheelAngularVelocity);
}
@@ -180,7 +180,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private void DetermineDriverAction()
{
- if (RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
+ if (RunData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
DetermineDriverActionForBEV();
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
index 7a7f80365f..06c6d2a757 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
@@ -15,9 +15,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
[Parallelizable(ParallelScope.All)]
public class BEVTimeRunTest
{
- private const string E2_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleB2\BEV_ENG.vecto";
- private const string E3_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleB3\BEV_ENG.vecto";
- private const string E4_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleB4\BEV_ENG.vecto";
+ private const string E2_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleE2\BEV_ENG.vecto";
+ private const string E3_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleE3\BEV_ENG.vecto";
+ private const string E4_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericVehicleE4\BEV_ENG.vecto";
[OneTimeSetUp]
public void Init()
@@ -36,9 +36,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
TestCase(E2_JOB, 7, 1, 4.3124, 117.0889, TestName = "E2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(E2_JOB, 8, 2, 28.8197, 125.4709, TestName = "E2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
- TestCase(E2_JOB, 9, 0, 1.1568, 119.989, TestName = "E2 BEV TimeRun PWheel LongHaul"),
- TestCase(E2_JOB, 10, 1, 4.4741, 116.9733, TestName = "E2 BEV TimeRun PWheel RegionalDelivery"),
- TestCase(E2_JOB, 11, 2, 30.5471, 124.9811, TestName = "E2 BEV TimeRun PWheel UrbanDelivery"),
+ TestCase(E2_JOB, 9, 0, 1.155, 119.989, TestName = "E2 BEV TimeRun PWheel LongHaul"),
+ TestCase(E2_JOB, 10, 1, 4.4643, 116.9733, TestName = "E2 BEV TimeRun PWheel RegionalDelivery"),
+ TestCase(E2_JOB, 11, 2, 30.4811, 125.033, TestName = "E2 BEV TimeRun PWheel UrbanDelivery"),
TestCase(E3_JOB, 0, 0, 0.7916, 101.6194, TestName = "E3 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E3_JOB, 1, 1, 3.3777, 104.792, TestName = "E3 BEV TimeRun MeasuredSpeed RegionalDelivery"),
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/AMT.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/AMT.vgbx
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/AMT.vgbx
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/AMT.vgbx
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Axle_4x2_Tractor.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Axle_4x2_Tractor.vtlm
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Axle_4x2_Tractor.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BEV_ENG.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BEV_ENG.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/BatteryElectricVehicle.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/BatteryElectricVehicle.vveh
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Default.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Default.vrlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Default.vrlm
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Default.vrlm
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Gear_1.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Gear_1.vtlm
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Gear_1.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Gear_2.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Gear_2.vtlm
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Gear_2.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericEMotor_125kW_485Nm_Cont30kW.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeedGear_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeedGear_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/MeasuredSpeed_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/MeasuredSpeed_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PTO-idle.vptol b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PTO-idle.vptol
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PTO-idle.vptol
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PTO-idle.vptol
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/PWheel_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/PWheel_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Truck.vacc
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/Truck.vacc
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/distance.vsum b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB2/distance.vsum
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE2/distance.vsum
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Axle.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Axle.vgbx
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Axle.vgbx
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Axle.vgbx
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Axle_4x2_Tractor.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Axle_4x2_Tractor.vtlm
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Axle_4x2_Tractor.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BEV_ENG.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BEV_ENG.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/BatteryElectricVehicle.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/BatteryElectricVehicle.vveh
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm_Cont30kW.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm_Cont30kW.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericEMotor_125kW_485Nm_Cont30kW.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericEMotor_125kW_485Nm_Cont30kW.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/MeasuredSpeed_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/MeasuredSpeed_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/PWheel_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/PWheel_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Truck.vacc
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/Truck.vacc
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/distance.vsum b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/distance.vsum
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB3/distance.vsum
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE3/distance.vsum
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BEV_ENG.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BEV_ENG.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/BatteryElectricVehicle.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/BatteryElectricVehicle.vveh
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh.vbatr
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh.vbatv
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh_750V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericBattery_243kWh_750V.vbat
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericBattery_243kWh_750V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericDrag_125kW_485Nm.vemd b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericDrag_125kW_485Nm.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericDrag_125kW_485Nm.vemd
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericDrag_125kW_485Nm.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm.vemp
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm_Cont30kW.vem b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm_Cont30kW.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericEMotor_125kW_485Nm_Cont30kW.vem
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericEMotor_125kW_485Nm_Cont30kW.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericMap_125kW_485Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericMap_125kW_485Nm.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/GenericMap_125kW_485Nm.vemo
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/GenericMap_125kW_485Nm.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/MeasuredSpeed_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/MeasuredSpeed_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_LongHaul.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_LongHaul.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_LongHaul.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_LongHaul.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_RegionalDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_RegionalDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_RegionalDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_RegionalDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_UrbanDelivery.vdri b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_UrbanDelivery.vdri
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/PWheel_UrbanDelivery.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/PWheel_UrbanDelivery.vdri
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/Truck.vacc
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/Truck.vacc
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/distance.vsum b/VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/distance.vsum
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleB4/distance.vsum
rename to VectoCore/VectoCoreTest/TestData/Integration/TimeRun/MeasuredSpeed/GenericVehicleE4/distance.vsum
--
GitLab