diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 642636c4e435266185dea897755df1f80672a11e..eb534187d24f112c789cef8d0713c3e66835dc81 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -26,8 +26,8 @@ Namespace UnitTests
Private _cycleDurationMinutes As Single = 51.9
Private _totalAirDemand As Single
- Private _actuationsMapPath As String = "Testfiles/testPneumaticActuationsMap_GOODMAP.apac"
- Private _compressorMapPath As String = "Testfiles/testCompressorMap.acmp"
+ Private _actuationsMapPath As String = "TestFiles/testPneumaticActuationsMap_GOODMAP.apac"
+ Private _compressorMapPath As String = "TestFiles/testCompressorMap.acmp"
Private _defaultInputConfig As PneumaticUserInputsConfig
Private _Signals As ISignals = New Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 2030baa80f757015c3e457bb96247fee24ea9665..a88be98fc8b7988d43fa992e85ac86d89cdefc03 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -28,7 +28,7 @@ Namespace UnitTests
- Private Const COMBINEDALT_GOODMAP = "testfiles/testCombinedAlternatorMap.aalt"
+ Private Const COMBINEDALT_GOODMAP = "TestFiles/testCombinedAlternatorMap.aalt"
Sub New()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 47aaf2613c5655c237d1f01ce6df9d255d962bdb..6eb1a3904336fa592c3af3c38885b8f8c7dd7199 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -48,11 +48,11 @@ Namespace UnitTests
signals.EngineSpeed = 2000.RPMtoRad()
Dim auxConfig = Utils.GetAuxTestConfig()
- 'CType(CType(auxConfig.SSMInputs, SSMInputs).Vehicle, VehicleData).Height = 0.SI(of Meter)
+ 'CType(CType(auxConfig.SSMInputs, SSMInputs).Vehicle, VehicleData).Height = 0.SI(of Meter)
- Dim altMap As IAlternatorMap = AlternatorReader.ReadMap( "testfiles/testAlternatorMap.aalt")
+ Dim altMap As IAlternatorMap = AlternatorReader.ReadMap("TestFiles/testAlternatorMap.aalt")
'altMap.Initialise()
- CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).PowerNetVoltage = 26.3.SI(Of Volt)
+ CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).PowerNetVoltage = 26.3.SI(Of Volt)
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).AlternatorMap =altMap
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).AlternatorGearEfficiency = 0.8
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 14c1ba6b7747427862b78a6f4438acc3ec44be81..4398489b45aab4cb10b3c60085e5ed5792552fd6 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -16,8 +16,8 @@ Namespace UnitTests
Public Class M5_SmartAlternatorSetGenerationTests
'Constants
Private Shared ReadOnly _powerNetVoltage As Volt = 26.3.SI(of Volt)
- Private Const _hvacMap As String = "testFiles/TestHvacMap.csv"
- Private Const _altMap As String = "testFiles/testAlternatormap.aalt"
+ Private Const _hvacMap As String = "TestFiles/TestHvacMap.csv"
+ Private Const _altMap As String = "TestFiles/testAlternatorMap.aalt"
Private Const _rpm As Integer = 2000
Private Const _altGearPullyEfficiency As Single = 0.8
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
index 83202d285f101cc38fae8f66f0d1b6445eba7c19..a1d622012bb57ed95c13c4c4170483311e9c7cfa 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
@@ -105,7 +105,7 @@ Public Class Utils
.ResultCardIdle = New DummyResultCard(), ' New ResultCard(New List(Of SmartResult)()),
.ResultCardTraction = New DummyResultCard(), 'New ResultCard(New List(Of SmartResult)()),
.ResultCardOverrun = New DummyResultCard(), 'New ResultCard(New List(Of SmartResult)()),
- .AlternatorMap = AlternatorReader.ReadMap("TestFiles/testAlternatormap.aalt"),
+ .AlternatorMap = AlternatorReader.ReadMap("TestFiles/testAlternatorMap.aalt"),
.DoorActuationTimeSecond = Constants.BusAuxiliaries.ElectricalConsumers.DoorActuationTimeSecond,
.PowerNetVoltage = Constants.BusAuxiliaries.ElectricSystem.PowernetVoltage,
.AlternatorType = AlternatorType.Conventional
@@ -117,28 +117,28 @@ Public Class Utils
.AdBlueDosing = ConsumerTechnology.Pneumatically,
.AirSuspensionControl = ConsumerTechnology.Mechanically,
.Doors = ConsumerTechnology.Pneumatically,
- .KneelingHeight = 70.SI(Unit.SI.Milli.Meter).Cast (Of Meter),
+ .KneelingHeight = 70.SI(Unit.SI.Milli.Meter).Cast(Of Meter),
.SmartAirCompression = False,
- .SmartRegeneration = False
+ .SmartRegeneration = False
},
.SSMInputsCooling = New SSMInputs(Nothing, heatingFuel) With {
.Technologies = techBenefits,
.BusFloorType = FloorType.HighFloor,
.BusSurfaceArea = 0.SI(Of SquareMeter),
.BusVolumeVentilation = 0.SI(Of CubicMeter),
- .BusWindowSurface = 0.SI(of SquareMeter),
+ .BusWindowSurface = 0.SI(Of SquareMeter),
.UValue = 3.SI(Of WattPerKelvinSquareMeter),
- .VentilationRate = 20.SI(Unit.SI.Per.Hour).Cast (Of PerSecond),
- .VentilationRateHeating = 20.SI(Unit.SI.Per.Hour).Cast (Of PerSecond),
+ .VentilationRate = 20.SI(Unit.SI.Per.Hour).Cast(Of PerSecond),
+ .VentilationRateHeating = 20.SI(Unit.SI.Per.Hour).Cast(Of PerSecond),
.DefaultConditions =
- New EnvironmentalConditionMapEntry(25.0.DegCelsiusToKelvin(), 400.SI (Of WattPerSquareMeter), 1.0),
+ New EnvironmentalConditionMapEntry(25.0.DegCelsiusToKelvin(), 400.SI(Of WattPerSquareMeter), 1.0),
.EnvironmentalConditionsMap = DeclarationData.BusAuxiliaries.DefaultEnvironmentalConditions,
.HeatingBoundaryTemperature = 18.0.DegCelsiusToKelvin(),
.CoolingBoundaryTemperature = 23.0.DegCelsiusToKelvin(),
- .SpecificVentilationPower = 0.56.SI(Unit.SI.Watt.Hour.Per.Cubic.Meter).Cast (Of JoulePerCubicMeter),
- .HVACMaxCoolingPowerPassenger = 18.si(Unit.SI.kilo.watt).Cast (of Watt),
- .AuxHeaterEfficiency = 0.84,
- .FuelFiredHeaterPower = 30.SI(Unit.SI.kilo.watt).Cast (Of Watt),
+ .SpecificVentilationPower = 0.56.SI(Unit.SI.Watt.Hour.Per.Cubic.Meter).Cast(Of JoulePerCubicMeter),
+ .HVACMaxCoolingPowerPassenger = 18.SI(Unit.SI.Kilo.Watt).Cast(Of Watt),
+ .AuxHeaterEfficiency = 0.84,
+ .FuelFiredHeaterPower = 30.SI(Unit.SI.Kilo.Watt).Cast(Of Watt),
.FuelEnergyToHeatToCoolant = Constants.BusAuxiliaries.Heater.FuelEnergyToHeatToCoolant,
.CoolantHeatTransferredToAirCabinHeater =
Constants.BusAuxiliaries.Heater.CoolantHeatTransferredToAirCabinHeater,
@@ -150,7 +150,7 @@ Public Class Utils
.Braking = 153,
.ParkBrakeAndDoors = 24,
.Kneeling = 25,
- .CycleTime = 1000.SI(of Second)()
+ .CycleTime = 1000.SI(Of Second)()
}
}
Return retVal
diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs
index 67812bed1a55b7fc0da537b57f62f53492f92ffe..1f6c1ddc5b1f1d32019dde847756728de63bf73d 100644
--- a/VectoCommon/VectoHashingTest/VectoHashTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs
@@ -661,7 +661,7 @@ namespace VectoHashingTest
}
- private const string WheelsFileToHash25 = @"Testdata\XML\ToHash\Tyre_v25.xml";
+ private const string WheelsFileToHash25 = @"Testdata/XML/ToHash/Tyre_v25.xml";
[TestCase(WheelsFileToHash25)]
public void TestTyreValidDimension(string file)
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index a1ec47b363fb81230df46499e1a35d37c05ad2d6..a847874d87b610e13bd18c5d4ac2f7dcdf471387 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -25,4 +25,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
+
+ <ItemGroup>
+ <None Include="TestData\**\*.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/VectoResultHashSort.cs b/VectoCommon/VectoHashingTest/VectoResultHashSort.cs
index 14d1bbb30bd73ba5323b4523104d0f18e9bb2b04..1abfe0234d9d64c91d519fd520a8c470c5040a03 100644
--- a/VectoCommon/VectoHashingTest/VectoResultHashSort.cs
+++ b/VectoCommon/VectoHashingTest/VectoResultHashSort.cs
@@ -26,8 +26,8 @@ namespace VectoHashingTest
{
public class VectoResultHashSort
{
- private const string UnsortedJobPath = @"TestData\XML\Sort\Results\Unsorted\";
- private const string SortedJobPath = @"TestData\XML\Sort\Results\Sorted\";
+ private const string UnsortedJobPath = @"TestData/XML/Sort/Results/Unsorted/";
+ private const string SortedJobPath = @"TestData/XML/Sort/Results/Sorted/";
public void RunBeforeAnyTests()
{
diff --git a/VectoCore/VectoCoreTest/InputData/IEPCMapReaderTest.cs b/VectoCore/VectoCoreTest/InputData/IEPCMapReaderTest.cs
index f434df4ae0907bbbb9f272402bcd531e53829339..2478390b176c46eb52f9797b754d70241fef9aae 100644
--- a/VectoCore/VectoCoreTest/InputData/IEPCMapReaderTest.cs
+++ b/VectoCore/VectoCoreTest/InputData/IEPCMapReaderTest.cs
@@ -29,7 +29,7 @@ namespace TUGraz.VectoCore.Tests.InputData
public class IEPCMapReaderTest
{
public const string repoRoot = "../../../../../"; //from cwd to repo root
- public const string iepcMapTestFiles = @"TestData\Components\IEPC\IEPCMapReader\";
+ public const string iepcMapTestFiles = @"TestData/Components/IEPC/IEPCMapReader/";
@@ -229,7 +229,7 @@ namespace TUGraz.VectoCore.Tests.InputData
var dirInfo = Directory.CreateDirectory($@"{nameof(IEPCMapReaderTest)}//{String.Join("", TestContext.CurrentContext.Test.Name.Replace(repoRoot, "").Split(Path.GetInvalidFileNameChars()))}");
- chart.SaveImage($"{dirInfo.FullName}\\{(fileName.EndsWith(".png") ? fileName : fileName + ".png")}",
+ chart.SaveImage($"{dirInfo.FullName}/{(fileName.EndsWith(".png") ? fileName : fileName + ".png")}",
ChartImageFormat.Png);
TestContext.WriteLine($"{dirInfo.FullName}");
}
diff --git a/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryTest.cs b/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryTest.cs
index 4f60f2685a6c5d088373d5f30704234fdc3f1222..b7af1b156515b10cb7a6829cb09a1a09413d0ec1 100644
--- a/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryTest.cs
@@ -19,8 +19,8 @@ namespace TUGraz.VectoCore.Tests.InputData.RunDataFactory;
[TestFixture]
public class RunDataFactoryTest
{
- private const string BASE_DIR = @"TestData\Integration\DeclarationMode\2nd_AmendDeclMode\";
- private const string HEAVY_LORRY_DIR = BASE_DIR + @"HeavyLorry\";
+ private const string BASE_DIR = @"TestData/Integration/DeclarationMode/2nd_AmendDeclMode/";
+ private const string HEAVY_LORRY_DIR = BASE_DIR + @"HeavyLorry/";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
@@ -34,49 +34,49 @@ public class RunDataFactoryTest
}
- //[TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2_ovc.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_S3.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_S4.xml"),
- //TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml"),
- //TestCase(@"HeavyLorry\IEPC_heavyLorry.xml"),
-
- //[TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2_realistic.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_E3_realistic.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_E4.xml")]
- //TestCase(@"MediumLorry\Conventional_mediumLorry_AMT.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2_ovc.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_IEPC-S.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_S3.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_S4.xml"),
- //TestCase(@"MediumLorry\HEV_mediumLorry_AMT_Px.xml"),
- //TestCase(@"MediumLorry\IEPC_mediumLorry.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_AMT_E2.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_APT-N_E2.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_E3.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_E4.xml"),
- //TestCase(@"PrimaryBus\Conventional_primaryBus_AMT.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_S3.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_S4.xml"),
- //TestCase(@"PrimaryBus\HEV_primaryBus_AMT_Px.xml"),
- //TestCase(@"PrimaryBus\IEPC_primaryBus.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_AMT_E2.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_E3.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_E4.xml"),
- ////TestCase(@"CompletedBus\Conventional_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\HEV_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\IEPC_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\PEV_completedBus_1.xml"),
- //TestCase(@"ExemptedVehicles\exempted_completedBus_input_full.xml"),
- //TestCase(@"ExemptedVehicles\exempted_completedBus_input_only_mandatory_entries.xml"),
- //TestCase(@"ExemptedVehicles\exempted_heavyLorry.xml"),
- //TestCase(@"ExemptedVehicles\exempted_mediumLorry.xml"),
- //TestCase(@"ExemptedVehicles\exempted_primaryBus.xml"),
+ //[TestCase(@"HeavyLorry/Conventional_heavyLorry_AMT.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2_ovc.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_S3.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_S4.xml"),
+ //TestCase(@"HeavyLorry/HEV_heavyLorry_AMT_Px.xml"),
+ //TestCase(@"HeavyLorry/IEPC_heavyLorry.xml"),
+
+ //[TestCase(@"HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_E3_realistic.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_E4.xml")]
+ //TestCase(@"MediumLorry/Conventional_mediumLorry_AMT.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_AMT_S2.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_AMT_S2_ovc.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_IEPC-S.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_S3.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_S4.xml"),
+ //TestCase(@"MediumLorry/HEV_mediumLorry_AMT_Px.xml"),
+ //TestCase(@"MediumLorry/IEPC_mediumLorry.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_AMT_E2.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_APT-N_E2.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_E3.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_E4.xml"),
+ //TestCase(@"PrimaryBus/Conventional_primaryBus_AMT.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_AMT_S2.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_IEPC-S.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_S3.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_S4.xml"),
+ //TestCase(@"PrimaryBus/HEV_primaryBus_AMT_Px.xml"),
+ //TestCase(@"PrimaryBus/IEPC_primaryBus.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_AMT_E2.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_E3.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_E4.xml"),
+ ////TestCase(@"CompletedBus/Conventional_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/HEV_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/IEPC_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/PEV_completedBus_1.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_completedBus_input_full.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_heavyLorry.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_mediumLorry.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_primaryBus.xml"),
public void PEVHeavyLorryTest(string jobFile)
{
var runData = CreateRundata(jobFile,BASE_DIR,
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
index 04e717ce2e8dfbdb523c2ae5768c749a4b09cbfb..0d5272ecc7bf3f08b7b13546820a5d1794aa256b 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs
@@ -15,13 +15,13 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
[Parallelizable(ParallelScope.All)]
public class BEVTimeRunTest
{
- 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";
- private const string IEPC3X_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericIEPC\IEPC_Gbx3Speed\IEPC_ENG_Gbx3.vecto";
- private const string IEPC3X_AXLE_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericIEPC\IEPC_Gbx3Speed+Axle\IEPC_ENG_Gbx3Axl.vecto";
- private const string IEPC3X_WHEEL1_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericIEPC\IEPC_Gbx3Speed-Whl1\IEPC_ENG_Gbx3Whl1.vecto";
- private const string IEPC3X_WHEEL2_JOB = @"TestData\Integration\TimeRun\MeasuredSpeed\GenericIEPC\IEPC_Gbx3Speed-Whl2\IEPC_ENG_Gbx3Whl2.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";
+ private const string IEPC3X_JOB = @"TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto";
+ private const string IEPC3X_AXLE_JOB = @"TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto";
+ private const string IEPC3X_WHEEL1_JOB = @"TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto";
+ private const string IEPC3X_WHEEL2_JOB = @"TestData/Integration/TimeRun/MeasuredSpeed/GenericIEPC/IEPC_Gbx3Speed-Whl2\IEPC_ENG_Gbx3Whl2.vecto";
[OneTimeSetUp]
public void Init()
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
index a6bb0de7f13ee9b6270cb1caa4b1cb7b3edf254f..06225eb654d30085a5e8da9a3ac25e07579b08ba 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
@@ -26,7 +26,7 @@ public class HeavyLorrySimulation
{
- private const string BASE_DIR = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\";
+ private const string BASE_DIR = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/";
private StandardKernel _kernel;
private IXMLInputDataReader _xmlReader;
@@ -37,15 +37,15 @@ public class HeavyLorrySimulation
_xmlReader = _kernel.Get<IXMLInputDataReader>();
}
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_AMT_E2_realistic.xml"),
- TestCase(@"HeavyLorry\Conventional\Conventional_heavyLorry_AMT.xml"),
- TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E3_realistic.xml"),
- TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E3_realistic_TorqueLimits.xml"),
- TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E3_realistic_municipal.xml"),
- TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_AMT_E2_pto_transm.xml"),
- TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E4.xml"),
- TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2.xml"),
- TestCase(@"HeavyLorry\S-HEV\Group5_HEV_P2_.xml"),
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_AMT_E2_realistic.xml"),
+ TestCase(@"HeavyLorry/Conventional/Conventional_heavyLorry_AMT.xml"),
+ TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E3_realistic.xml"),
+ TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E3_realistic_TorqueLimits.xml"),
+ TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E3_realistic_municipal.xml"),
+ TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_AMT_E2_pto_transm.xml"),
+ TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E4.xml"),
+ TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2.xml"),
+ TestCase(@"HeavyLorry/S-HEV/Group5_HEV_P2_.xml"),
Ignore("Testdata not intended for simulation - mostly dummy data")
]
public void HeavyLorrySimulationTest(string jobFile)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs
index dc428f654c94a43eb45e87bb80a2988f0953e4a2..f702dedace0cf78e51c3f365b202cad4c3dd73d1 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs
@@ -56,21 +56,21 @@ public class LorrySimulation
PTOActive, // Pto is active
}
- private const string BASE_DIR = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\";
- private const string Group5_HEV_P2_OVC = @"HeavyLorry\P-HEV\Group5_HEV_P2_ovc.xml";
- private const string Group5_HEV_P3_OVC = @"HeavyLorry\P-HEV\Group5_HEV_P3_ovc.xml";
- private const string Group5_HEV_P4_OVC = @"HeavyLorry\P-HEV\Group5_HEV_P4_ovc.xml";
- private const string Group5_HEV_P2_5_OVC = @"HeavyLorry\P-HEV\Group5_HEV_P2_5_ovc.xml";
- private const string Group5_HEV_S2_OVC = @"HeavyLorry\S-HEV\Group2_HEV_S2_ovc.xml";
- private const string Group5_HEV_S3_OVC = @"HeavyLorry\S-HEV\Group2_HEV_S3_ovc.xml";
- private const string Group5_HEV_S4_OVC = @"HeavyLorry\S-HEV\Group2_HEV_S4_ovc.xml";
- private const string Group5_HEV_S_IEPC = @"HeavyLorry\S-HEV\Group2_HEV_IEPC_S.xml";
- private const string Group5_HEV_S_IEPC_pto = @"HeavyLorry\S-HEV\Group2_HEV_IEPC_S_pto.xml";
- private const string Group5_HEV_S_IEPC_ovc = @"HeavyLorry\S-HEV\Group2_HEV_IEPC_S_ovc.xml";
-
- private const string Group5_PEV_E3 = @"HeavyLorry\PEV\Group5_ PEV_E3_ES_Standard.xml";
- private const string Group2_HEV_IEPC_S_StdVal = @"HeavyLorry\S-HEV\Group2_HEV_IEPC_S_standard_values.xml";
- private const string ConventionalHeavyLorry = @"HeavyLorry\Conventional\Group5_Conv_ES_Standard.xml";
+ private const string BASE_DIR = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/";
+ private const string Group5_HEV_P2_OVC = @"HeavyLorry/P-HEV/Group5_HEV_P2_ovc.xml";
+ private const string Group5_HEV_P3_OVC = @"HeavyLorry/P-HEV/Group5_HEV_P3_ovc.xml";
+ private const string Group5_HEV_P4_OVC = @"HeavyLorry/P-HEV/Group5_HEV_P4_ovc.xml";
+ private const string Group5_HEV_P2_5_OVC = @"HeavyLorry/P-HEV/Group5_HEV_P2_5_ovc.xml";
+ private const string Group5_HEV_S2_OVC = @"HeavyLorry/S-HEV/Group2_HEV_S2_ovc.xml";
+ private const string Group5_HEV_S3_OVC = @"HeavyLorry/S-HEV/Group2_HEV_S3_ovc.xml";
+ private const string Group5_HEV_S4_OVC = @"HeavyLorry/S-HEV/Group2_HEV_S4_ovc.xml";
+ private const string Group5_HEV_S_IEPC = @"HeavyLorry/S-HEV/Group2_HEV_IEPC_S.xml";
+ private const string Group5_HEV_S_IEPC_pto = @"HeavyLorry/S-HEV/Group2_HEV_IEPC_S_pto.xml";
+ private const string Group5_HEV_S_IEPC_ovc = @"HeavyLorry/S-HEV/Group2_HEV_IEPC_S_ovc.xml";
+
+ private const string Group5_PEV_E3 = @"HeavyLorry/PEV/Group5_ PEV_E3_ES_Standard.xml";
+ private const string Group2_HEV_IEPC_S_StdVal = @"HeavyLorry/S-HEV/Group2_HEV_IEPC_S_standard_values.xml";
+ private const string ConventionalHeavyLorry = @"HeavyLorry/Conventional/Group5_Conv_ES_Standard.xml";
private StandardKernel _kernel;
@@ -90,10 +90,10 @@ public class LorrySimulation
[TestCase(ConventionalHeavyLorry, TestName = "Stefan_Conv")]
//S-HEV
[TestCase(Group5_HEV_S2_OVC)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S3_stefan.xml", TestName = "Stefan_S2")]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S3_stefan.xml", TestName = "Stefan_S2")]
//PEV
[TestCase(Group5_PEV_E3)]
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_APT_E2.xml")]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_APT_E2.xml")]
//P-HEV
[TestCase(Group5_HEV_P2_OVC)]
public void HeavyLorrySimulationTest(string jobFile)
@@ -106,20 +106,20 @@ public class LorrySimulation
}
//S-HEV
- [TestCase(@"MediumLorry\S-HEV\Group2_HEV_S2.xml")]
+ [TestCase(@"MediumLorry/S-HEV/Group2_HEV_S2.xml")]
//P-HEV
- [TestCase(@"MediumLorry\P-HEV\Group5_HEV_P3_ovc.xml")]
+ [TestCase(@"MediumLorry/P-HEV/Group5_HEV_P3_ovc.xml")]
//PEV
- [TestCase(@"MediumLorry\PEV\Group5_ PEV_E3_ES_Standard.xml")]
+ [TestCase(@"MediumLorry/PEV/Group5_ PEV_E3_ES_Standard.xml")]
public void MediumLorrySimulationTest(string jobFile)
{
RunFullSimulation(jobFile, true, false);
}
- [TestCase(@"HeavyLorry\Exempted\exempted_heavy_lorry.xml")]
+ [TestCase(@"HeavyLorry/Exempted/exempted_heavy_lorry.xml")]
public void ExemptedTest(string jobFile)
{
RunFullSimulation(jobFile, true);
@@ -479,8 +479,8 @@ public class LorrySimulation
}
#endregion
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S4_invalid_pto.xml")]
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E3_pto_transmission_invalid.xml")]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S4_invalid_pto.xml")]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E3_pto_transmission_invalid.xml")]
public void PTOWithoutTransmissionTest(string jobFile)
{
SummaryDataContainer sumDataContainer;
@@ -489,8 +489,8 @@ public class LorrySimulation
}
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_P2_supercap.xml", 10)]
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_P1_supercap.xml", 10)]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_P2_supercap.xml", 10)]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_P1_supercap.xml", 10)]
public void PHEV_SuperCap(string jobFile, int nrRuns)
{
var jobContainer = GetJobContainer(jobFile, nrRuns, out var fileWriter, out var runs, out var sumDataContainer);
@@ -510,7 +510,7 @@ public class LorrySimulation
}
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2_supercap.xml", 6)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2_supercap.xml", 6)]
public void SHEV_SuperCap(string jobFile, int nrRuns)
{
var jobContainer = GetJobContainer(jobFile, nrRuns, out var fileWriter, out var runs, out var sumDataContainer);
@@ -532,7 +532,7 @@ public class LorrySimulation
[TestCase(Group5_HEV_P3_OVC, 20)]
[TestCase(Group5_HEV_P4_OVC, 20)]
[TestCase(Group5_HEV_P2_5_OVC, 20)]
- [TestCase(@"MediumLorry\P-HEV\Group5_HEV_P3_ovc.xml", 8, MissionType.UrbanDelivery, LoadingType.ReferenceLoad)]
+ [TestCase(@"MediumLorry/P-HEV/Group5_HEV_P3_ovc.xml", 8, MissionType.UrbanDelivery, LoadingType.ReferenceLoad)]
public void PHEV_ChargeSustainingIt(string jobFile, int nrRuns, MissionType missionType = MissionType.UrbanDelivery, LoadingType loadingType = LoadingType.ReferenceLoad)
{
var jobContainer = GetJobContainer(jobFile, nrRuns, out var fileWriter, out var runs, out var sumDataContainer);
@@ -584,9 +584,9 @@ public class LorrySimulation
[TestCase(Group5_HEV_P3_OVC, 20)]
[TestCase(Group5_HEV_P4_OVC, 20)]
[TestCase(Group5_HEV_P2_5_OVC, 20)]
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_IHPC.xml", 20)]
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_P2_OVC_stefan.xml", 20, MissionType.UrbanDelivery, LoadingType.LowLoading)]
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_P3_OVC_stefan.xml", 20)]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_IHPC.xml", 20)]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_P2_OVC_stefan.xml", 20, MissionType.UrbanDelivery, LoadingType.LowLoading)]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_P3_OVC_stefan.xml", 20)]
public void PHEV_ChargeDepleting(string jobFile, int nrRuns, MissionType missionType = MissionType.UrbanDelivery, LoadingType loadingType = LoadingType.ReferenceLoad)
{
var jobContainer = GetJobContainer(jobFile, nrRuns, out var fileWriter, out var runs, out var sumDataContainer);
@@ -611,7 +611,7 @@ public class LorrySimulation
[TestCase(Group5_HEV_S3_OVC, 12)]
[TestCase(Group5_HEV_S4_OVC, 12)]
[TestCase(Group5_HEV_S_IEPC_ovc, 12)]
- //[TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S4_ovc.xml",12)]
+ //[TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S4_ovc.xml",12)]
public void SHEV_ChargeDepleting(string jobFile, int nrRuns)
{
SummaryDataContainer sumDataContainer;
@@ -649,10 +649,10 @@ public class LorrySimulation
[TestCase(Group5_HEV_S2_OVC, 12)]
[TestCase(Group5_HEV_S3_OVC, 12)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S4.xml", 6)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S4.xml", 6)]
[TestCase(Group5_HEV_S_IEPC, 6)]
[TestCase(Group2_HEV_IEPC_S_StdVal, 6)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2.xml", 6)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2.xml", 6)]
public void SHEV_ChargeSustaining(string jobFile, int nrRuns)
{
SummaryDataContainer sumDataContainer;
@@ -688,7 +688,7 @@ public class LorrySimulation
Assert.IsTrue(modData.Rows.Count > 0);
}
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2_pto_transmission.xml", 6)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2_pto_transmission.xml", 6)]
public void SHEV_PTO_Transmission(string jobFile, int nrRuns)
{
SummaryDataContainer sumDataContainer;
@@ -735,12 +735,12 @@ public class LorrySimulation
Assert.IsTrue(modData.Rows.Count > 0);
}
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_AMT_E2.xml", 6)]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_AMT_E2.xml", 6)]
[TestCase(Group5_PEV_E3,10)]
- [TestCase(@"HeavyLorry\PEV\Group5_ PEV_E4.xml",10)]
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E4_standardValues.xml", 6)]
- [TestCase(@"HeavyLorry\PEV\Group5_ PEV_IEPC_E.xml",10)]
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_APT_E2.xml", null)]
+ [TestCase(@"HeavyLorry/PEV/Group5_ PEV_E4.xml",10)]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E4_standardValues.xml", 6)]
+ [TestCase(@"HeavyLorry/PEV/Group5_ PEV_IEPC_E.xml",10)]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_APT_E2.xml", null)]
public void PEV(string jobFile, int? nrRuns)
{
SummaryDataContainer sumDataContainer;
@@ -842,7 +842,7 @@ public class LorrySimulation
}
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2_pto_transmission.xml", @"HeavyLorry\S-HEV\Group2_HEV_S2.xml")]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2_pto_transmission.xml", @"HeavyLorry/S-HEV/Group2_HEV_S2.xml")]
[Ignore("not ready, maybe this test doesn't make any sense")]
public void PEVPtoTransmission(string withPTOTransmission, string withoutPTOTransmission)
{
@@ -879,9 +879,9 @@ public class LorrySimulation
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E3_supercap_invalid.xml", TestName="SuperCap used in PEV")]
- [TestCase(@"HeavyLorry\P-HEV\Group5_HEV_P2_ovc_supercap_invalid.xml", TestName="SuperCap used in OVC P-HEV")]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2_ovc_supercap_invalid.xml", TestName="SuperCap used in OVC S-HEV")]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E3_supercap_invalid.xml", TestName="SuperCap used in PEV")]
+ [TestCase(@"HeavyLorry/P-HEV/Group5_HEV_P2_ovc_supercap_invalid.xml", TestName="SuperCap used in OVC P-HEV")]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2_ovc_supercap_invalid.xml", TestName="SuperCap used in OVC S-HEV")]
public void SuperCapFailTest(string jobFile)
{
var ex = Assert.Throws<VectoException>(() => {
@@ -898,14 +898,14 @@ public class LorrySimulation
//}
- [TestCase(@"HeavyLorry\PEV\PEV_heavyLorry_E4_pto.xml", 8)]
- [TestCase(@"HeavyLorry\PEV\Group5_ PEV_IEPC_E_pto.xml", 8)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S3_pto.xml", 8)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_IEPC_S_pto.xml", 8)]
- [TestCase(@"HeavyLorry\S-HEV\Group2_HEV_S2_supercap_epto.xml", 8)]
+ [TestCase(@"HeavyLorry/PEV/PEV_heavyLorry_E4_pto.xml", 8)]
+ [TestCase(@"HeavyLorry/PEV/Group5_ PEV_IEPC_E_pto.xml", 8)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S3_pto.xml", 8)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_IEPC_S_pto.xml", 8)]
+ [TestCase(@"HeavyLorry/S-HEV/Group2_HEV_S2_supercap_epto.xml", 8)]
public void EPTO(string jobFile, int nrRuns)
{
- //"HeavyLorry\S-HEV\Group2_HEV_S2_supercap_epto.xml"
+ //"HeavyLorry/S-HEV/Group2_HEV_S2_supercap_epto.xml"
///Charge is 0 in TestPowertrain but 45,9 kW in real powertrain
/// SM state of serial hybrid strategy in breaking phase was Break_S1 -> selects Accelerate S1 as new accelerate phase -> GEN is on but supercap is (almost full)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
index 4b0b18cf45678675fa27b5de78cfe978ffe82544..81e56cd7a7ac539cc1dc4b11c3886b482917b6af 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
@@ -42,12 +42,12 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration.PrimaryBus;
public class PrimaryBusSimulation
{
- private const string BASE_DIR = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\";
+ private const string BASE_DIR = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/";
- private const string BASE_DIR_COMPLETED = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\CompletedBus";
+ private const string BASE_DIR_COMPLETED = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus";
- private const string BASE_DIR_FACTOR_METHOD_MODEL_DATA = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\CompletedBus\FactorMethod";
- private const string BASE_DIR_VIF = @"TestData\Integration\DeclarationMode\2nd_AmendmDeclMode\CompletedBus\VIF";
+ private const string BASE_DIR_FACTOR_METHOD_MODEL_DATA = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/FactorMethod";
+ private const string BASE_DIR_VIF = @"TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF";
private ThreadLocal<StandardKernel> _kernel;
private StandardKernel Kernel => _kernel.Value;
@@ -128,37 +128,37 @@ public class PrimaryBusSimulation
TestCase(@"PrimaryBus/S-HEV/PrimaryCoach_S2_Base_AMT.xml", 0, TestName = "2nd Amendment PrimaryBus Coach S-HEV S2 Base"),
TestCase(@"PrimaryBus/S-HEV/PrimaryCityBus_IEPC-S_Base.xml", 0, TestName = "2nd Amendment PrimaryBus CityBus S-HEV IEPC Base"),
- TestCase(@"PrimaryBus/exempted/exempted_primary_heavyBus.xml", 0, TestName = "2nd Amendment PrimaryBus Exempted"),
+ TestCase(@"PrimaryBus/Exempted/exempted_primary_heavyBus.xml", 0, TestName = "2nd Amendment PrimaryBus Exempted"),
- TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_elFan_elSteer"),
- TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_mechFan_mechSteer"),
- TestCase(@"FactorMethod\Conventional\P31_32_SmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_elFan_elSteer"),
- TestCase(@"FactorMethod\Conventional\P31_32_SmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_mechFan_mechSteer"),
+ TestCase(@"FactorMethod/Conventional/P31_32_nonSmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_elFan_elSteer"),
+ TestCase(@"FactorMethod/Conventional/P31_32_nonSmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_mechFan_mechSteer"),
+ TestCase(@"FactorMethod/Conventional/P31_32_SmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_elFan_elSteer"),
+ TestCase(@"FactorMethod/Conventional/P31_32_SmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_mechFan_mechSteer"),
- TestCase(@"FactorMethod\IEPC\P31_32_IEPC_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC EDP"),
- TestCase(@"FactorMethod\IEPC\P31_32_IEPC_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC FESG"),
+ TestCase(@"FactorMethod/IEPC/P31_32_IEPC_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC EDP"),
+ TestCase(@"FactorMethod/IEPC/P31_32_IEPC_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC FESG"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_elFan_elSteer"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechFan_elSteer"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechAux"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC SmartES_elFan_ElSteer"),
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_elFan_elSteer"),
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechFan_elSteer"),
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechAux"),
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC SmartES_elFan_ElSteer"),
- TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 EDP"),
- TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 FESG"),
+ TestCase(@"FactorMethod/PEV/P31_32_E2_AMT_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 EDP"),
+ TestCase(@"FactorMethod/PEV/P31_32_E2_AMT_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 FESG"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_elFan_elPS"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.xml", -1, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_mechAux"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 SmartES_elPS_elSteer"),
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_elFan_elPS"),
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.xml", -1, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_mechAux"),
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 SmartES_elPS_elSteer"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_elFan_elSteer"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechFan_elSP"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechAux"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 SmartES_elFan_elSteer"),
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_elFan_elSteer"),
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechFan_elSP"),
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechAux"),
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 SmartES_elFan_elSteer"),
// Fails on almost every cycle except suburban
- TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 0, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 0"),
- TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 4, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 4"),
+ TestCase(@"FactorMethod/S-HEV/S2-HEV/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 0, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 0"),
+ TestCase(@"FactorMethod/S-HEV/S2-HEV/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 4, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 4"),
]
@@ -168,26 +168,26 @@ public class PrimaryBusSimulation
}
[
- TestCase(@"CompletedBus\VIF\primary_heavyBus group41_nonSmart.RSLT_VIF.xml", @"CompletedBus\Conventional_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Conventional"),
- TestCase(@"CompletedBus\VIF\PEV_primaryBus_AMT_E2.RSLT_VIF.xml", @"CompletedBus\PEV_completedBus_2.xml", -1, TestName = "2nd Amendment CompletedBus PEV E2"),
- TestCase(@"CompletedBus\VIF\PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml", @"CompletedBus\PEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach PEV E2"),
- TestCase(@"CompletedBus\VIF\PrimaryCityBus_IEPC_Base.RSLT_VIF.xml", @"CompletedBus\PEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus CityBus PEV IEPC"),
- TestCase(@"CompletedBus\VIF\PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV P2"),
- TestCase(@"CompletedBus\VIF\PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV P2 OVC"),
- TestCase(@"CompletedBus\VIF\PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1,true, TestName = "2nd Amendment CompletedBus CityBus HEV P1 - fails on complete cycle"),
- TestCase(@"CompletedBus\VIF\PrimaryCityBus_P1_HEV_Supercap.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1,false, TestName = "2nd Amendment CompletedBus CityBus HEV P1 SuperCap"),
- TestCase(@"CompletedBus\VIF\PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV S2 OVC"),
- TestCase(@"CompletedBus\VIF\PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus CityBus HEV IEPC-S"),
- TestCase(@"CompletedBus\VIF\exempted_primary_heavyBus.RSLT_VIF.xml", @"CompletedBus\exempted_completedBus_input_full.xml", 1, TestName = "2nd Amendment CompletedBus Exempted"),
- TestCase(@"CompletedBus\VIF\PrimaryCityBus_IHPC.RSLT_VIF.xml", @"CompletedBus\HEV_completedBus_2.xml", -1, TestName="2nd Amendment Completed Bus IHPC"),
-
- TestCase(@"FactorMethod\VIF\P31_32_nonSmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml", 0,
+ TestCase(@"CompletedBus/VIF/primary_heavyBus group41_nonSmart.RSLT_VIF.xml", @"CompletedBus/Conventional_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Conventional"),
+ TestCase(@"CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml", @"CompletedBus/PEV_completedBus_2.xml", -1, TestName = "2nd Amendment CompletedBus PEV E2"),
+ TestCase(@"CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml", @"CompletedBus/PEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach PEV E2"),
+ TestCase(@"CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml", @"CompletedBus/PEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus CityBus PEV IEPC"),
+ TestCase(@"CompletedBus/VIF/PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV P2"),
+ TestCase(@"CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV P2 OVC"),
+ TestCase(@"CompletedBus/VIF/PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1,true, TestName = "2nd Amendment CompletedBus CityBus HEV P1 - fails on complete cycle"),
+ TestCase(@"CompletedBus/VIF/PrimaryCityBus_P1_HEV_Supercap.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1,false, TestName = "2nd Amendment CompletedBus CityBus HEV P1 SuperCap"),
+ TestCase(@"CompletedBus/VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus Coach HEV S2 OVC"),
+ TestCase(@"CompletedBus/VIF/PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", 1, TestName = "2nd Amendment CompletedBus CityBus HEV IEPC-S"),
+ TestCase(@"CompletedBus/VIF/exempted_primary_heavyBus.RSLT_VIF.xml", @"CompletedBus/exempted_completedBus_input_full.xml", 1, TestName = "2nd Amendment CompletedBus Exempted"),
+ TestCase(@"CompletedBus/VIF/PrimaryCityBus_IHPC.RSLT_VIF.xml", @"CompletedBus/HEV_completedBus_2.xml", -1, TestName="2nd Amendment Completed Bus IHPC"),
+
+ TestCase(@"FactorMethod/VIF/P31_32_nonSmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod/Conventional/Conventional_32e_prim_Dim_HVAC.xml", 0,
TestName = "2nd Amendment CompletedBus Conventional nonSmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
- TestCase(@"FactorMethod\VIF\P31_32_nonSmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml", 0,
+ TestCase(@"FactorMethod/VIF/P31_32_nonSmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod/Conventional/Conventional_32e_spez_Dim_HVAC.xml", 0,
TestName = "2nd Amendment CompletedBus Conventional nonSmartES_mechFan_mechSteer 32e_spez_Dim_HVAC.xml"),
- TestCase(@"FactorMethod\VIF\P31_32_SmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml",0,
+ TestCase(@"FactorMethod/VIF/P31_32_SmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod/Conventional/Conventional_32e_prim_Dim_HVAC.xml",0,
TestName = "2nd Amendment CompletedBus Conventional SmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
- TestCase(@"FactorMethod\VIF\P31_32_SmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml", 0,
+ TestCase(@"FactorMethod/VIF/P31_32_SmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod/Conventional/Conventional_32e_spez_Dim_HVAC.xml", 0,
TestName = "2nd Amendment CompletedBus Conventional SmartES_mechFan_mechSteer 32e_spez_Dim_HVAC"),
]
@@ -245,7 +245,7 @@ public class PrimaryBusSimulation
TestCase(@"PrimaryBus/S-HEV/PrimaryCoach_S2_Base_AMT.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus Coach S-HEV S2 Base"),
TestCase(@"PrimaryBus/S-HEV/PrimaryCityBus_IEPC-S_Base.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus CityBus S-HEV IEPC Base"),
- //TestCase(@"PrimaryBus/exempted/exempted_primary_heavyBus.xml", @"exempted_completedBus_input_full.xml", 0, TestName = "2nd Amendment SingleBus Exempted"), // exempted single run not supported!
+ //TestCase(@"PrimaryBus/Exempted/exempted_primary_heavyBus.xml", @"exempted_completedBus_input_full.xml", 0, TestName = "2nd Amendment SingleBus Exempted"), // exempted single run not supported!
]
public void SingleBusSimulationTest(string jobFile, string completed, int runIdx)
@@ -269,56 +269,56 @@ public class PrimaryBusSimulation
// TestName = "2nd Amendment FactorMethodRunData CityBus HEV P1 SuperCap"),
- TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_elecFan_elecSteer.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_nonSmartES_elecFan_elecSteer.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/Conventional/P31_32_nonSmartES_elecFan_elecSteer.xml", @"FactorMethod/Conventional/Conventional_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_nonSmartES_elecFan_elecSteer.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData Conventional nonSmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
- TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_mechFan_mechSteer.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_nonSmartES_mechFan_mechSteer.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/Conventional/P31_32_nonSmartES_mechFan_mechSteer.xml", @"FactorMethod/Conventional/Conventional_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_nonSmartES_mechFan_mechSteer.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData Conventional nonSmartES_mechFan_mechSteer 32e_spez_Dim_HVAC.xml"),
- TestCase(@"FactorMethod\Conventional\P31_32_SmartES_elecFan_elecSteer.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_SmartES_elecFan_elecSteer.RSLT_VIF.xml", CycleCO, RefL,
+ TestCase(@"FactorMethod/Conventional/P31_32_SmartES_elecFan_elecSteer.xml", @"FactorMethod/Conventional/Conventional_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_SmartES_elecFan_elecSteer.RSLT_VIF.xml", CycleCO, RefL,
TestName = "2nd Amendment FactorMethodRunData Conventional SmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
- TestCase(@"FactorMethod\Conventional\P31_32_SmartES_mechFan_mechSteer.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_SmartES_mechFan_mechSteer.RSLT_VIF.xml", CycleCO, RefL,
+ TestCase(@"FactorMethod/Conventional/P31_32_SmartES_mechFan_mechSteer.xml", @"FactorMethod/Conventional/Conventional_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_SmartES_mechFan_mechSteer.RSLT_VIF.xml", CycleCO, RefL,
TestName = "2nd Amendment FactorMethodRunData Conventional SmartES_mechFan_mechSteer 32e_spez_Dim_HVAC"),
- TestCase(@"FactorMethod\IEPC\P31_32_IEPC_EDP.xml", @"FactorMethod\IEPC\IEPC_31a_completed_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IEPC_EDP.RSLT_VIF.xml", CycleHU, LowL,
+ TestCase(@"FactorMethod/IEPC/P31_32_IEPC_EDP.xml", @"FactorMethod/IEPC/IEPC_31a_completed_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IEPC_EDP.RSLT_VIF.xml", CycleHU, LowL,
TestName = "2nd Amendment FactorMethodRunData IEPC EDP prim_Dim_HVAC"),
- TestCase(@"FactorMethod\IEPC\P31_32_IEPC_FESG.xml", @"FactorMethod\IEPC\IEPC_31a_completed_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IEPC_FESG.RSLT_VIF.xml", CycleHU, RefL,
+ TestCase(@"FactorMethod/IEPC/P31_32_IEPC_FESG.xml", @"FactorMethod/IEPC/IEPC_31a_completed_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IEPC_FESG.RSLT_VIF.xml", CycleHU, RefL,
TestName = "2nd Amendment FactorMethodRunData IEPC FESG spez_Dim_HVAC"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.xml", @"FactorMethod\IHPC\IHPC_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.xml", @"FactorMethod/IHPC/IHPC_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData IHPC nonSmartES_elFan_elSteer prim_Dim_HVAC"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.xml", @"FactorMethod\IHPC\IHPC_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.xml", @"FactorMethod/IHPC/IHPC_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData IHPC nonSmartES_mechFan_elSteer spez_Dim_HVAC"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_mechAux.xml", @"FactorMethod\IHPC\IHPC_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IHPC_nonSmartES_mechAux.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_nonSmartES_mechAux.xml", @"FactorMethod/IHPC/IHPC_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IHPC_nonSmartES_mechAux.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData IHPC nonSmartES_mechAux prim_Dim_HVAC"),
- TestCase(@"FactorMethod\IHPC\P31_32_IHPC_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod\IHPC\IHPC_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_IHPC_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/IHPC/P31_32_IHPC_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod/IHPC/IHPC_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_IHPC_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData IHPC SmartES_elFan_ElSteer spez_Dim_HVAC"),
- TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_EDP.xml", @"FactorMethod\PEV\E2_31a_completed_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_E2_AMT_EDP.RSLT_VIF.xml", CycleHU, LowL,
+ TestCase(@"FactorMethod/PEV/P31_32_E2_AMT_EDP.xml", @"FactorMethod/PEV/E2_31a_completed_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_E2_AMT_EDP.RSLT_VIF.xml", CycleHU, LowL,
TestName = "2nd Amendment FactorMethodRunData PEV E2 EDP prim_Dim_HVAC"),
- TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_FESG.xml", @"FactorMethod\PEV\E2_31a_completed_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_E2_AMT_FESG.RSLT_VIF.xml", CycleHU, LowL,
+ TestCase(@"FactorMethod/PEV/P31_32_E2_AMT_FESG.xml", @"FactorMethod/PEV/E2_31a_completed_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_E2_AMT_FESG.RSLT_VIF.xml", CycleHU, LowL,
TestName = "2nd Amendment FactorMethodRunData PEV E2 FESG spez_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.xml", @"FactorMethod\P-HEV\P1-HEV\P1_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.xml", @"FactorMethod/P-HEV/P1-HEV/P1_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P1 nonSmartES_elFan_elPS prim_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.xml", @"FactorMethod\P-HEV\P1-HEV\P1_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.xml", @"FactorMethod/P-HEV/P1-HEV/P1_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P1 nonSmartES_mechAux spez_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.xml", @"FactorMethod\P-HEV\P1-HEV\P1_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P1-HEV/P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.xml", @"FactorMethod/P-HEV/P1-HEV/P1_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P1 SmartES_elPS_elSteer prim_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.xml", @"FactorMethod/P-HEV/P2-HEV/P2_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 nonSmartES_elFan_elSteer prim_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.xml", @"FactorMethod/P-HEV/P2-HEV/P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 nonSmartES_mechFan_elSP spez_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_mechAux.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_nonSmartES_mechAux.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_nonSmartES_mechAux.xml", @"FactorMethod/P-HEV/P2-HEV/P2_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P2_HEV_nonSmartES_mechAux.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 nonSmartES_mechAux prim_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod/P-HEV/P2-HEV/P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 SmartES_elFan_elSteer spez_Dim_HVAC"),
- TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestCase(@"FactorMethod/P-HEV/P2-HEV/P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod/P-HEV/P2-HEV/P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 SmartES_elFan_elSteer spez_Dim_HVAC"),
- TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", @"FactorMethod\S-HEV\S2-HEV\S2_HEV_32e_spec_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml", MissionType.Suburban, LowL,
+ TestCase(@"FactorMethod/S-HEV/S2-HEV/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", @"FactorMethod/S-HEV/S2-HEV/S2_HEV_32e_spec_Dim_HVAC.xml", @"FactorMethod/VIF/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml", MissionType.Suburban, LowL,
TestName= "2nd Amendment FactorMethodRunData S-HEV S2 nonSmartES_elecSP_mechFan"),
]
public void TestFactorMethodRunData(string primary, string completed, string vifFile, MissionType mission, LoadingType loading)
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
index 5e86c7f51be8df39f7c6f2c8c08e0e96b16ccc54..f3491f239001d6c608115a881fef4e9e4f990248 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
@@ -309,10 +309,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
//Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
}
- private const string BASE_PATH = @"E:\QUAM\Workspace\VECTO-Bugreports_DEV\Bugreport Jobs\2022\";
- [TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH\IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 4),
- TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH\IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 3),
- TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH\IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 6),
+ private const string BASE_PATH = @"E:/QUAM/Workspace/VECTO-Bugreports_DEV/Bugreport Jobs/2022/";
+ [TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH/IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 4),
+ TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH/IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 3),
+ TestCase(BASE_PATH + @"VECTO-1660_2022_11_02_VectoDaten_Iveco_CrosswayLE_MH/IVECO_CRW_LE_C9D_360hp_DNXT_7G_MH.vecto", 6),
]
public void Vecto1660_BusAux_SmartPS_with_Hybrid(string jobFile, int cycleIdx)
{
@@ -1575,8 +1575,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
}
- [TestCase(@"E:\QUAM\tmp\HybridStrategy\P1_Group31aU_ll\P1_CityBusU_ll.vecto"),
- TestCase(@"E:\QUAM\tmp\HybridStrategy\P1_Group31aU_rl\P1_CityBusU_rl.vecto"),
+ [TestCase(@"E:/QUAM/tmp/HybridStrategy/P1_Group31aU_ll/P1_CityBusU_ll.vecto"),
+ TestCase(@"E:/QUAM/tmp/HybridStrategy/P1_Group31aU_rl/P1_CityBusU_rl.vecto"),
]
public void HybridTestGerard(string jobfile)
{
diff --git a/VectoCore/VectoCoreTest/Integration/MockUpVectoTest.cs b/VectoCore/VectoCoreTest/Integration/MockUpVectoTest.cs
index e37d8eca9c25ba37303324666e5b3e79cc14640d..f48a283ce3a7455ed621e32a6341668ac2454316 100644
--- a/VectoCore/VectoCoreTest/Integration/MockUpVectoTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/MockUpVectoTest.cs
@@ -41,51 +41,51 @@
// #region TestFiles
// protected const string ConventionalHeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml";
// protected const string HEV_Px_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml";
// protected const string HEV_S2_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml";
// protected const string HEV_S3_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml";
// protected const string HEV_S3_HeavyLorry_ovc =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3_ovc.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3_ovc.xml";
// protected const string HEV_S4_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml";
// protected const string HEV_IEPC_S_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml";
// protected const string PEV_E2_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml";
// protected const string PEV_E3_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml";
// protected const string PEV_E4_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml";
// protected const string PEV_IEPC_HeavyLorry =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\IEPC_heavyLorry.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml";
// protected const string Conventional_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml";
// protected const string HEV_Px_IHPC_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV_primaryBus_AMT_Px.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml";
// protected const string HEV_S2_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml";
// protected const string HEV_S3_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml";
// protected const string HEV_S4_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml";
// protected const string HEV_IEPC_S_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml";
// protected const string PEV_E2_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml";
// protected const string PEV_E3_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E3.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml";
// protected const string PEV_E4_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E4.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml";
// protected const string PEV_IEPC_PrimaryBus =
-// @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\IEPC_primaryBus.xml";
+// @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml";
-// protected const string Conventional_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
+// protected const string Conventional_CompletedBus = @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
// #endregion
diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
index c1edb5b672d17eb013b9d1f716d86766e10e1a4e..94d7d17066fb4a6b3e017145d088e158677388e6 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -315,8 +315,8 @@ namespace TUGraz.VectoCore.Tests.Integration
}
[Category("LongRunning"),
- TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6.vecto"),
- TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6and5.vecto")]
+ TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6.vecto"),
+ TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6and5.vecto")]
public void TestRunDisableGearsWithTorqueLimitSimulations(string file)
{
var fileWriter = new FileOutputWriter(file);
@@ -330,10 +330,10 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
}
- [TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear5invalid.vecto"),
- TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear4invalid.vecto"),
- TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6and4invalid.vecto"),
- TestCase(@"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear1invalid.vecto")]
+ [TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear5invalid.vecto"),
+ TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear4invalid.vecto"),
+ TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6and4invalid.vecto"),
+ TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear1invalid.vecto")]
public void TestRunDisableGearsInvalid(string file)
{
var fileWriter = new FileOutputWriter(file);
@@ -345,8 +345,8 @@ namespace TUGraz.VectoCore.Tests.Integration
}
[Category("LongRunning"),
- TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6.vecto"),
- TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6and5.vecto")]
+ TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6and5.vecto")]
public void TestRunDisableGearsWithTorqueLimitSimulationsEngineering(string file)
{
var fileWriter = new FileOutputWriter(file);
@@ -360,10 +360,10 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
}
- [TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear5invalid.vecto"),
- TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear4invalid.vecto"),
- TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear6and4invalid.vecto"),
- TestCase(@"Testdata\Integration\EngineeringMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-disableGear1invalid.vecto")]
+ [TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear5invalid.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear4invalid.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear6and4invalid.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-disableGear1invalid.vecto")]
public void TestRunDisableGearsInvalidEngineering(string file)
{
var fileWriter = new FileOutputWriter(file);
diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
index 8108d9235562fc4ca0a40c38cd95385509742ccf..7f8e33220f5ab1833276fe419f3b9e8085dfe01f 100644
--- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
@@ -127,14 +127,14 @@ namespace TUGraz.VectoCore.Tests.Integration
}
[TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml"),
TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Tractor_4x2_vehicle-class-5_EURO6_2018.xml"),
TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x2_vehicle-class-10_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x4_vehicle-class-12_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Tractor_6x2_vehicle-class-10_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml"),
+ //TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Tractor_6x4_vehicle-class-12_EURO6_2018.xml"),
TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml")]
public void TestXMLSummaryReportExists(string jobfile)
{
@@ -165,7 +165,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.AreNotEqual(null,customerReport.XPathSelectElement("//*[local-name()='Summary']"));
}
- [TestCase(@"Testdata/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml"),
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml"),
//TestCase(@"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml") // ExemptedVehicles XML Version 1.0 no longer supported
]
public void TestValidationXMLReports(string jobfile)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/ElectricMotorRatedSpeedHelperTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/ElectricMotorRatedSpeedHelperTest.cs
index e6dba04ab8b684efb68d77f48afcc6498f13cc77..a8a55eb11269f5d7d463c9ccae53790e97d275bc 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/ElectricMotorRatedSpeedHelperTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/ElectricMotorRatedSpeedHelperTest.cs
@@ -148,7 +148,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase(1850f, 1f)]
public void IEPCFld(double expectedSpeedRpm, double ratio)
{
- var fldCruveData = VectoCSVFile.Read(@"TestData\BatteryElectric\IEPC\GenericFld.viepcp");
+ var fldCruveData = VectoCSVFile.Read(@"TestData/BatteryElectric/IEPC/GenericFld.viepcp");
var fld = IEPCFullLoadCurveReader.Create(fldCruveData, 1, ratio);
Assert.AreEqual(1850 * ratio, ElectricMotorRatedSpeedHelper.GetRatedSpeed(fld.FullLoadEntries, entry => entry.MotorSpeed,
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/HevStrategyParametersTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/HevStrategyParametersTest.cs
index 3cfa77103f61feb1de7116328e62b0c57949b4a4..641e4acb6def9f3a219365ee632751ec9e918424 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/HevStrategyParametersTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/HevStrategyParametersTest.cs
@@ -21,7 +21,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
{
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- private const string HevStrategyParamFile = @"TestData\Cycles\HEV_Strategy_Parameters_fequiv_40soc_Lorries.csv";
+ private const string HevStrategyParamFile = @"TestData/Cycles/HEV_Strategy_Parameters_fequiv_40soc_Lorries.csv";
[TestCase]
public void TestHevStrategyParametersInputLorry()
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs
index 42f5532c5de6587f4bf098845010fd3c72c69966..58a46e6fb05db04aaf9a0a3cb26342cf64d37732 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusEMotorData.cs
@@ -111,7 +111,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(@"TestData\XML\XMLVIFBusReport\IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
+ [TestCase(@"TestData/XML/XMLVIFBusReport/IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
public void TestGenericBusElectricMotorData(string filePath)
{
var multistepBusInputData = xmlInputReader.Create(filePath) as IMultistepBusInputDataProvider;
@@ -125,7 +125,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(@"TestData\XML\XMLVIFBusReport\IEPC_completedBus_2.VIF_Report_2.xml")]
+ [TestCase(@"TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml")]
public void TestGenericIEPCElectricMotorData(string iepcFilePath)
{
var multistepBusInputData = xmlInputReader.Create(iepcFilePath) as IMultistepBusInputDataProvider;
@@ -139,7 +139,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(@"TestData\XML\XMLVIFBusReport\IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
+ [TestCase(@"TestData/XML/XMLVIFBusReport/IHPC_HEV_completedBus_2.VIF_Report_1.xml")]
public void TestGenericIHPCElectricMotorData(string ihpcFilePath)
{
var multistepBusInputData = xmlInputReader.Create(ihpcFilePath) as IMultistepBusInputDataProvider;
@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(2, ihpcData.EfficiencyData.VoltageLevels.Count);
}
- [TestCase(@"TestData\XML\XMLVIFBusReport\IEPC_completedBus_2.VIF_Report_2.xml", 0.5)]
+ [TestCase(@"TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml", 0.5)]
public void TestGenericBatteryData(string vifFilePath, double initialSoC)
{
var multistepBusInputData = xmlInputReader.Create(vifFilePath) as IMultistepBusInputDataProvider;
@@ -205,7 +205,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(@"TestData\Hybrids\Hyb_P2_Group2SuperCapOvl\SuperCap.vreess", 1)]
+ [TestCase(@"TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/SuperCap.vreess", 1)]
public void TestGenericSuperCapData(string superCapFilePath, double initialSoC)
{
var superCap = JSONInputDataFactory.ReadREESSData(superCapFilePath, false) as ISuperCapDeclarationInputData;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
index 9b6568e6801459a8f1b7e841244e35dc72f594f3..0b6807575fe4c79049d98faa004f4faa5779c207 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
@@ -58,9 +58,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public const string JobFileDeclNoAngular = @"TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto";
public const string JobFileDeclAngEfficiency = @"TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto";
- public const string JobFileBEVE2 = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG.vecto";
- public const string JobFileBEVE3 = @"TestData\BatteryElectric\GenericVehicleB3\BEV_ENG.vecto";
- public const string JobFileBEVE4 = @"TestData\BatteryElectric\GenericVehicleB4\BEV_ENG.vecto";
+ public const string JobFileBEVE2 = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto";
+ public const string JobFileBEVE3 = @"TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto";
+ public const string JobFileBEVE4 = @"TestData/BatteryElectric/GenericVehicleB4/BEV_ENG.vecto";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
index 4ad8f1fdc2f39e5154c3dacc61572e17db47376f..b3eb7c82561bbb5022d99c1be913b05bd76b1a37 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
@@ -53,7 +53,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
{
[TestFixture]
- //[Parallelizable(ParallelScope.All)]
+ [NonParallelizable]
public class VTPCycleValidationTest
{
public static ThreadLocal<List<string>> LogList = new ThreadLocal<List<string>>();
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
index 165cb8ac1fab9fae79cd5aa40d32507130568872..ca355db4aa652f72e412262e533e1d230c29788f 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
@@ -38,7 +38,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
{
[TestFixture]
- [Parallelizable(ParallelScope.All)]
+ [NonParallelizable]
public class AccelerationCurveTest
{
public const double Tolerance = 0.0001;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index 5e242bc2024a41a0a2814b900c8ab701be03e7fb..4f177e594ce5c6c526ece0eb515c481c477c23c6 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
//public void TestMahleEMLookup()
//{
// var inputProvider =
- // JSONInputDataFactory.ReadElectricMotorData(@"E:\QUAM\Downloads\2022-07-07 Hybrid 40 kW System_sent.7z\2022-07-07 Hybrid 40 kW System_sent\TDS 40kW MTM 48-210x65 V2.04.vem", false);
+ // JSONInputDataFactory.ReadElectricMotorData(@"E:/QUAM/Downloads/2022-07-07 Hybrid 40 kW System_sent.7z/2022-07-07 Hybrid 40 kW System_sent/TDS 40kW MTM 48-210x65 V2.04.vem", false);
// var pwr = inputProvider.VoltageLevels.Last().PowerMap.First().PowerMap;
// var fld = inputProvider.VoltageLevels.Last().FullLoadCurve;
diff --git a/VectoCore/VectoCoreTest/Reports/TestXMLResultsWriting.cs b/VectoCore/VectoCoreTest/Reports/TestXMLResultsWriting.cs
index d8a9fb2d925eb6f2e781a16e78e48dcf54c08888..384e053142f78955b5cc1538111218e9df8a4bfb 100644
--- a/VectoCore/VectoCoreTest/Reports/TestXMLResultsWriting.cs
+++ b/VectoCore/VectoCoreTest/Reports/TestXMLResultsWriting.cs
@@ -578,7 +578,7 @@ public class TestXMLResultsWriting
var doc = new XDocument();
doc.Add(new XElement(ns + "VectoMockResults",
new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
- new XAttribute(xsi + "schemaLocation", $@"{ns.NamespaceName} V:\VectoCore\VectoCore\Resources\XSD\{reportType}.xsd"),
+ new XAttribute(xsi + "schemaLocation", $@"{ns.NamespaceName} V:/VectoCore/VectoCore/Resources/XSD/{reportType}.xsd"),
results));
return doc;
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/3speedEV.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/3speedEV.vgbx
index 0feb19d6d77c5b76e57c3f811b7f44b27bebca56..eccdd8e8cfabbea60df582d7c4264799e739511a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/3speedEV.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/3speedEV.vgbx
@@ -13,25 +13,25 @@
"Gears": [
{
"Ratio": 2.64,
- "LossMap": "Transmission\\Axle_4x2_Tractor.vtlm"
+ "LossMap": "Transmission/Axle_4x2_Tractor.vtlm"
},
{
"Ratio": 17.5,
- "LossMap": "Transmission\\Gear_1.vtlm",
+ "LossMap": "Transmission/Gear_1.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
},
{
"Ratio": 6.49,
- "LossMap": "Transmission\\Gear_4.vtlm",
+ "LossMap": "Transmission/Gear_4.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
},
{
"Ratio": 2.65,
- "LossMap": "Transmission\\Gear_8.vtlm",
+ "LossMap": "Transmission/Gear_8.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
index a5d6013deb579c5bc146bef523682e14630bae2c..55b159800e54259c0a8dfce7cba6fdd897166e91 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": true,
"EngineOnlyMode": false,
"VehicleFile": "BatteryElectricVehicle.vveh",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
index d24a59c87cdb46b58d64defb9fe4433d90d2a793..af9aafce868558aa6f8b151e55a840d7a0ba3185 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": true,
"EngineOnlyMode": false,
"VehicleFile": "BatteryElectricVehicle.vveh",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"Padd_electric": 0.0,
"BusAux": "PEV-BusAux.vaux",
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
index 122743c53ca1ab5c03a5882e5ebea38a2818b65d..14094bf0d5d89889d51a5112e64699a720be7a05 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": true,
"EngineOnlyMode": false,
"VehicleFile": "BatteryElectricVehicle_Cont30kW.vveh",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
index 5cb5504af6b029ed4820ac8afcd03595cbb2769f..05d923415669b8d2b2c1aa87b6fb1fddaebd9dfb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
@@ -10,8 +10,8 @@
"EngineOnlyMode": false,
"VehicleFile": "Group5_HEV.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
- "GearboxFile": "IHPC-Gbx_6.vgbx",
- "TCU": "IHPC-Gbx_6.vgbx",
+ "GearboxFile": "IHPC-GBX_6.vgbx",
+ "TCU": "IHPC-GBX_6.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
"HybridStrategyParams": "Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
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 0fb555a043ac6ded1c4cf55137345d126497692c..3f854a459fe137d2530f6e9390908da01dc342f2 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 9c09e186d3bddf64c839b648e3adb2b4230cb080..fad64998116d0461134c20de7c03bebb3a5e1593 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l_WHR.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l_WHR.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 8fdd44d0197f7baeedf1161320320808ab6a15c2..10cddf3457bba5e5e59fb9562b4e470545b55649 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 a631dc4a10b27da9b799f6672e6dff51ce7c1b85..7d8e81e109d533e012a8e36b9b3fbf9dc17cea48 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq_2.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12_TqLimit2500.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 e55e87cfd770153ee923937f6040e6802d103ce0..5c1e498ac7854da3ecfd44d6c0b52a962c77b8f5 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq_TopTorque.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12_TqLimit2500.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 91222caf2fc93e7d86c66657834f2a5bcb465af0..e8d10f4fb4a397eda3cd431f7991a4ced31590ee 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq_2.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 72fdc20307293136f7f3347b341689f369a02937..8ae0ecd306525c512b6be35c07ae7659cdd52be4 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq_TopTorque.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 ebfec0b7d53f60e990c0552838239b780ff6eade..b44ee51cdb45bc3044bea1c600169c1ff876e90b 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_EMLossMap_1.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_EMLossMap_1.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 5926958d199a090289dbfebc225ae7609a036e9b..0a06a14128f1c600b3acc0b471ac4d55f6ba5274 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_EMLossMap_2.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_EMLossMap_2.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 cf909d9441aa32d403525e3d550fb93c17d50239..5cd1ad412984d24f57db3d40e3f86fd81a4d36ff 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12_TqLimit2500.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12_TqLimit2500.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 254751e02cb7e0d1de5d8d49308f74db430dfded..da83945266bfa89a31392535f045714492d4898c 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
@@ -8,18 +8,18 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitEMTorqueDrive.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 0898258ec30f2e9004a13a9d8bc0248868219e92..3b7a18ab64c117df96f3d151b6bc8160c755d2cd 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
@@ -8,18 +8,18 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
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 fc98b3ae613234f44c5ddb528f317e13f1c9fd5e..ab4ffa8989bc44e905600ccf6f3da5e0d1d10344 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Vehicle/Group5_HEV.vveh
index 05ebd077d4f5852c7f0e2dfd6cb94d99dc57033f..fe11e875580973834f4f5a160d94246a1c3b6502 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 1922cabd6dfc482e6a5650385a114b9f58e03179..622cf804b6c5b8e07f8a17c9c6bda6e770ed86cb 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 ccd0d9289f1ac6f7d3f4f152fb174da79bfed85d..83f4175b4b1cbbf8d3ad6e465a6793039d0d63c2 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 47c846769281944e8c4eca6a04d2bb176255b57c..4a630466fd44be0e839be0cd23b11fc38e285fa7 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalTransmissionLossMap": "GenericADC_1.vtlm",
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 34ea043f36d3cb934329351045a6f4cb1bfc6252..9d44f45abccf87c71fc270b3bed50ee26ddf84ab 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalTransmissionLossMap": "GenericADC_2.vtlm",
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 af3c5dad3848c1019391c48e1e868491cd327bf2..072bf13240ae99cfe6dc4a8a30f9d7add8ba9896 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -102,12 +102,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 9dc177f1fd0b0517ced50bb18ef38b7b4db10565..60f4650ae0dcea8d792c5d4156ebd5c62760131e 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 11be11dcb3688004e5c8b1e6b8ce9ae79d3d8176..7b568701a6e964bbbf57051600ede205780cf7ca 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 f2e2154fc3e26984b18a684d542236e0dcd9a28f..76a229f91a4c47677506e056ea3909724f67bf10 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -107,12 +107,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 34565358c9be3e206ce32e2a92faa62134af5d6d..02772b71a2f833489261bfdbdf57fa44acd08b6e 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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/P3 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/P3 Group 5.vecto
index d8520303d375bf354932c34051083625261eeb56..2a2c2834b123e3bb0f15b4231d8a949a28240808 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 979927408faf75894b35a16fc057ea799140011e..62c260a38169f6a0f2a7f61313a5bafef22a6070 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Vehicle/Group5_HEV.vveh
index f256fcc67449c707f79b45a766b2a389213e2e65..39a805a24a4f1ef6483f8b145a9515839948ca92 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 ce0fb62abb8b80916d9e823615532a2d2702a9b5..957339d8593fcdaf42a02cddb2f315ed7ec36806 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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/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 b34ae3581aed101c5f83d932cf9237d6dce95050..f0d44de3f95f54462680fb9eeff359b6a46df6dd 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 e0d809856281b4019c66972bffedce9ff3c94596..81cdcbc66a7c3a5e922ae7bf716fe50cbe89b593 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 b9631359cbee0b5399d370b0f4ec65f4422b6b2b..52d9cd7911c66824b9c01e350bc83f6668e1bbc2 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 20347db6f0997944f0a69c5d7abd96a2cb2af864..1eb43cdcb926e72ca24fc1c61306d9ad07973333 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitEMTorqueDrive.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 ddd3c9550955add9d69ec1dea76a54efdd95cfa7..86ddccdd06f66fc8836250f3a67620a69fa03810 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
@@ -8,18 +8,18 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 b45af7e48fcda9095e9620f53a8afe5eae656e9d..781cb3849b815252e7f59197be6f9b64684a2b24 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/Group5_HEV.vveh
index f256fcc67449c707f79b45a766b2a389213e2e65..39a805a24a4f1ef6483f8b145a9515839948ca92 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 c07d6c4f4336512b62eeb14c78026d7ae788a166..e9fb1776097acd364369dc4b89c6f1143393ea87 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 f4cbf7c92e5678668e620238bd0475eaddaa88c3..8a19ab5982c48b1f022394bacb3555ca68f91a9a 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 6aadb9a60e146f21657f3aa5d8bdf961d062581c..c6cbfb34020fb6c4cc52d67ed98e73d828a6c5cd 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -102,12 +102,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 92780a8059d566599149958d0588022526466823..56aa32c5b7f3534f537caa604f74bf9f504c9000 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 f8deb9720ec82f0aaabcf120f39a0432d63f4846..6164a62dbd359f3ba9985d44d6c4958ac154c937 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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/P4 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/P4 Group 5.vecto
index d8520303d375bf354932c34051083625261eeb56..2a2c2834b123e3bb0f15b4231d8a949a28240808 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
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 979927408faf75894b35a16fc057ea799140011e..62c260a38169f6a0f2a7f61313a5bafef22a6070 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
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
- "HybridStrategyParams": "ElectricMotor\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Vehicle/Group5_HEV.vveh
index b46621f41698ba515aa8c3037a0386495a9b2590..43da6d88f6fb3cd3985d69c34f63e92db9840287 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 4.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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 92a71f37e59ba6081fe90a712de8bdcbe106b424..05268bf47d33827be06dd8c6ec19cb0ff5a5977f 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
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 4.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\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/P4_APT/P4 APT Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5.vecto
index ffa9f9e0a92837558f7245021905f9516654a28e..711f6a2a0f5eefc2d07d788547ed001c7baf24be 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW.vecto
index bd23cadceae79a314e31ab0b34786041adf1a3b8..1b73522e68bbd97225e052156d1a301ce66b9882 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW_noESS.vecto
index e06679f7e61ad6892af7045476b12b9058507884..ee7cd7828401e3904d43d94a62fae3385eb3a8c1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_325kW_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_325kW_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_325kW_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
index 2decf7da11076eda49316e5eb2ab997aefa2796c..83504f3962eba1a9bbb7df2fdf4fed552a536a34 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitEMTorqueDrive.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
index 66759402c4058b416d4a5ebf4210e032a5f1bab0..a6a6c350863a0116244b3acdc5516d291edbfda7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_LimitVehiclePropTq.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_LimitVehiclePropTq.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_noESS.vecto
index 7e9a9d5e7b9d9996c1cd55050d264ae093f8d0f7..8443b4feabdbf8c513a909c7bd93ca10021802a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/P4 APT Group 5_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": true,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_noESS.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
+ "VehicleFile": "Vehicle/Group5_HEV_noESS.vveh",
+ "EngineFile": "VKM/Engine_325kW_12.7l.veng",
"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/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [],
"Padd": 3000.0,
"Padd_electric": 0.0,
- "VACC": "Vehicle\\Truck.vacc",
+ "VACC": "Vehicle/Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
"EngineStopStartMaxOffTimespan": 0.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
index fdc9ed199d9cf94ac77a4e844b496e1f8ef022db..6bdc127f7af630586b06fa53493aac6db6f37750 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
index b8d9f36dac09e66d038b19ce021cdc325513a41c..7daac7a55940d3544b36f1072186d680f32fa69a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 5bccfe937134076f6626443f3387c764dcd0a145..ecfc4968414bab2f36e7662a15c0371577c38b5f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P3",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index 6674d5d0425266d797f98a460bd4efdf9a9d6a76..3e4894a008860ec6b8782bc1e78a527ba492dc5e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -102,12 +102,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P2/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P2/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index ad2ea4a3a4caa8023bc4fb0bdfd5bc07dfd2db9e..ebe7e6e6ada1e0ef817efbcf23405a49b89e5ddd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P3/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
index 23fec1688938a053b1ff212f1b230bb68fe8f369..9c651e6b33bd74e2319f8c7311d5ef757f406a5b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/Group5_HEV_noESS.vveh
@@ -76,7 +76,7 @@
"Retarder": {
"Type": "secondary",
"Ratio": 1.0,
- "File": "..\\Transmission\\Default.vrlm"
+ "File": "../Transmission/Default.vrlm"
},
"Angledrive": {
"Type": "None",
@@ -98,12 +98,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P4",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "../ElectricMotor/Inputdaten P2/Electric components/GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "../ElectricMotor/Inputdaten P2/Electric components/GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_WHR.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_WHR.vecto
index a49a6639b3181c7e2490b662f76f9a0cfa06fa1a..c8f3f01a0fab17decbd55627d308ceb2cf33f5bd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_WHR.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/SerialHybrid_S2_WHR.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": true,
"EngineOnlyMode": false,
"VehicleFile": "SerialHybrid_S2.vveh",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "GearboxFile": "Transmission/AMT_12.vgbx",
+ "TCU": "Transmission/AMT_12.vgbx",
"EngineFile": "209kW_7c7l_WHR.veng",
"HybridStrategyParams": "Hybrid_Parameters.vhctl",
"Padd_electric": 0.0,
diff --git a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
index 6c3108a7218a7321c207ebb042f1469ca7fd1559..b46f7ace752528d4484fdf7761f615e09a68f47a 100644
--- a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
+++ b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
@@ -49,58 +49,58 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
protected ICustomerInformationFileFactory _cifFactory;
protected const string ConventionalHeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml";
protected const string HEV_Px_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml";
protected const string HEV_S2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml";
protected const string HEV_S3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml";
protected const string HEV_S4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml";
protected const string HEV_IEPC_S_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml";
protected const string PEV_E2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml";
protected const string PEV_E3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml";
protected const string PEV_E4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml";
protected const string PEV_IEPC_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\IEPC_heavyLorry.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml";
protected const string Exempted_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ExemptedVehicles\exempted_heavyLorry.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml";
protected const string Conventional_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml";
protected const string HEV_Px_IHPC_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV_primaryBus_AMT_Px.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml";
protected const string HEV_S2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml";
protected const string HEV_S3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml";
protected const string HEV_S4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml";
protected const string HEV_IEPC_S_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml";
protected const string PEV_E2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml";
protected const string PEV_E3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E3.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml";
protected const string PEV_E4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E4.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml";
protected const string PEV_IEPC_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\IEPC_primaryBus.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml";
protected const string Exempted_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ExemptedVehicles\exempted_primaryBus.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml";
- protected const string Conventional_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
+ protected const string Conventional_CompletedBus = @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
- protected const string Exempted_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\exempted_completed.VIF_Report_2.xml";
- //@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ExemptedVehicles\exempted_completedBus_input_full.xml";
+ protected const string Exempted_CompletedBus = @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml";
+ //@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml";
public static bool ValidateAndPrint(XDocument document, XmlDocumentType documentType)
{
diff --git a/VectoCore/VectoCoreTest/XML/XMLComponentInputTest/XMLBatterySystemComponentTest.cs b/VectoCore/VectoCoreTest/XML/XMLComponentInputTest/XMLBatterySystemComponentTest.cs
index 605d46527fa131dc87154df288674957f97a5632..7f7bf69f4a08fa0f04075facf0615aa4d43ef4bf 100644
--- a/VectoCore/VectoCoreTest/XML/XMLComponentInputTest/XMLBatterySystemComponentTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLComponentInputTest/XMLBatterySystemComponentTest.cs
@@ -31,9 +31,9 @@ namespace TUGraz.VectoCore.Tests.XML.XMLComponentInputTest
{
private StandardKernel _kernel;
- private string BASEDIRComponent = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ComponentData";
+ private string BASEDIRComponent = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData";
- private string BASEDIRVehicle = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry";
+ private string BASEDIRVehicle = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry";
private IDeclarationInjectFactory _declarationFactory;
private IXMLInputDataReader _inputDataFactory;
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index 6e0b73e02c895f3217145f33dd81c7304ee9ba3b..65dd464746646bcfdcc38751c73ebc1705748600 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -714,7 +714,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
}
- public const string SampleTyreXML = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.5\TyreSample.xml";
+ public const string SampleTyreXML = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.5/TyreSample.xml";
[TestCase()]
public void TestWheelsSupportedInXML()
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
index 14be4f0edfb9d36e51ef1a4eaf64cf6547064bb2..aa6eededd0be1dcf1dc82df68469b5ab63daa02f 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
@@ -40,50 +40,50 @@ namespace TUGraz.VectoCore.Tests.XML
private const string Optional_TESTS_DIR = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries";
// MQ: These jobs cannot be run as the sample XML files do not contain meaningful vehicle data
- //[TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2_ovc.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_S3.xml"),
- //TestCase(@"HeavyLorry\HEV-S_heavyLorry_S4.xml"),
- //TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml"),
- //TestCase(@"HeavyLorry\IEPC_heavyLorry.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2_realistic.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_APT-N_E2.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_E3.xml"),
- //TestCase(@"HeavyLorry\PEV_heavyLorry_E4.xml"),
- //TestCase(@"MediumLorry\Conventional_mediumLorry_AMT.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2_ovc.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_IEPC-S.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_S3.xml"),
- //TestCase(@"MediumLorry\HEV-S_mediumLorry_S4.xml"),
- //TestCase(@"MediumLorry\HEV_mediumLorry_AMT_Px.xml"),
- //TestCase(@"MediumLorry\IEPC_mediumLorry.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_AMT_E2.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_APT-N_E2.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_E3.xml"),
- //TestCase(@"MediumLorry\PEV_mediumLorry_E4.xml"),
- //TestCase(@"PrimaryBus\Conventional_primaryBus_AMT.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_S3.xml"),
- //TestCase(@"PrimaryBus\HEV-S_primaryBus_S4.xml"),
- //TestCase(@"PrimaryBus\HEV_primaryBus_AMT_Px.xml"),
- //TestCase(@"PrimaryBus\IEPC_primaryBus.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_AMT_E2.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_E3.xml"),
- //TestCase(@"PrimaryBus\PEV_primaryBus_E4.xml"),
- ////TestCase(@"CompletedBus\Conventional_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\HEV_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\IEPC_completedBus_1.xml"),
- ////TestCase(@"CompletedBus\PEV_completedBus_1.xml"),
- //TestCase(@"ExemptedVehicles\exempted_completedBus_input_full.xml"),
- //TestCase(@"ExemptedVehicles\exempted_completedBus_input_only_mandatory_entries.xml"),
- //TestCase(@"ExemptedVehicles\exempted_heavyLorry.xml"),
- //TestCase(@"ExemptedVehicles\exempted_mediumLorry.xml"),
- //TestCase(@"ExemptedVehicles\exempted_primaryBus.xml"),
+ //[TestCase(@"HeavyLorry/Conventional_heavyLorry_AMT.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2_ovc.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_S3.xml"),
+ //TestCase(@"HeavyLorry/HEV-S_heavyLorry_S4.xml"),
+ //TestCase(@"HeavyLorry/HEV_heavyLorry_AMT_Px.xml"),
+ //TestCase(@"HeavyLorry/IEPC_heavyLorry.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_AMT_E2.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_APT-N_E2.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_E3.xml"),
+ //TestCase(@"HeavyLorry/PEV_heavyLorry_E4.xml"),
+ //TestCase(@"MediumLorry/Conventional_mediumLorry_AMT.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_AMT_S2.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_AMT_S2_ovc.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_IEPC-S.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_S3.xml"),
+ //TestCase(@"MediumLorry/HEV-S_mediumLorry_S4.xml"),
+ //TestCase(@"MediumLorry/HEV_mediumLorry_AMT_Px.xml"),
+ //TestCase(@"MediumLorry/IEPC_mediumLorry.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_AMT_E2.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_APT-N_E2.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_E3.xml"),
+ //TestCase(@"MediumLorry/PEV_mediumLorry_E4.xml"),
+ //TestCase(@"PrimaryBus/Conventional_primaryBus_AMT.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_AMT_S2.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_IEPC-S.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_S3.xml"),
+ //TestCase(@"PrimaryBus/HEV-S_primaryBus_S4.xml"),
+ //TestCase(@"PrimaryBus/HEV_primaryBus_AMT_Px.xml"),
+ //TestCase(@"PrimaryBus/IEPC_primaryBus.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_AMT_E2.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_E3.xml"),
+ //TestCase(@"PrimaryBus/PEV_primaryBus_E4.xml"),
+ ////TestCase(@"CompletedBus/Conventional_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/HEV_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/IEPC_completedBus_1.xml"),
+ ////TestCase(@"CompletedBus/PEV_completedBus_1.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_completedBus_input_full.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_heavyLorry.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_mediumLorry.xml"),
+ //TestCase(@"ExemptedVehicles/exempted_primaryBus.xml"),
//]
//public void TestReadingJobVersion_V24(string jobFile)
//{