diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index fedd980a65886e9f4df4de0c3dce29bc8467ec3d..23f7bc390ddd6eab21244a04156d66507bcc7eba 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName>
- <TargetFrameworks>net6.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index ed079df9a565dc1a50cbf9fe6156e95d242ef7f0..39724aad9ec315983b9d948bd6850298cc2dae7c 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -22,8 +22,8 @@ Namespace IntegrationTests
<TestCase(15700, 1319, -35.79263, -144.0441, 9093.9511)>
Public Sub AuxDemandTest(vehicleWeight As Double, engineSpeed As Double, driveLinePower As Double,
internalPower As Double, expectedPowerDemand As Double)
- Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
- Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
+ Dim engineFCMapFilePath = "TestFiles/Integration/24t Coach.vmap"
+ Dim auxFilePath = "TestFiles/Integration/AdvAuxTest.aaux"
Dim aux As BusAuxiliaries = New BusAuxiliaries(new NoBattery(Nothing))
@@ -40,7 +40,7 @@ Namespace IntegrationTests
dim auxConfig = BusAuxiliaryInputData.ReadBusAuxiliaries(auxFilePath, Utils.GetDefaultVehicleData(vehicleWeight.SI(Of Kilogram)))
- aux.Initialise(auxConfig) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
+ aux.Initialise(auxConfig) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "/")
aux.Signals.ClutchEngaged = True
'aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)() 'kW
@@ -72,8 +72,8 @@ Namespace IntegrationTests
Dim engineSpeed As Double = 1256
- Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
- Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
+ Dim engineFCMapFilePath = "TestFiles/Integration/24t Coach.vmap"
+ Dim auxFilePath = "TestFiles/Integration/AdvAuxTest.aaux"
Dim aux As BusAuxiliaries = New BusAuxiliaries(New NoBattery(Nothing))
@@ -91,7 +91,7 @@ Namespace IntegrationTests
Dim auxCfg = BusAuxiliaryInputData.ReadBusAuxiliaries(auxFilePath, Utils.GetDefaultVehicleData(12000.SI(Of Kilogram)()))
'CType(auxCfg, AuxiliaryConfig).FuelMap = fuelMap
- CType(aux, BusAuxiliaries).Initialise(auxCfg) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
+ CType(aux, BusAuxiliaries).Initialise(auxCfg) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "/")
aux.Signals.ClutchEngaged = True
'aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)() 'kW
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 1a412cd89e3438d850b5567faa0daa56ef5d7986..11d819badfdb8aade777ec7565bf8b7038444220 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -8,15 +8,15 @@ Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Namespace UnitTests
<TestFixture()>
Public Class AlternatorMapTests
- Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
- Private Const _GOODMAPORIGINALSINGLEMAP As String = "TestFiles\testAlternatorMapOriginalSingleMap.aalt"
- Private Const _INVALIDRPMMAP As String = "TestFiles\testAlternatorMapWithInvalidRpm.aalt"
- Private Const _INVALIDAMPSMAP As String = "TestFiles\testAlternatorMapWithInvalidAmps.aalt"
- Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.aalt"
- Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.aalt"
- Private Const _GOODCOMBINEDMAP As String = "TestFiles\testAlternatorMapCombined.aalt"
- Private Const _ASYMETRICALCOMBINEDROWSMAP As String = "TestFiles\testAlternatorMapAsymetricalRowsCombined.aalt"
- Private Const _ASYMETRICALCOMBINEDXYPAIRSMAP As String = "TestFiles\testAlternatorMapAsymetricalXYPairsCombined.aalt"
+ Private Const _GOODMAP As String = "TestFiles/testAlternatorMap.aalt"
+ Private Const _GOODMAPORIGINALSINGLEMAP As String = "TestFiles/testAlternatorMapOriginalSingleMap.aalt"
+ Private Const _INVALIDRPMMAP As String = "TestFiles/testAlternatorMapWithInvalidRpm.aalt"
+ Private Const _INVALIDAMPSMAP As String = "TestFiles/testAlternatorMapWithInvalidAmps.aalt"
+ Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles/testAlternatorMapWithInvalidEfficiency.aalt"
+ Private Const _INVALIDPOWERMAP As String = "TestFiles/testAlternatorMapWithInvalidPower.aalt"
+ Private Const _GOODCOMBINEDMAP As String = "TestFiles/testAlternatorMapCombined.aalt"
+ Private Const _ASYMETRICALCOMBINEDROWSMAP As String = "TestFiles/testAlternatorMapAsymetricalRowsCombined.aalt"
+ Private Const _ASYMETRICALCOMBINEDXYPAIRSMAP As String = "TestFiles/testAlternatorMapAsymetricalXYPairsCombined.aalt"
<OneTimeSetUp>
Sub RunBeforeAnyTests()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
index 1f71a3b9d7885b69defc63c2802e85f3ee4dd500..c1f2ee2962298c124b7c5be5580bd4f8cabdad06 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
@@ -18,7 +18,7 @@ Namespace UnitTests
Public Sub SaveDefaultFile()
dim auxDefault = AuxiliaryComparisonTests.GetDefaultAuxiliaryConfig() ' New AuxiliaryConfig("")
- BusAuxWriter.SaveAuxConfig(auxDefault, "TestFiles\auxiliaryConfigKEEP.json")
+ BusAuxWriter.SaveAuxConfig(auxDefault, "TestFiles/auxiliaryConfigKEEP.json")
End Sub
<OneTimeSetUp>
@@ -38,8 +38,8 @@ Namespace UnitTests
'Act
SaveDefaultFile()
- BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles\auxiliaryConfigKEEP.json", utils.GetDefaultVehicleData())
- 'actual=auxEmpty.Load("TestFiles\auxiliaryConfigKEEP.json")
+ BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles/auxiliaryConfigKEEP.json", utils.GetDefaultVehicleData())
+ 'actual=auxEmpty.Load("TestFiles/auxiliaryConfigKEEP.json")
Assert.AreEqual(auxDefault, auxEmpty)
End Sub
@@ -76,7 +76,7 @@ Namespace UnitTests
'Act
SaveDefaultFile()
- auxDefault = BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles\auxiliaryConfigKEEP.json",
+ auxDefault = BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles/auxiliaryConfigKEEP.json",
Utils.GetDefaultVehicleData())
Dim areEqual = auxTest.ConfigValuesAreTheSameAs(auxDefault)
'Assert
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index a997f9f13fa3d49048be8324b145639a2c3209f5..56852b7b497db5cbf0a5746da29d545360b4b17d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -23,8 +23,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 8cdba6dc628892520e6ee82c2d3a8250dd12c3c9..2030baa80f757015c3e457bb96247fee24ea9665 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/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index bc542b6bff41505c91bea17b7c5881c49919fd48..4bf2ca8968ff20fb31939249de9c4124f03471b8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -9,13 +9,13 @@ Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Namespace UnitTests
<TestFixture()>
Public Class CompressorMapTests
- Private Const GOODMAP As String = "TestFiles\testCompressorMap.acmp"
- Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.acmp"
- Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.acmp"
- Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.acmp"
- Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.acmp"
- Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.acmp"
- Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.acmp"
+ Private Const GOODMAP As String = "TestFiles/testCompressorMap.acmp"
+ Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles/testCompressorMapInvalidOnPower.acmp"
+ Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles/testCompressorMapInvalidOffPower.acmp"
+ Private Const INVALIDFLOWRATEMAP As String = "TestFiles/testCompressorMapInvalidFlow.acmp"
+ Private Const INSSUFICIENTROWSMAP As String = "TestFiles/testCompressorMapNotEnoughRows.acmp"
+ Private Const INVALIDRPMMAP As String = "TestFiles/testCompressorMapInvalidRpm.acmp"
+ Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles/testCompressorMapWrongNumberOfColumns.acmp"
#Region "Helpers"
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 650de6b3c1d4152f434338e42b27cb8097d55efc..c81d9bb6890a8d2e8a395bb220d4e96cc4e2afde 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -32,8 +32,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
- Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
- 'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
+ Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
+ 'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
dim ssmInput As ISSMDeclarationInputs = SSMInputData.ReadFile(_SSMMAP, utils.GetDefaultVehicleData(), Nothing)
'CType(CType(ssmInput, SSMInputs).Vehicle, VehicleData).Height = 0.SI (Of Meter)
@@ -55,7 +55,7 @@ Namespace UnitTests
signals.EngineSpeed = 2000.RPMtoRad()
Dim auxConfig = Utils.GetAuxTestConfig()
- 'Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
+ 'Dim hvacMap As New HVACMap("testFiles/TestHvacMap.csv")
'hvacMap.Initialise()
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).PowerNetVoltage = 26.3.SI (Of Volt)
Dim m0 As New M00Impl(auxConfig.ElectricalUserInputsConfig, signals, ssm.ElectricalWAdjusted)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index cb275e66c2bef27a80f0c53e3691c7ba5c780264..6374754a21cf8a4c2801ad6d79fa5090d606c445 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -12,9 +12,9 @@ Imports Signals = TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
<TestFixture()>
Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
- Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
- Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
- Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
+ Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests/testAlternatorMap.aalt"
+ Private Const cstrHVACMapLocation As String = "TestFiles/TestHvacMap.csv"
+ Private Const cstrAlternatorMap As String = "TestFiles/testAlternatorMap.aalt"
'Private elecConsumers As IElectricalConsumerList
@@ -24,7 +24,7 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
- Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
+ Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
Dim auxconfig = Utils.GetAuxTestConfig()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 09fa2496066e4769e617a75fb719e09ca2d0be35..72bd1432997d60d066f1d64d55cba00242193d7a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -15,9 +15,9 @@ Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Namespace UnitTests
<TestFixture()>
Public Class M1_AverageHVACLoadDemandTests
- Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
- Private Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
- Private Const _BusDatabase As String = "TestFiles\BusDatabase.abdb"
+ Private Const _GOODMAP As String = "TestFiles/testAlternatorMap.aalt"
+ Private Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
+ Private Const _BusDatabase As String = "TestFiles/BusDatabase.abdb"
Private signals As ISignals = New Signals With {.EngineSpeed = 2000.RPMtoRad()}
Private powernetVoltage As Volt = 26.3.SI (of Volt)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index db3991edd8a74e4a4712eceae37521514ec0230e..7d19bc732fbce2dd1e06a5e445029f4380e297ad 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -24,8 +24,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
- Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
- 'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
+ Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
+ 'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
Dim ssm As ISSMTOOL = New SSMTOOL(SSMInputData.ReadFile(_SSMMAP, Utils.GetDefaultVehicleData(), Nothing))
'CType(CType(ssm.SSMInputs, SSMInputs).Vehicle, VehicleData).Height = 0.SI(of Meter)
@@ -50,7 +50,7 @@ Namespace UnitTests
Dim auxConfig = Utils.GetAuxTestConfig()
'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).AlternatorMap =altMap
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 1fbe62b3dbd8b60472f53a9b8144b5ea856ae0ea..dac74222162a6abed77d4fc53080e19f58645360 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
@@ -35,8 +35,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
- Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
- 'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
+ Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
+ 'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
Dim auxConfig = Utils.GetAuxTestConfig()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
index 9c11434d3576a119d79d0916e82bd6a5f2298ec9..354b39aab888a54c924323662b79df353caa6794 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -8,27 +8,27 @@ Namespace Pneumatics
<TestFixture()>
Public Class PneumaticActuationsMapTests
Public _
- Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles\testPneumaticActuationsMap_GOODMAP.apac"
+ Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles/testPneumaticActuationsMap_GOODMAP.apac"
Public _
Const cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS As String =
- "TestFiles\testPneumaticActuationsMap_INCORRECTCOLUMNS.apac"
+ "TestFiles/testPneumaticActuationsMap_INCORRECTCOLUMNS.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDINTEGERVALUE As String =
- "TestFiles\testPneumaticActuationsMap_INVALIDINTEGERVALUE.apac"
+ "TestFiles/testPneumaticActuationsMap_INVALIDINTEGERVALUE.apac"
Public _
Const cstrPneumaticActuationsMapPath_DUPLICATEKEY As String =
- "TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.apac"
+ "TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDCONSUMERNAME As String =
- "TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac"
+ "TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDCYCLENAME As String =
- "TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.apac"
+ "TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.apac"
<OneTimeSetUp>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index 6246be2f4eaf64be7e9eec8f9be92d31b7aad0a2..74da61638ed791a3a127a9f6cb2331b056f2bba4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -16,10 +16,10 @@ Namespace UnitTests
<TestFixture()>
Public Class _SSMTOOLTests
'TechBenefitsList - FilePath Constants
- Private Const GOODTechList As String = "TestFiles\testSSMTechBenefits.csv"
- Private Const GOODTechListALLON As String = "TestFiles\testSSMTechBenefitsALLON.csv"
- Private Const GOODTechListALLOFF As String = "TestFiles\testSSMTechBenefitsALLOFF.csv"
- Private Const GOODTechListEMPTYLIST As String = "TestFiles\testSSMTechBenefitsEMPTYLIST.csv"
+ Private Const GOODTechList As String = "TestFiles/testSSMTechBenefits.csv"
+ Private Const GOODTechListALLON As String = "TestFiles/testSSMTechBenefitsALLON.csv"
+ Private Const GOODTechListALLOFF As String = "TestFiles/testSSMTechBenefitsALLOFF.csv"
+ Private Const GOODTechListEMPTYLIST As String = "TestFiles/testSSMTechBenefitsEMPTYLIST.csv"
<OneTimeSetUp>
Public Sub RunBeforeAnyTests()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
index 1ac1af2911b8bad8de87d356e68a84fb1771a0ad..6c31fc402e7e686034777b97e88b68f1d1956415 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
diff --git a/VectoCommon/VectoHashingTest/BasicHasingTests.cs b/VectoCommon/VectoHashingTest/BasicHasingTests.cs
index a7d164d7c126596be8b1624c063a65630a7651ec..dec53d3e060290e008cca5f7e2455195ad9b38bb 100644
--- a/VectoCommon/VectoHashingTest/BasicHasingTests.cs
+++ b/VectoCommon/VectoHashingTest/BasicHasingTests.cs
@@ -43,11 +43,11 @@ namespace VectoHashingTest
//[Parallelizable(ParallelScope.All)]
public class BasicHasingTests
{
- public const string SimpleXML = @"Testdata\XML\simple_document.xml";
- public const string ReferenceXMLEngine = @"Testdata\XML\Reference\vecto_engine-sample.xml";
- public const string ReferenceXMLVehicle = @"Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml";
+ public const string SimpleXML = @"Testdata/XML/simple_document.xml";
+ public const string ReferenceXMLEngine = @"Testdata/XML/Reference/vecto_engine-sample.xml";
+ public const string ReferenceXMLVehicle = @"Testdata/XML/Reference/vecto_vehicle-sample_FULL.xml";
- public const string UnorderedXMLVehicle = @"Testdata\XML\Variations\vecto_vehicle-sample_FULL_Entry_Order.xml";
+ public const string UnorderedXMLVehicle = @"Testdata/XML/Variations/vecto_vehicle-sample_FULL_Entry_Order.xml";
public const string HashSimpleXML = "U2zic7KOnKw60rzh+KKQ1lwZL6NmXju+DXG7cYYmlxo=";
diff --git a/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs b/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
index 8e3c7e460bf0c61db68efadcddb23a6371e6fc43..e8881a5728817283a8125ac987fbd283cc62c053 100644
--- a/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
@@ -7,8 +7,8 @@ namespace VectoHashingTest
{
public class VectoComponentHashSortTest
{
- private const string UnsortedComponentPath = @"Testdata\XML\Sort\Component\Unsorted\";
- private const string SortedComponentPath = @"Testdata\XML\Sort\Component\Sorted\";
+ private const string UnsortedComponentPath = @"Testdata/XML/Sort/Component/Unsorted/";
+ private const string SortedComponentPath = @"Testdata/XML/Sort/Component/Sorted/";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs
index af3457ba5635fa09e1b1dc0874efb977a037c7ed..3a6b01fab99cff6ec8f03496e71b9f67cb644f7c 100644
--- a/VectoCommon/VectoHashingTest/VectoHashTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs
@@ -56,8 +56,8 @@ namespace VectoHashingTest
//[Parallelizable(ParallelScope.All)]
public class VectoHashTest
{
- public const string ReferenceXMLEngine = @"Testdata\XML\Reference\vecto_engine-sample.xml";
- public const string ReferenceXMLVehicle = @"Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml";
+ public const string ReferenceXMLEngine = @"Testdata/XML/Reference/vecto_engine-sample.xml";
+ public const string ReferenceXMLVehicle = @"Testdata/XML/Reference/vecto_vehicle-sample_FULL.xml";
protected IXMLInputDataReader xmlInputReader;
@@ -145,8 +145,8 @@ namespace VectoHashingTest
Assert.AreEqual(expectedHash, existingHash);
}
- [TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
+ [TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
public void TestReadTyres1Index(string file)
{
var h = VectoHash.Load(file);
@@ -166,7 +166,7 @@ namespace VectoHashingTest
[TestCase]
public void TestReadTyres2Index()
{
- var file = @"Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml";
+ var file = @"Testdata/XML/ToHash/vecto_vehicle-sample_3axle2.xml";
var h = VectoHash.Load(file);
var expectedHash = new[] {
"5074334bb2c090c5e258e9a664f5d19689a3f13d",
@@ -184,8 +184,8 @@ namespace VectoHashingTest
"index exceeds number of components found! index: 3, #components: 3");
}
- [TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
+ [TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
public void TestComputeTyres1Index(string file)
{
var h = VectoHash.Load(file);
@@ -202,7 +202,7 @@ namespace VectoHashingTest
[TestCase]
public void TestComputeTyres2Index()
{
- var file = @"Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml";
+ var file = @"Testdata/XML/ToHash/vecto_vehicle-sample_3axle2.xml";
var h = VectoHash.Load(file);
var hash1 = h.ComputeHash(VectoComponents.Tyre, 0);
@@ -229,23 +229,23 @@ namespace VectoHashingTest
]
public void TestHashComputationVariations(string file, string expectedHash)
{
- var h = VectoHash.Load(@"Testdata\XML\Variations\" + file);
+ var h = VectoHash.Load(@"Testdata/XML/Variations/" + file);
var hash = h.ComputeHash();
Assert.AreEqual(expectedHash, hash);
}
- [TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
- TestCase(@"Testdata\XML\Validation\vecto_gearbox_valid.xml")]
+ [TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
+ TestCase(@"Testdata/XML/Validation/vecto_gearbox_valid.xml")]
public void TestValidation(string file)
{
var h = VectoHash.Load(file);
Assert.IsTrue(h.ValidateHash());
}
- [TestCase(@"Testdata\XML\Validation\vecto_engine_invalid.xml"),
- TestCase(@"Testdata\XML\Validation\vecto_gearbox_invalid.xml")]
+ [TestCase(@"Testdata/XML/Validation/vecto_engine_invalid.xml"),
+ TestCase(@"Testdata/XML/Validation/vecto_gearbox_invalid.xml")]
public void TestValidationInvalid(string file)
{
var h = VectoHash.Load(file);
@@ -257,7 +257,7 @@ namespace VectoHashingTest
]
public void TestValidationComponentValid(VectoComponents component)
{
- var file = @"Testdata\XML\Validation\vecto_vehicle_components_valid-engine_gbx.xml";
+ var file = @"Testdata/XML/Validation/vecto_vehicle_components_valid-engine_gbx.xml";
var h = VectoHash.Load(file);
Assert.IsTrue(h.ValidateHash(component));
@@ -274,15 +274,15 @@ namespace VectoHashingTest
]
public void TestValidationComponentInvalid(VectoComponents component)
{
- var file = @"Testdata\XML\Validation\vecto_vehicle_components_invalid.xml";
+ var file = @"Testdata/XML/Validation/vecto_vehicle_components_invalid.xml";
var h = VectoHash.Load(file);
Assert.IsFalse(h.ValidateHash(component));
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine-input.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input.xml")]
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine-input.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input.xml")]
public void TestAddHash(string file)
{
var destination = Path.GetFileNameWithoutExtension(file) + "_hashed.xml";
@@ -299,10 +299,10 @@ namespace VectoHashingTest
Assert.IsTrue(h2.ValidateHash());
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 5),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 10),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 15),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 20),
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 5),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 10),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 15),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 20),
]
public void TestAddHashoDoNotOverwriteID(string file, int idLength)
{
@@ -320,9 +320,9 @@ namespace VectoHashingTest
Assert.AreEqual(newid, id.Attribute("id").Value);
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 2),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 3),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 4)]
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 2),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 3),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 4)]
public void TestAddHashoDoOverwriteID(string file, int idLength)
{
var newid = "x" + Guid.NewGuid().ToString("n").Substring(0, idLength - 1);
@@ -339,7 +339,7 @@ namespace VectoHashingTest
Assert.AreNotEqual(newid, id.Attribute("id").Value);
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml")]
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml")]
public void TestReplaceDate(string file)
{
var input = new XmlDocument();
@@ -360,10 +360,10 @@ namespace VectoHashingTest
Assert.IsTrue(now.ToUniversalTime() - newDate < new TimeSpan(0, 0, 0, 1));
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine_withhash-input.xml", "input data already contains a signature element"),
- TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample.xml", "adding hash for Vehicle is not supported"),
- TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input_nodata.xml", "'Data' element for component 'Gearbox' not found!"),
- TestCase(@"Testdata\XML\ToHash\multiple_components.xml", "input must not contain multiple components!"),
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine_withhash-input.xml", "input data already contains a signature element"),
+ TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample.xml", "adding hash for Vehicle is not supported"),
+ TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input_nodata.xml", "'Data' element for component 'Gearbox' not found!"),
+ TestCase(@"Testdata/XML/ToHash/multiple_components.xml", "input must not contain multiple components!"),
]
public void TestAddHashException(string file, string expectedExceptionMsg)
{
@@ -376,7 +376,7 @@ namespace VectoHashingTest
[TestCase]
public void TestDuplicateSigElement()
{
- var filename = @"Testdata\XML\Invalid\duplicate-sig.xml";
+ var filename = @"Testdata/XML/Invalid/duplicate-sig.xml";
var h = VectoHash.Load(filename);
AssertHelper.Exception<Exception>(() => { var r = h.ReadHash(); }, "Multiple DigestValue elements found!");
@@ -409,10 +409,10 @@ namespace VectoHashingTest
Assert.AreEqual(BasicHasingTests.HashVehicleXML, hash);
}
- [TestCase(@"Testdata\XML\ToHash\vecto_engine-input.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_engine-input_emptyDate.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml"),
- TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input.xml")]
+ [TestCase(@"Testdata/XML/ToHash/vecto_engine-input.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml"),
+ TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input.xml")]
public void TestHashedComponentIsValid(string file)
{
var destination = Path.GetFileNameWithoutExtension(file) + "_hashed.xml";
@@ -437,7 +437,7 @@ namespace VectoHashingTest
[TestCase("vecto_vehicle-namespace_prefix.xml", BasicHasingTests.HashVehicleXML)]
public void TestNamespacePrefixVariations(string file, string expectedHash)
{
- var h = VectoHash.Load(@"Testdata\XML\Variations\" + file);
+ var h = VectoHash.Load(@"Testdata/XML/Variations/" + file);
var hash = h.ComputeHash();
Assert.AreEqual(expectedHash, hash);
@@ -446,7 +446,7 @@ namespace VectoHashingTest
[TestCase()]
public void TestInvalidXMLAsFile()
{
- var file = @"Testdata\XML\Invalid\invalid-comp.xml";
+ var file = @"Testdata/XML/Invalid/invalid-comp.xml";
AssertHelper.Exception<Exception>(() => VectoHash.Load(file), "failed to read XML document");
}
@@ -454,7 +454,7 @@ namespace VectoHashingTest
[TestCase()]
public void TestInvalidXMLAsStream()
{
- var file = @"Testdata\XML\Invalid\invalid-comp.xml";
+ var file = @"Testdata/XML/Invalid/invalid-comp.xml";
var stream = File.Open(file, FileMode.Open);
AssertHelper.Exception<Exception>(() => VectoHash.Load(stream), "failed to read XML document");
}
@@ -515,8 +515,8 @@ namespace VectoHashingTest
- [TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
- TestCase(@"Testdata\XML\Validation\vecto_gearbox_valid.xml")]
+ [TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
+ TestCase(@"Testdata/XML/Validation/vecto_gearbox_valid.xml")]
public void TestXMLComponentValidation(string file)
{
var xmlDoc = new XmlDocument();
@@ -529,8 +529,8 @@ namespace VectoHashingTest
}
- [TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
- TestCase(@"Testdata\XML\Validation\vecto_engine_valid-typeAttr.xml")]
+ [TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
+ TestCase(@"Testdata/XML/Validation/vecto_engine_valid-typeAttr.xml")]
public void TestIgnoreTypeAttribute(string file)
{
var h = VectoHash.Load(file);
@@ -538,7 +538,7 @@ namespace VectoHashingTest
}
public const string MultistageFile =
- @"Testdata\XML\Multistage\vecto_multistage_primary_vehicle_stage_2_3_group41.xml";
+ @"Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml";
@@ -607,7 +607,7 @@ namespace VectoHashingTest
}
- [TestCase(@"Testdata\XML\Multistage\final.VIF_Report_5.xml")]
+ [TestCase(@"Testdata/XML/Multistage/final.VIF_Report_5.xml")]
public void TestMultistageVerifyHashStructure(string file)
{
var h = VectoHash.Load(file);
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index 762bdaa894b986a0b04bd057a1156e6ec08b296f..7d3f5787433f8d16c7183b4926101f2bb16354b3 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
- <None Include="TestData\**\*.xml">
+ <None Include="Testdata\**\*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
diff --git a/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs b/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
index 864afa2a5c8e4c404ffc62b5cd637a0410146a55..696b6572d6673a1af224b07405f0fce2f2b49468 100644
--- a/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
@@ -7,8 +7,8 @@ namespace VectoHashingTest
{
public class VectoJobHashSortTest
{
- private const string UnsortedJobPath = @"Testdata\XML\Sort\Job\Unsorted\";
- private const string SortedJobPath = @"Testdata\XML\Sort\Job\Sorted\";
+ private const string UnsortedJobPath = @"Testdata/XML/Sort/Job/Unsorted/";
+ private const string SortedJobPath = @"Testdata/XML/Sort/Job/Sorted/";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs b/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
index 5b8eb64082d2b059d47c117aecd75e83067f4c2a..fef8bd87740cf58080f7560b05c241b6eaa75bf6 100644
--- a/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
+++ b/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
@@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
if (!slope.IsEqual(0)) {
slopePrefix = slope > 0 ? "uh_" : "dh_";
}
- var modFile = string.Format(@"Coast_{0}_{1}\Truck_Coast_{0}_{1}_{3}{2:0.0}.vmod", v1, v2, Math.Abs(slope),
+ var modFile = string.Format(@"Coast_{0}_{1}/Truck_Coast_{0}_{1}_{3}{2:0.0}.vmod", v1, v2, Math.Abs(slope),
slopePrefix);
var cycleData = SimpleDrivingCycles.CreateCycleData(cycle);
var run = Truck40tPowerTrain.CreateEngineeringRun(cycleData, modFile);
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index b547fa8f6f44ba3421888e9f7153b3617aeea0bc..db094bcfaea74d3df5251734c29f9443a8bacc4f 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
<AssemblyName>ModelbasedTests</AssemblyName>
- <TargetFrameworks>net6.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
diff --git a/VectoCore/VectoCoreTest/Algorithms/DelaunayMapTest.cs b/VectoCore/VectoCoreTest/Algorithms/DelaunayMapTest.cs
index baae14e9217eca3e6a489ea70b347eb47a03afbd..519eab8ea695bb3841eda77d6d387cee619a8f5f 100644
--- a/VectoCore/VectoCoreTest/Algorithms/DelaunayMapTest.cs
+++ b/VectoCore/VectoCoreTest/Algorithms/DelaunayMapTest.cs
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.Tests.Algorithms
var map = new DelaunayMap("TEST");
var points =
- File.ReadAllLines(@"TestData\Components\40t_Long_Haul_Truck.vmap")
+ File.ReadAllLines(@"TestData/Components/40t_Long_Haul_Truck.vmap")
.Skip(1)
.Select(s => {
var p = s.Split(',').ToDouble().ToList();
diff --git a/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs b/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
index 1e949d1c83384c73d120e3d34e98fb5113a1516d..61ff26dcc8f3db7b95eb6056cfdfa1ebcbed9e75 100644
--- a/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
+++ b/VectoCore/VectoCoreTest/Dummy/EngineFLDTest.cs
@@ -51,8 +51,8 @@ namespace TUGraz.VectoCore.Tests.Dummy
[TestCase]
public void CompareFLDLookupPerformance()
{
- var engineFile1 = @"TestData\Components\40t_Long_Haul_Truck.vfld";
- var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
+ var engineFile1 = @"TestData/Components/40t_Long_Haul_Truck.vfld";
+ var engineFile2 = @"E:/QUAM/Downloads/EngineFLD/Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
if (!File.Exists(engineFile2)) {
Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.Dummy
[TestCase]
public void LookupTest()
{
- var engineFile2 = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
+ var engineFile2 = @"E:/QUAM/Downloads/EngineFLD/Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
if (!File.Exists(engineFile2)) {
Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index dc25f14bac8a3b6ba085644e39775aedbe589fe7..2364a2f51d31f150681bd9c377f79d82537bcc88 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase()]
public void TestReadBatteryPack()
{
- var inputProvider = JSONInputDataFactory.ReadREESSData(@"TestData\Hybrids\Battery\GenericBattery.vbat", false) as IBatteryPackEngineeringInputData;
+ var inputProvider = JSONInputDataFactory.ReadREESSData(@"TestData/Hybrids/Battery/GenericBattery.vbat", false) as IBatteryPackEngineeringInputData;
Assert.AreEqual(7.5.SI(Unit.SI.Ampere.Hour), inputProvider.Capacity);
@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
public void TestReadElectricMotor()
{
var inputProvider =
- JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotor.vem", false);
+ JSONInputDataFactory.ReadElectricMotorData(@"TestData/Hybrids/ElectricMotor/GenericEMotor.vem", false);
Assert.AreEqual(0.15, inputProvider.Inertia.Value(), 1e-6);
@@ -86,7 +86,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
public void TestReadElectricMotorV3()
{
var inputProvider =
- JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotorV3.vem", false);
+ JSONInputDataFactory.ReadElectricMotorData(@"TestData/Hybrids/ElectricMotor/GenericEMotorV3.vem", false);
Assert.AreEqual(0.15, inputProvider.Inertia.Value(), 1e-6);
@@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
public void TestElectricMotorV3_Lookup()
{
var inputProvider =
- new JSONComponentInputData(@"TestData\Hybrids\ElectricMotor\GenericEMotorV3.vem", null,
+ new JSONComponentInputData(@"TestData/Hybrids/ElectricMotor/GenericEMotorV3.vem", null,
false);
var daa = new EngineeringDataAdapter();
var emData = daa.CreateElectricMachines(inputProvider.ElectricMachines, null, null).First().Item2;
@@ -183,7 +183,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
public void TestReadElectricMotorAggregation()
{
var inputProvider =
- JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotor.vem", false);
+ JSONInputDataFactory.ReadElectricMotorData(@"TestData/Hybrids/ElectricMotor/GenericEMotor.vem", false);
Assert.AreEqual(0.15, inputProvider.Inertia.Value(), 1e-6);
@@ -217,7 +217,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase()]
public void TestReadHybridVehicle()
{
- var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\Hybrids\GenericVehicle_Group2_P2\Class2_RigidTruck_ParHyb_ENG.vecto");
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck_ParHyb_ENG.vecto");
var engineering = inputProvider as IEngineeringInputDataProvider;
@@ -251,7 +251,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase()]
public void TestCreateHybridPowertrain()
{
- var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\Hybrids\GenericVehicle_Group2_P2\Class2_RigidTruck_ParHyb_ENG.vecto");
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck_ParHyb_ENG.vecto");
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, null);
@@ -278,7 +278,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase()]
public void TestCreateBatteryElectricPowertrain()
{
- var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\BatteryElectric\GenericVehicleB4\BEV_ENG.vecto");
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/BatteryElectric/GenericVehicleB4/BEV_ENG.vecto");
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, null);
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 961d558002a4affa912700e40c3766feb61aa804..bd0d0e796b80fa594b207a47878ed520a8f81653 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -54,8 +54,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
[Parallelizable(ParallelScope.All)]
public class JsonReadTest
{
- private const string TestJobFile = @"Testdata\Jobs\40t_Long_Haul_Truck.vecto";
- private const string TestVehicleFile = @"Testdata\Components\24t Coach.vveh";
+ private const string TestJobFile = @"TestData/Jobs/40t_Long_Haul_Truck.vecto";
+ private const string TestVehicleFile = @"TestData/Components/24t Coach.vveh";
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxV5()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\Gearbox_v5.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/Gearbox_v5.vgbx");
var ratios = new[] { 3.0, 1.0, 0.8 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -195,7 +195,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.RigidTruck,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -216,7 +216,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxSerialTC()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\GearboxSerial.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/GearboxSerial.vgbx");
var ratios = new[] { 3.4, 1.9, 1.42, 1.0, 0.7, 0.62 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -236,7 +236,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.RigidTruck,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -245,7 +245,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}, null);
//inputProvider,
- //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
//(IGearshiftEngineeringInputData)inputProvider, 2.1,
//0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
@@ -264,7 +264,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxPowersplitTC()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\GearboxPowerSplit.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/GearboxPowerSplit.vgbx");
var ratios = new[] { 1.35, 1.0, 0.73 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -284,7 +284,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.RigidTruck,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -293,7 +293,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}, null);
//inputProvider,
- //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
//(IGearshiftEngineeringInputData)inputProvider, 2.1,
//0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
@@ -311,7 +311,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxDualTCTruck()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\GearboxSerialDualTC.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx");
var ratios = new[] { 4.35, 2.4, 1.8, 1.3, 1.0 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -331,7 +331,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.RigidTruck,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -339,7 +339,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
AxleGearData = new AxleGearData() { AxleGear = new TransmissionData() { Ratio = 2.1 } }
}, null);
//inputProvider,
- //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
//(IGearshiftEngineeringInputData)inputProvider, 2.1,
//0.5.SI<Meter>(), VehicleCategory.RigidTruck, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
@@ -359,7 +359,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxSingleTCBus()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\GearboxSerialDualTC.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/GearboxSerialDualTC.vgbx");
var ratios = new[] { 4.35, 2.4, 1.8, 1.3, 1.0 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -379,7 +379,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -387,7 +387,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
AxleGearData = new AxleGearData() { AxleGear = new TransmissionData() { Ratio = 2.1 } }
}, null);
//inputProvider,
- //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
//(IGearshiftEngineeringInputData)inputProvider, 2.1,
//0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
@@ -407,7 +407,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void ReadGearboxDualTCBus()
{
- var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData\Components\AT_GBX\GearboxSerialDualTCBus.vgbx");
+ var inputProvider = JSONInputDataFactory.ReadGearbox(@"TestData/Components/AT_GBX/GearboxSerialDualTCBus.vgbx");
var ratios = new[] { 4.58, 2.4, 1.8, 1.3, 1.0 };
Assert.AreEqual(ratios.Length, inputProvider.Gears.Count);
@@ -427,7 +427,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
}
}, new VectoRunData() {
- EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ EngineData = MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
VehicleData = new VehicleData() {
VehicleCategory = VehicleCategory.RigidTruck,
DynamicTyreRadius = 0.5.SI<Meter>()
@@ -436,7 +436,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}, null);
//inputProvider,
- //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData\Components\AT_GBX\Engine.veng", 0),
+ //MockSimulationDataFactory.CreateEngineDataFromFile(@"TestData/Components/AT_GBX/Engine.veng", 0),
//(IGearshiftEngineeringInputData)inputProvider, 2.1,
//0.5.SI<Meter>(), VehicleCategory.InterurbanBus, (ITorqueConverterEngineeringInputData)inputProvider, null, null);
Assert.AreEqual(ratios.Length, gbxData.Gears.Count);
@@ -484,7 +484,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void JSON_Read_HeavyBus()
{
- var inputProvider = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(@"TestData\Generic Vehicles\Engineering Mode\HeavyBusPrimary\HeavyBusPrimary_DECL.vecto");
+ var inputProvider = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(@"TestData/Generic Vehicles/Engineering Mode/HeavyBusPrimary/HeavyBusPrimary_DECL.vecto");
var busAux = inputProvider.JobInputData.Vehicle.Components.BusAuxiliaries;
Assert.AreEqual("Electrically driven - Electronically controlled", busAux.FanTechnology);
@@ -510,7 +510,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase()]
public void JSON_Read_IEPC()
{
- var inputProvider = new JSONComponentInputData(@"TestData\BatteryElectric\IEPC\GenericIEPC.viepc", null);
+ var inputProvider = new JSONComponentInputData(@"TestData/BatteryElectric/IEPC/GenericIEPC.viepc", null);
var iepcData = (IIEPCEngineeringInputData)inputProvider.IEPC;
Assert.AreEqual("3", iepcData.AppVersion);
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
index 98da649f063210d986c7d4ac930c3cfa99f151af..2a1eeefbc327955069eeeb77d1ed6b8c9d87cda0 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- [TestCase(@"TestData\Generic Vehicles\Declaration Mode\Class9_RigidTruck_6x2\Class9_RigidTruck.vveh")]
+ [TestCase(@"TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh")]
public void SaveVehicleFileDecl(string vehicleFile)
{
var outFile = "json_vehicle_write_test.vveh";
@@ -79,7 +79,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
}
- [TestCase(@"TestData\Generic Vehicles\Declaration Mode\Class9_RigidTruck_6x2\Engine_324kW_12.7l.veng")]
+ [TestCase(@"TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng")]
public void SaveEngineFileDecl(string engineFile)
{
var outFile = "json_engine_write_test.veng";
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
new[] { "Source", "EngineModes" });
}
- [TestCase(@"TestData\Generic Vehicles\Declaration Mode\Class9_RigidTruck_6x2\AMT_12.vgbx")]
+ [TestCase(@"TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx")]
public void SaveGearboxAxlegearFileDecl(string engineFile)
{
var outFile = "json_gearbox_write_test.vgbx";
diff --git a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
index 034dc9a440a9871e7bd9e3f6b556b1f820a66133..659037edb8e23912d4ab809fd953d453bbf99ee0 100644
--- a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[Parallelizable(ParallelScope.All)]
public class SimulationDataReaderTest
{
- protected const string DeclarationJob = @"TestData\Jobs\12t Delivery Truck.vecto";
+ protected const string DeclarationJob = @"TestData/Jobs/12t Delivery Truck.vecto";
protected const double Tolerance = 0.0001;
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs b/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
index d3beaaec56957d0b37bec9e51c8e5d83ce35d4c5..5fef78f2f03ceb54c31db6dfdbd072a285a208ea 100644
--- a/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void VectoCSVFile_Read()
{
- var table = VectoCSVFile.Read(@"TestData\test.csv");
+ var table = VectoCSVFile.Read(@"TestData/test.csv");
Assert.AreEqual(3, table.Columns.Count);
CollectionAssert.AreEqual(new[] { "a", "b", "c" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(2, table.Rows.Count);
@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
[TestCase]
public void VectoCSVFile_Read_RealLossMap()
{
- var table = VectoCSVFile.Read(@"TestData\Components\Axle.vtlm");
+ var table = VectoCSVFile.Read(@"TestData/Components/Axle.vtlm");
Assert.AreEqual(3, table.Columns.Count);
CollectionAssert.AreEqual(
new[] { "Input Speed", "Input Torque", "Torque Loss" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
@@ -189,8 +189,9 @@ namespace TUGraz.VectoCore.Tests.FileIO
VectoCSVFile.Write(fileName, table);
- var text = File.ReadAllText(fileName);
- Assert.AreEqual("a,b\r\n1,2\r\n", text);
+ var lines = File.ReadAllLines(fileName);
+ Assert.AreEqual("a,b", lines[0]);
+ Assert.AreEqual("1,2", lines[1]);
}
[TestCase]
@@ -211,7 +212,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
stream.Position = 0;
using (var sr = new StreamReader(stream)) {
- Assert.AreEqual("a,b\r\n1,2\r\n", sr.ReadToEnd());
+ string line1 = sr.ReadLine();
+ Assert.AreEqual("a,b", line1);
+
+ string line2 = sr.ReadLine();
+ Assert.AreEqual("1,2", line2);
}
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index 923f507498fbac11bfb7e995df1266badfbe7ed5..b6706fc09083adbc2efc16ba172bd24c4e25e0f5 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[Parallelizable(ParallelScope.All)]
public class ADASTestsConventional
{
- private const string BasePath = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\";
+ private const string BasePath = @"TestData/Integration/ADAS-Conventional/Group5PCCEng/";
private const double tolerance = 1; //seconds of tolerance. Tolerance distance is calculated dynamically based on speed.
private IXMLInputDataReader _xmlInputReader;
@@ -60,21 +60,21 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
}
- [TestCase(@"TestData\Integration\ADAS-Conventional\Group5_EngineStopStart.xml")]
+ [TestCase(@"TestData/Integration/ADAS-Conventional/Group5_EngineStopStart.xml")]
public void TestVehicleWithADASEngineStopStart(string filename)
{
var container = RunAllDeclarationJob(filename);
//var container = RunSingleDeclarationJob(filename, 4);
}
- [TestCase(@"TestData\Integration\ADAS-Conventional\Group5_EcoRoll.xml")]
+ [TestCase(@"TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml")]
public void TestVehicleWithADASEcoRoll(string filename)
{
var container = RunAllDeclarationJob(filename);
//var container = RunSingleDeclarationJob(filename, 4);
}
- [TestCase(@"TestData\Integration\ADAS-Conventional\Group5_EcoRollEngineStop.xml")]
+ [TestCase(@"TestData/Integration/ADAS-Conventional/Group5_EcoRollEngineStop.xml")]
public void TestVehicleWithADASEcoRollEngineStopStart(string filename)
{
var container = RunAllDeclarationJob(filename);
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRoll(int cycleIdx)
{
- var jobName = @"TestData\Integration\ADAS-Conventional\Group5EcoRollEng\Class5_Tractor_ENG.vecto";
+ var jobName = @"TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor_ENG.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRollAT_Neutral(int cycleIdx)
{
- const string jobName = @"TestData\Integration\ADAS-Conventional\Group9_RigidTruck_AT\Class_9_RigidTruck_AT_Eng_Neutral.vecto";
+ const string jobName = @"TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
@@ -174,7 +174,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRollAT_TC(int cycleIdx)
{
- const string jobName = @"TestData\Integration\ADAS-Conventional\Group9_RigidTruck_AT\Class_9_RigidTruck_AT_Eng_TC.vecto";
+ const string jobName = @"TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
@@ -200,14 +200,14 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
GetGraphWriter().Write(modFilename);
}
- [TestCase(@"TestData\Integration\ADAS-Conventional\Group9_AT_EngineStopStart.xml")]
+ [TestCase(@"TestData/Integration/ADAS-Conventional/Group9_AT_EngineStopStart.xml")]
public void TestATVehicleWithADASEngineStopStart(string filename)
{
//var container = RunAllDeclarationJob(filename);
var container = RunSingleDeclarationJob(filename, 5);
}
- [TestCase(@"TestData\Integration\ADAS-Conventional\Group9_AT_EcoRoll.xml")]
+ [TestCase(@"TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml")]
public void TestATVehicleWithADASEcoRoll(string filename)
{
var container = RunAllDeclarationJob(filename);
@@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
TestCase(1, TestName = "PCC Group5 LH RefLoad")]
public void TestTCCDeclaration(int runIdx)
{
- var jobName = @"TestData\Integration\ADAS-Conventional\Group5PCCDecl\Tractor_4x2_vehicle-class-5_5_t_0.xml";
+ var jobName = @"TestData/Integration/ADAS-Conventional/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml";
RunSingleDeclarationJob(jobName, runIdx);
}
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
index 256e38698eba6bb72805912a126df20243d9fd79..e8017a9000cab838d07f523e5d9def944ac391e8 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[Parallelizable(ParallelScope.All)]
public class ADASTestsHEV
{
- private const string BasePath = @"TestData\Integration\ADAS-HEV\Group5PCCEng\";
+ private const string BasePath = @"TestData/Integration/ADAS-HEV/Group5PCCEng/";
private const double tolerance = 1; //seconds of tolerance. Tolerance distance is calculated dynamically based on speed.
[OneTimeSetUp]
@@ -53,8 +53,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
return graphWriter;
}
- [TestCase(@"TestData\Integration\ADAS-HEV\VECTO-1493\P1_CityBus.vecto", TestName = "VECTO-1493_P1Citybus")]
- [TestCase(@"TestData\Integration\ADAS-HEV\VECTO-1484\P2_Group5_s2c0_rep_Payload.vecto", TestName = "VECTO-1484_P2Group5")]
+ [TestCase(@"TestData/Integration/ADAS-HEV/VECTO-1493/P1_CityBus.vecto", TestName = "VECTO-1493_P1Citybus")]
+ [TestCase(@"TestData/Integration/ADAS-HEV/VECTO-1484/P2_Group5_s2c0_rep_Payload.vecto", TestName = "VECTO-1484_P2Group5")]
public static void RunEngineeringJob(string jobName)
{
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRoll(int cycleIdx)
{
- var jobName = @"TestData\Integration\ADAS-HEV\Group5EcoRollEng\Class5_Tractor_ENG.vecto";
+ var jobName = @"TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRollAT_Neutral(int cycleIdx)
{
- var jobName = @"TestData\Integration\ADAS-HEV\Group9_RigidTruck_AT\Class_9_RigidTruck_AT_Eng_Neutral.vecto";
+ var jobName = @"TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
@@ -164,7 +164,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
]
public void TestEcoRollAT_TC(int cycleIdx)
{
- var jobName = @"TestData\Integration\ADAS-HEV\Group9_RigidTruck_AT\Class_9_RigidTruck_AT_Eng_TC.vecto";
+ var jobName = @"TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
index 60179590d801cd3f1f27ee5cdb87b7a4346dd0fd..9b00b8ded5fdf4c474fc795e42feb49703b4b2aa 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
@@ -23,7 +23,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[Parallelizable(ParallelScope.All)]
public class ADASTestsPEV
{
- private const string BasePath = @"TestData\Integration\ADAS-PEV\Group5PCCEng\";
+ private const string BasePath = @"TestData/Integration/ADAS-PEV/Group5PCCEng/";
private const double tolerance = 1; //seconds of tolerance. Tolerance distance is calculated dynamically based on speed.
[OneTimeSetUp]
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[TestCase]
public void TestVECTO_1483()
{
- var jobName = @"TestData\Integration\ADAS-PEV\VECTO-1483\E4_Group 5 LH_ll.vecto";
+ var jobName = @"TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(jobName);
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
var sumContainer = new SummaryDataContainer(writer);
diff --git a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
index 40e2d9eac9adcae5b4d688ea615eb6b1b74c1f0c..1887f6fc63b19e3077ddfe3f73f2eb82b26b95e5 100644
--- a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
@@ -34,7 +34,7 @@ namespace TUGraz.VectoCore.Tests.Integration
//public void VECTO_EffShift()
//{
// var jobName =
- // @"E:\QUAM\tmp\1a_EffShift_high-engine-rev_UD-cycle_LH-tractor_model\vecto_tractor_4x2_overdr_EffShift-def.vecto";
+ // @"E:/QUAM/tmp/1a_EffShift_high-engine-rev_UD-cycle_LH-tractor_model/vecto_tractor_4x2_overdr_EffShift-def.vecto";
// RunJob_DeclSingle(jobName, 9);
//}
diff --git a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
index ce8b41271b85826e58d7c492e85a314509fa80bb..68ef6bd7859e6d7a5c6b99780c5f8a026d686325 100644
--- a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
@@ -56,14 +56,14 @@ namespace TUGraz.VectoCore.Tests.Integration
{
protected static readonly PerSecond MaxTcSpeed = 1500.RPMtoRad();
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\AT_GBX\Engine.veng";
- //public const string AxleGearLossMap = @"TestData\Components\AT_GBX\Axle.vtlm";
- //public const string GearboxIndirectLoss = @"TestData\Components\AT_GBX\Indirect Gear.vtlm";
- //public const string GearboxDirectLoss = @"TestData\Components\AT_GBX\Direct Gear.vtlm";
- public const string TorqueConverterGenericFile = @"TestData\Components\AT_GBX\TorqueConverter.vtcc";
- public const string TorqueConverterPowerSplitFile = @"TestData\Components\AT_GBX\TorqueConverterPowerSplit.vtcc";
- public const string GearboxShiftPolygonFile = @"TestData\Components\AT_GBX\AT-Shift.vgbs";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string EngineFile = @"TestData/Components/AT_GBX/Engine.veng";
+ //public const string AxleGearLossMap = @"TestData/Components/AT_GBX/Axle.vtlm";
+ //public const string GearboxIndirectLoss = @"TestData/Components/AT_GBX/Indirect Gear.vtlm";
+ //public const string GearboxDirectLoss = @"TestData/Components/AT_GBX/Direct Gear.vtlm";
+ public const string TorqueConverterGenericFile = @"TestData/Components/AT_GBX/TorqueConverter.vtcc";
+ public const string TorqueConverterPowerSplitFile = @"TestData/Components/AT_GBX/TorqueConverterPowerSplit.vtcc";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/AT_GBX/AT-Shift.vgbs";
public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, GearboxType gbxType, string modFileName,
bool overspeed = false, KilogramSquareMeter gearBoxInertia = null)
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 2e5f23646ed8fcf336334f0c19781d8df5efb3f1..16e185646bfe053ea1f59cfcc00cb050187de394 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -38,33 +38,33 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
public class BatteryElectricTest
{
- protected const string BEV_Job = @"TestData\BatteryElectric\GenericVehicleB4\BEV_ENG.vecto";
- protected const string BEV_Job_Cont30kW = @"TestData\BatteryElectric\GenericVehicleB4\BEV_ENG_Cont30kW.vecto";
+ protected const string BEV_Job = @"TestData/BatteryElectric/GenericVehicleB4/BEV_ENG.vecto";
+ protected const string BEV_Job_Cont30kW = @"TestData/BatteryElectric/GenericVehicleB4/BEV_ENG_Cont30kW.vecto";
- protected const string BEV_E3_Job = @"TestData\BatteryElectric\GenericVehicleB3\BEV_ENG.vecto";
- protected const string BEV_E3_Job_Cont30kW = @"TestData\BatteryElectric\GenericVehicleB3\BEV_ENG_Cont30kW.vecto";
+ protected const string BEV_E3_Job = @"TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto";
+ protected const string BEV_E3_Job_Cont30kW = @"TestData/BatteryElectric/GenericVehicleB3/BEV_ENG_Cont30kW.vecto";
- protected const string BEV_E2_Job = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG.vecto";
- protected const string BEV_E2_Job_3Speed = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_3speed.vecto";
- protected const string BEV_E2_Job_BusAux = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_BusAux.vecto";
- protected const string BEV_E2_Job_Cont30kW = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_Cont30kW.vecto";
+ protected const string BEV_E2_Job = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto";
+ protected const string BEV_E2_Job_3Speed = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed.vecto";
+ protected const string BEV_E2_Job_BusAux = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto";
+ protected const string BEV_E2_Job_Cont30kW = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto";
- protected const string BEV_E2_APTN_Job = @"TestData\BatteryElectric\GenericVehicleB2_APTN\BEV_B2_Group5LH_rl_APTN.vecto";
+ protected const string BEV_E2_APTN_Job = @"TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5LH_rl_APTN.vecto";
- protected const string BEV_E2_APTS_Job = @"TestData\BatteryElectric\GenericVehicleB2_AT\BEV_B2_Group5LH_rl_APTS.vecto";
- protected const string BEV_E2_APTP_Job = @"TestData\BatteryElectric\GenericVehicleB2_AT\BEV_B2_Group5LH_rl_APTP.vecto";
+ protected const string BEV_E2_APTS_Job = @"TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5LH_rl_APTS.vecto";
+ protected const string BEV_E2_APTP_Job = @"TestData/BatteryElectric/GenericVehicleB2_AT/BEV_B2_Group5LH_rl_APTP.vecto";
- protected const string BEV_E2_3Speed_PTO_Job = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_3speed_PTO.vecto";
+ protected const string BEV_E2_3Speed_PTO_Job = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto";
- public const string MotorFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericEMotor_125kW_485Nm.vem";
- public const string BatFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericBattery_243kWh_750V.vbat";
+ public const string MotorFile = @"TestData/BatteryElectric/GenericVehicleB4/GenericEMotor_125kW_485Nm.vem";
+ public const string BatFile = @"TestData/BatteryElectric/GenericVehicleB4/GenericBattery_243kWh_750V.vbat";
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- //public const string MotorFile240kW = @"TestData\Hybrids\ElectricMotor\GenericEMotor240kW.vem";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ //public const string MotorFile240kW = @"TestData/Hybrids/ElectricMotor/GenericEMotor240kW.vem";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -801,7 +801,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
[TestCase]
public void RunJob_E3_AxlegearInputRetarder() {
- var jobFile = @"TestData\Components\Retarder\E3\E3WithAxlegearInputRetarder.vecto";
+ var jobFile = @"TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto";
var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
var writer = new FileOutputWriter(jobFile);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
@@ -823,7 +823,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
[TestCase]
public void RunJob_E3_NoAxlegearInputRetarder()
{
- var jobFile = @"TestData\Components\Retarder\E3\E3WithoutAxlegearInputRetarder.vecto";
+ var jobFile = @"TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vecto";
var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
var writer = new FileOutputWriter(jobFile);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs
index 25a139f168341497a35b9ea3e61cfeb6cce49a76..9cc209bb6fa15bc8c76f32f6cce1a0063839f256 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs
@@ -17,23 +17,23 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
public class IEPCTest
{
- protected const string IEPC_Gbx3Speed = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed\IEPC_ENG_Gbx3.vecto";
+ protected const string IEPC_Gbx3Speed = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto";
- protected const string IEPC_Gbx3Speed_drag = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed\IEPC_ENG_Gbx3_drag.vecto";
+ protected const string IEPC_Gbx3Speed_drag = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto";
- protected const string IEPC_Gbx3SpeedAxle = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed+Axle\IEPC_ENG_Gbx3Axl.vecto";
+ protected const string IEPC_Gbx3SpeedAxle = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto";
- protected const string IEPC_Gbx3SpeedWhl1 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed-Whl1\IEPC_ENG_Gbx3Whl1.vecto";
+ protected const string IEPC_Gbx3SpeedWhl1 = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto";
- protected const string IEPC_Gbx3SpeedWhl2 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed-Whl2\IEPC_ENG_Gbx3Whl2.vecto";
+ protected const string IEPC_Gbx3SpeedWhl2 = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto";
- protected const string IEPC_Gbx1Speed = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed\IEPC_ENG_Gbx1.vecto";
+ protected const string IEPC_Gbx1Speed = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto";
- protected const string IEPC_Gbx1SpeedAxl = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed+Axle\IEPC_ENG_Gbx1Axl.vecto";
+ protected const string IEPC_Gbx1SpeedAxl = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto";
- protected const string IEPC_Gbx1SpeedWhl1 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed-Whl1\IEPC_ENG_Gbx1Whl1.vecto";
+ protected const string IEPC_Gbx1SpeedWhl1 = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto";
- protected const string IEPC_Gbx1SpeedWhl2 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed-Whl2\IEPC_ENG_Gbx1Whl2.vecto";
+ protected const string IEPC_Gbx1SpeedWhl2 = @"TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
index 6989319fef4be43e619a0be6066f7455fc5a5ab9..ee09a1871231192cab6b3aa8067de1fae6ce85e4 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
@@ -309,7 +309,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
- GetGraphWriter().Write(modFileName, @"..\..\TestData\Integration\BusAuxiliaries\Vecto2.0\" + compareFileName);
+ GetGraphWriter().Write(modFileName, @"../../TestData/Integration/BusAuxiliaries/Vecto2.0/" + compareFileName);
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
index 9fe44484680a9baeba19cbabdb29ba873ca653d3..bbdf4b661ec190457174a5df0b40c187a2aeb261 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
@@ -125,9 +125,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
public static BusAuxiliariesAdapter CreateBusAuxAdapterForTesting(double vehicleMass, out MockDriver driver)
{
- var auxFilePath = @"TestData\Integration\BusAuxiliaries\AdvAuxTest.aaux";
- var engineFLDFilePath = @"TestData\Integration\BusAuxiliaries\24t Coach.vfld";
- var engineFCMapFilePath = @"TestData\Integration\BusAuxiliaries\24t Coach.vmap";
+ var auxFilePath = @"TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux";
+ var engineFLDFilePath = @"TestData/Integration/BusAuxiliaries/24t Coach.vfld";
+ var engineFCMapFilePath = @"TestData/Integration/BusAuxiliaries/24t Coach.vmap";
var vehicle = new VehicleContainer(ExecutionMode.Engineering, new MockModalDataContainer());
var fcMap = FuelConsumptionMapReader.ReadFromFile(engineFCMapFilePath);
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index 73faa3a9a71cdbdabfd91aa9fe40997e1449e738..90181b2b2721ab80235335153ab2a342fdf91546 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -56,16 +56,16 @@ namespace TUGraz.VectoCore.Tests.Integration
{
public class CoachAdvancedAuxPowertrain
{
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
- public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
- public const string AxleGearLossMap = @"TestData\Components\Axle.vtlm";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
-
- public const string AdvancedAuxFile = @"Testdata\Integration\BusAuxiliaries\AdvAuxTest.aaux";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string EngineFile = @"TestData/Components/24t Coach.veng";
+ public const string EngineFileHigh = @"TestData/Components/24t Coach_high.veng";
+ public const string AxleGearLossMap = @"TestData/Components/Axle.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
+
+ public const string AdvancedAuxFile = @"TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux";
public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, string modFileName,
bool overspeed = false, bool highEnginePower = true)
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 54cfecfc2ed2d813dc2344d003a9b70a346887f0..baace1e6b4d9cff5d89dd4652f5aa1a08f77a08a 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -54,14 +54,14 @@ namespace TUGraz.VectoCore.Tests.Integration
{
public class CoachPowerTrain
{
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
- public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
- public const string AxleGearLossMap = @"TestData\Components\Axle.vtlm";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string EngineFile = @"TestData/Components/24t Coach.veng";
+ public const string EngineFileHigh = @"TestData/Components/24t Coach_high.veng";
+ public const string AxleGearLossMap = @"TestData/Components/Axle.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, string modFileName,
bool overspeed = false, KilogramSquareMeter gearBoxInertia = null, bool highEnginePower = true)
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 3030e51b634808bc89fdf9acfa013ee96fcab7a9..e9a0cbcb0851682578b716bdc3222b7aecbbe382 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -38,11 +38,11 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//[Parallelizable(ParallelScope.All)] --> job file executed more than 20 runs in parallel, which produces out-of-memory if run parallel
public class CompletedBusFactorMethodTest
{
- const string JobFile_Group41 = @"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b.vecto";
- const string JobFile_Group42 = @"TestData\Integration\Buses\FactorMethod\CompletedBus_42-33b.vecto";
+ const string JobFile_Group41 = @"TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto";
+ const string JobFile_Group42 = @"TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto";
- const string JobFilePrimary41 = @"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart.xml";
- const string JobFilePrimary42 = @"TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.xml";
+ const string JobFilePrimary41 = @"TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml";
+ const string JobFilePrimary42 = @"TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml";
protected IXMLInputDataReader xmlInputReader;
@@ -960,9 +960,9 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
[TestCase(JobFile_Group41, 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b CO/LL"),
TestCase(JobFile_Group42, 1, TestName = "PrintVectoRunData CompletedBus Group 42/33b HU/RL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b_AT-P.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b AT-P CO/LL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b_ES-AUX.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b ES-Aux CO/LL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b_ES-AUX_mixed.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b ES-Aux CO/LL mixedDoors"),]
+ TestCase(@"TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b AT-P CO/LL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b ES-Aux CO/LL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto", 0, TestName = "PrintVectoRunData CompletedBus Group 41/32b ES-Aux CO/LL mixedDoors"),]
public void PrintModelParametersCompletedBus(string jobFile, int pairIdx)
{
var runs = GetVectoRunData(jobFile);
@@ -976,12 +976,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
- [TestCase(@"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart.xml", 12, TestName = "PrintVectoRunData PrimaryBus Group41 SD CO/LL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.xml", 1, TestName = "PrintVectoRunData PrimaryBus Group42 SD HU/RL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_41-32b.vecto", 0, TestName = "PrintVectoRunData SingleBus Group 41/32b CO/LL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_42-33b.vecto", 1, TestName = "PrintVectoRunData SingleBus Group 42/33b HU/RL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart_AT-P.xml", 12, TestName = "PrintVectoRunData PrimaryBus Group41 AT-P SD CO/LL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "PrintVectoRunData electric STP/Fan ESS IU/RL"),
+ [TestCase(@"TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml", 12, TestName = "PrintVectoRunData PrimaryBus Group41 SD CO/LL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml", 1, TestName = "PrintVectoRunData PrimaryBus Group42 SD HU/RL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/SingleBus_41-32b.vecto", 0, TestName = "PrintVectoRunData SingleBus Group 41/32b CO/LL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/SingleBus_42-33b.vecto", 1, TestName = "PrintVectoRunData SingleBus Group 42/33b HU/RL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml", 12, TestName = "PrintVectoRunData PrimaryBus Group41 AT-P SD CO/LL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "PrintVectoRunData electric STP/Fan ESS IU/RL"),
]
public void PrintModelParameters(string jobFile, int runIdx)
{
@@ -993,10 +993,10 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
File.WriteAllText($"{run.JobName}_{run.Cycle.Name}{run.ModFileSuffix}.json", JsonConvert.SerializeObject(run, Formatting.Indented));
}
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_DECL.vecto", 0, TestName = "PrintVectoRunData VTP HeavyTruck"),
- TestCase(@"TestData\Integration\VTPMode\MediumLorry\VTP_MediumLorry.vecto", 0, TestName = "PrintVectoRunData VTP MediumLory"),
- TestCase(@"TestData\Integration\VTPMode\HeavyBus\VTP_PrimaryBus.vecto", 0, TestName = "PrintVectoRunData VTP PrimaryBus"),
- TestCase(@"TestData\Integration\VTPMode\DualFuelVehicle\VTP_DualFuel.vecto", 0, TestName = "PrintVectoRunData VTP DualFuel"),
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle_DECL.vecto", 0, TestName = "PrintVectoRunData VTP HeavyTruck"),
+ TestCase(@"TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto", 0, TestName = "PrintVectoRunData VTP MediumLory"),
+ TestCase(@"TestData/Integration/VTPMode/HeavyBus/VTP_PrimaryBus.vecto", 0, TestName = "PrintVectoRunData VTP PrimaryBus"),
+ TestCase(@"TestData/Integration/VTPMode/DualFuelVehicle/VTP_DualFuel.vecto", 0, TestName = "PrintVectoRunData VTP DualFuel"),
]
public void PrintModelParametersVTP(string jobFile, int runIdx)
{
@@ -1090,12 +1090,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
[TestCase(JobFilePrimary41, TestName = "RunPrimaryBusSimulation Group41"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart_AT-P.xml", TestName = "RunPrimaryBusSimulation Group41 AT-P"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", TestName = "RunPrimaryBusSimulation Group41 ES-AUX"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml", TestName = "RunPrimaryBusSimulation Group41 AT-P"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", TestName = "RunPrimaryBusSimulation Group41 ES-AUX"),
TestCase(JobFilePrimary42, TestName = "RunPrimaryBusSimulation Group42"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_41-32b.vecto", TestName = "RunSingleBusSimulation Group 41/32b"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_42-33b.vecto", TestName = "RunSingleBusSimulation Group 42/33b"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_41-32b_AT-P.vecto", TestName = "RunSingleBusSimulation Group 41/32b AT-P"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/SingleBus_41-32b.vecto", TestName = "RunSingleBusSimulation Group 41/32b"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/SingleBus_42-33b.vecto", TestName = "RunSingleBusSimulation Group 42/33b"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/SingleBus_41-32b_AT-P.vecto", TestName = "RunSingleBusSimulation Group 41/32b AT-P"),
]
public void TestRunPrimaryOrSingleBusSimulation(string jobName)
{
@@ -1129,18 +1129,18 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat(jobContainer.Runs.Select(r => r.ExecException)));
}
- [TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"),
- TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),
+ [TestCase(@"TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"),
+ TestCase(@"TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),
- TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 3, TestName = "RunBusSimulation Grp 39/40 P39SD U/RL"),
- TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 7, TestName = "RunBusSimulation Grp 39/40 P39DD HU/RL"),
- TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 9, TestName = "RunBusSimulation Grp 39/40 P39DD U/RL"),
- TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 19, TestName = "RunBusSimulation Grp 39/40 P40DD CO/RL"), // fails! is intended/known
- TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 18, TestName = "RunBusSimulation Grp 39/40 P40DD CO/LL"), // fails! is intended/known
+ TestCase(@"TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml", 3, TestName = "RunBusSimulation Grp 39/40 P39SD U/RL"),
+ TestCase(@"TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml", 7, TestName = "RunBusSimulation Grp 39/40 P39DD HU/RL"),
+ TestCase(@"TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml", 9, TestName = "RunBusSimulation Grp 39/40 P39DD U/RL"),
+ TestCase(@"TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml", 19, TestName = "RunBusSimulation Grp 39/40 P40DD CO/RL"), // fails! is intended/known
+ TestCase(@"TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml", 18, TestName = "RunBusSimulation Grp 39/40 P40DD CO/LL"), // fails! is intended/known
- //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
- //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
- //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS_SmartES.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS SmartES"),
+ //TestCase(@"E:/QUAM/tmp/ESS_Tests/primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
+ //TestCase(@"E:/QUAM/tmp/ESS_Tests/primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
+ //TestCase(@"E:/QUAM/tmp/ESS_Tests/primary_heavyBus group 42_ESS_SmartPS_SmartES.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS SmartES"),
]
public void TestRunPrimaryBusSimulation_ESS(string jobName, int runIdx)
{
@@ -1174,7 +1174,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException)));
}
- private const string JobGrp32b = @"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b_ES-AUX.vecto";
+ private const string JobGrp32b = @"TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto";
[
TestCase(JobGrp32b, 2, 20, 5, 17, 9, 51, TestName = "CompleteBus PassengerCount IU specific RL"),
@@ -1213,8 +1213,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.AreEqual(expectedPassengers + 1, ssmInputs.NumberOfPassengers, 1e-3); // adding driver for SSM
}
- private const string PrimaryGrp41 = @"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart.xml";
- private const string CompletedGrp41_32b = @"TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_41.xml";
+ private const string PrimaryGrp41 = @"TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml";
+ private const string CompletedGrp41_32b = @"TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml";
[
TestCase(PrimaryGrp41, CompletedGrp41_32b, 1, 20, 5, 17, 9, 51, TestName = "SingleBus PassengerCount IU RL"),
@@ -1319,7 +1319,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
- //[TestCase(@"E:\QUAM\tmp\primary_heavyBus group 42_SmartPS_spec engine map.xml", 0),]
+ //[TestCase(@"E:/QUAM/tmp/primary_heavyBus group 42_SmartPS_spec engine map.xml", 0),]
public void TestRunPrimaryBusSimulationSngle(string jobName, int runIdx)
{
var relativeJobPath = jobName;
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
index 44c69ecd1e1226ebca538b29c2824194e6f45ab3..2512d73e79f7b357b6f0f7399838c16d50706ee1 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
@@ -27,10 +27,10 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
public class CompletedBusSanityCheckTests
{
private IXMLInputDataReader _xmlInputReader;
- public const string CompletedFile32 = @"TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_41.xml";
- //public const string CompletedFile33b1 = @"TestData\Integration\Buses\FactorMethod\CompletedHeavyBus_33b1.RSLT_VIF.xml";
- public const string CompletedFile33b1 = @"TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_42.xml";
- public const string PifFile_33_34 = @"TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.RSLT_VIF.xml";
+ public const string CompletedFile32 = @"TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml";
+ //public const string CompletedFile33b1 = @"TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml";
+ public const string CompletedFile33b1 = @"TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml";
+ public const string PifFile_33_34 = @"TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
index 6f872fb1d1afb01722bab0815535682a32116057..526b44975b75b3a0fdca8f4f0979e6f7f4f77670 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs
@@ -40,7 +40,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[Parallelizable(ParallelScope.All)]
public class ADASVehicleTest
{
- const string Class5ADAS = @"Testdata\Integration\DeclarationMode\Class5_ADAS\Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
+ const string Class5ADAS = @"TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
index ea674de0ffb5e6a9d379e653f3c28465006d92dd..8b71e96bea3fd0c3a7d6a192e168a85393c73462 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
@@ -56,12 +56,12 @@ namespace TUGraz.VectoCore.Tests.Integration
[Parallelizable(ParallelScope.All)]
public class ExemptedVehicleTest
{
- const string ExemptedVehicle = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml";
- const string ExemptedVehicleNoHEV = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_nonHEV.xml";
- const string ExemptedVehicleV2 = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2.xml";
- const string ExemptedVehicleV2NoHEV = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2_nonHEV.xml";
+ const string ExemptedVehicle = @"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml";
+ const string ExemptedVehicleNoHEV = @"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_nonHEV.xml";
+ const string ExemptedVehicleV2 = @"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2.xml";
+ const string ExemptedVehicleV2NoHEV = @"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml";
- const string ExemptedPrimaryBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\exempted_primary_heavyBus.xml";
+ const string ExemptedPrimaryBus = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/exempted_primary_heavyBus.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 4ef4e949167d5ad3ed63a99c188316fd18139f60..1f8eccc77b0c51ecf10e549f92427001eebb1938 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[Parallelizable(ParallelScope.All)]
public class NaturalGasVehicles
{
- const string Class5NG = @"Testdata\Integration\DeclarationMode\Class5_NG\Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
+ const string Class5NG = @"TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
-
+ [NonParallelizable]
[
TestCase(Class5NG, 2, TankSystem.Liquefied, 249.8, 691.93, TestName = "Class5 LNG 2"),
TestCase(Class5NG, 2, TankSystem.Compressed, 255.5, 687.35, TestName = "Class5 CNG 2"),
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs b/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
index 99b563c64a2e05e8a11ecebc199905aa48150bea..bc17ee6055411a431adc1e802ca6a8020c19af82 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
}
- [TestCase(@"TestData\Integration\TotalMassExceededInMU\Class4_Tractor_DECL.vecto")]
+ [TestCase(@"TestData/Integration/TotalMassExceededInMU/Class4_Tractor_DECL.vecto")]
public void TestMaxMassInMunicipalCycle(string jobFile)
{
var relativeJobPath = jobFile;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
index 85246786987e121ea4123e0086d6fec85134f865..dc2ba92829c919c42c3741f4b2f57ba6bb98c780 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs
@@ -47,8 +47,8 @@ namespace TUGraz.VectoCore.Tests.Integration
[Parallelizable(ParallelScope.All)]
public class VocationalVehicleTest
{
- const string Class4Vocational = @"Testdata\Integration\DeclarationMode\Class4_Vocational\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml";
- const string Class5Vocational = @"Testdata\Integration\DeclarationMode\Class5_Vocational\Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
+ const string Class4Vocational = @"TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml";
+ const string Class5Vocational = @"TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
index 1ed5bdf237d864489e4501322605ab98a6211703..24f02f1b5727a417c5a9ed1839c79250f331cd53 100644
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
+++ b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
@@ -84,9 +84,9 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestCase, Category("ComparisonV2")]
public void TestGraph()
{
- var imgV3 = @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
+ var imgV3 = @"TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
var imgv22 =
- @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod";
+ @"TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod";
GetGraphWriter().Write(imgV3, imgv22);
}
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[TestCase, Category("ComparisonV2")]
public void TestSingleGraph()
{
- var imgV3 = @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
+ var imgV3 = @"TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
GetGraphWriter().Write(imgV3);
}
@@ -263,7 +263,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
Assert.IsTrue(run.FinishedWithoutErrors);
GetGraphWriter().Write(modFileName,
- @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\" + modFileName);
+ @"../../TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/" + modFileName);
}
[Category("ComparisonV2"),
@@ -293,7 +293,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
Assert.IsTrue(run.FinishedWithoutErrors);
GetGraphWriter().Write(modFileName,
- @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck_Overspeed\" + modFileName);
+ @"../../TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/" + modFileName);
}
[Category("ComparisonV2"),
@@ -451,7 +451,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
- GetGraphWriter().Write(modFileName, @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\" + modFileName);
+ GetGraphWriter().Write(modFileName, @"../../TestData/Integration/DriverStrategy/Vecto2.2/Coach/" + modFileName);
}
[Category("ComparisonV2"),
@@ -481,7 +481,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
Assert.IsTrue(run.FinishedWithoutErrors);
GetGraphWriter().Write(modFileName,
- @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach_Overspeed\" + modFileName);
+ @"../../TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/" + modFileName);
}
// ####################################################
@@ -621,15 +621,15 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
- //GraphWriter.Write(modFileName, @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\" + modFileName);
+ //GraphWriter.Write(modFileName, @"../../TestData/Integration/DriverStrategy/Vecto2.2/Coach/" + modFileName);
}
//[TestCase()]
//public void HugoTest()
//{
- // //var source = @"E:\QUAM\Workspace\Projekt HUGO\Jobs generated\Tractor_4x4_vehicle-class-8_EURO6_2018_CO.xml";
- // var source = @"E:\QUAM\Workspace\Projekt HUGO\Jobs generated\Rigid Truck_4x2_vehicle-class-4_EURO1_LH.xml";
- // //@"E:\QUAM\Workspace\Projekt HUGO\Jobs generated\Rigid Truck_4x2_vehicle-class-4_EURO1_LH.xml";
+ // //var source = @"E:/QUAM/Workspace/Projekt HUGO/Jobs generated/Tractor_4x4_vehicle-class-8_EURO6_2018_CO.xml";
+ // var source = @"E:/QUAM/Workspace/Projekt HUGO/Jobs generated/Rigid Truck_4x2_vehicle-class-4_EURO1_LH.xml";
+ // //@"E:/QUAM/Workspace/Projekt HUGO/Jobs generated/Rigid Truck_4x2_vehicle-class-4_EURO1_LH.xml";
// var writer = new FileOutputWriter(source);
// var apiRun = VectoEngineeringApi.VectoInstance(source, writer);
// try {
diff --git a/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs b/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
index 68dc1b1ed857e6c7cdb912edf39417d268b2f177..57ad2098f0fc22771f1ad9611793ed837c77b6ed 100644
--- a/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
@@ -27,7 +27,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DualFuel
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- [TestCase(@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel.xml")]
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml")]
public void DualModeDualFuelVehicleTest(string jobName)
{
var fileWriter = new FileOutputWriter(jobName);
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DualFuel
Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
}
- [TestCase(@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeDualFuel.xml")]
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml")]
public void SingleModeDualFuelVehicleTest(string jobName)
{
var fileWriter = new FileOutputWriter(jobName);
diff --git a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
index 5bca22c3de3d8540b2baa0fc74079ed88f4ea58c..c37d92df0c08b68a6d5c7012e3e16f14ad6bdb12 100644
--- a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.Tests.Integration.EngineOnlyCycle
[Parallelizable(ParallelScope.All)]
public class EngineOnlyCycleTest
{
- private const string EngineFile = @"TestData\Components\24t Coach.veng";
+ private const string EngineFile = @"TestData/Components/24t Coach.veng";
[OneTimeSetUp]
public void Init()
@@ -62,19 +62,19 @@ namespace TUGraz.VectoCore.Tests.Integration.EngineOnlyCycle
[TestCase(
"24tCoach_EngineOnly",
- @"TestData\Components\24t Coach.veng",
- @"TestData\Cycles\Coach Engine Only.vdri",
- @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly.vmod")]
+ @"TestData/Components/24t Coach.veng",
+ @"TestData/Cycles/Coach Engine Only.vdri",
+ @"TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod")]
[TestCase(
"24tCoach_EngineOnlyPaux",
- @"TestData\Components\24t Coach.veng",
- @"TestData\Cycles\Coach Engine Only Paux.vdri",
- @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyPaux.vmod")]
+ @"TestData/Components/24t Coach.veng",
+ @"TestData/Cycles/Coach Engine Only Paux.vdri",
+ @"TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod")]
[TestCase(
"24tCoach_EngineOnlyFullLoad",
- @"TestData\Components\24t Coach.veng",
- @"TestData\Cycles\Coach Engine Only FullLoad.vdri",
- @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyFullLoad.vmod")]
+ @"TestData/Components/24t Coach.veng",
+ @"TestData/Cycles/Coach Engine Only FullLoad.vdri",
+ @"TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod")]
public void TestEngineOnlyDrivingCycle(string testName, string engineFile, string cycleFile, string modalResultFile)
{
var data = DrivingCycleDataReader.ReadFromFile(
diff --git a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
index 10788cd4320b04b46b90e6d27e744a08dad1e494..7afb45e4d7cb57efe3990b9f5e3965cee3ee31dc 100644
--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -62,40 +62,40 @@ namespace TUGraz.VectoCore.Tests.Integration
[Category("LongRunning")]
[Category("Integration")]
[TestCase(FuelType.DieselCI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 0,
0.00021674714805162135, 0.00021674714805162135, 25.926692350672408, 0.0006784185734015748, 9255.103221804231,
TestName = "TestFuelTypesCO2 Diesel LH Low"),
TestCase(FuelType.EthanolCI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 0,
0.00021674714805162135, 0.00021930715373727074, 26.74477484600863, 0.00039694594826446007, 5570.401704926677,
TestName = "TestFuelTypesCO2 Ethanol/CI LH Low"),
TestCase(FuelType.DieselCI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00024815363205920937, 29.683448810910214, 0.0007767208683453253, 10596.16008892824,
TestName = "TestFuelTypesCO2 Diesel LH Ref"),
TestCase(FuelType.EthanolCI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00025108458046935726, 30.620070788946006, 0.00045446309064953665, 6377.548343921674,
TestName = "TestFuelTypesCO2 Ethanol/CI LH Ref"),
TestCase(FuelType.EthanolPI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00024645975061170444, 31.356202367901332, 0.0005175654762845794, 7221.27069292294,
TestName = "TestFuelTypesCO2 Ethanol/PI LH Ref"),
TestCase(FuelType.PetrolPI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00024815363205920937, 33.17561925925259, 0.0007543870414599965, 10298.375730457188,
TestName = "TestFuelTypesCO2 Petrol/PI LH Ref"),
TestCase(FuelType.LPGPI, null,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00024815363205920937, null, 0.0007494239688188123, 11415.06707472363,
TestName = "TestFuelTypesCO2 LPG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Liquefied,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00022793745022139266, null, 0.0006313867371132576, 11191.72880587038,
TestName = "TestFuelTypesCO2 LNG/PI LH Ref"),
TestCase(FuelType.NGPI, TankSystem.Compressed,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1,
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto", 1,
0.00024815363205920937, 0.00023316101678896636, null, 0.0006272031351623195, 11191.728805870385,
TestName = "TestFuelTypesCO2 CNG/PI LH Ref"),
]
diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index e40c44ba0f9d908810d484831b89ff3dfd4d5f6c..090de960a83b7120b821f9001f361c36387fb4cb 100644
--- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -51,19 +51,19 @@ namespace TUGraz.VectoCore.Tests.Integration
public class FullCycleDeclarationTest
{
public const string LongHaulTruckDeclarationJob =
- @"TestData\Integration\DeclarationMode\40t Truck\40t_Long_Haul_Truck.vecto";
+ @"TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto";
public const string DeliveryTruckDeclarationJob =
- @"TestData\Integration\DeclarationMode\12t Truck\12t Delivery Truck.vecto";
+ @"TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vecto";
public const string DeliveryTruck8GearDeclarationJob =
- @"TestData\Integration\DeclarationMode\12t Truck\12t Delivery Truck_8gear.vecto";
+ @"TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck_8gear.vecto";
public const string Class9RigidTruckPTOJob =
- @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto";
public const string Class5TractorDeclPrimaryRetarder =
- @"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL_primRet.vecto";
+ @"TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_DECL_primRet.vecto";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs
index 9be86c7f4ae801d4e5ceb4b161ead890f9717c0b..50c7724151a9506dba5cac681bbb5c3da1fa1d5c 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs
@@ -17,23 +17,23 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
public class IEPC_S_Test
{
- protected const string IEPC_S_Gbx3Speed = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed\IEPC-S_ENG_Gbx3.vecto";
+ protected const string IEPC_S_Gbx3Speed = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto";
- protected const string IEPC_S_Gbx3Speed_drag = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed\IEPC-S_ENG_Gbx3_drag.vecto";
+ protected const string IEPC_S_Gbx3Speed_drag = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto";
- protected const string IEPC_S_Gbx3SpeedAxle = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed+Axle\IEPC-S_ENG_Gbx3Axl.vecto";
+ protected const string IEPC_S_Gbx3SpeedAxle = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto";
- protected const string IEPC_S_Gbx3SpeedWhl1 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed-Whl1\IEPC-S_ENG_Gbx3Whl1.vecto";
+ protected const string IEPC_S_Gbx3SpeedWhl1 = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto";
- protected const string IEPC_S_Gbx3SpeedWhl2 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed-Whl2\IEPC-S_ENG_Gbx3Whl2.vecto";
+ protected const string IEPC_S_Gbx3SpeedWhl2 = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto";
- protected const string IEPC_S_Gbx1Speed = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed\IEPC-S_ENG_Gbx1.vecto";
+ protected const string IEPC_S_Gbx1Speed = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto";
- protected const string IEPC_S_Gbx1SpeedAxl = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed+Axle\IEPC-S_ENG_Gbx1Axl.vecto";
+ protected const string IEPC_S_Gbx1SpeedAxl = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto";
- protected const string IEPC_S_Gbx1SpeedWhl1 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed-Whl1\IEPC-S_ENG_Gbx1Whl1.vecto";
+ protected const string IEPC_S_Gbx1SpeedWhl1 = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto";
- protected const string IEPC_S_Gbx1SpeedWhl2 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed-Whl2\IEPC-S_ENG_Gbx1Whl2.vecto";
+ protected const string IEPC_S_Gbx1SpeedWhl2 = @"TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs
index 12eca7ad53330cdb05e87f2796ec4137ce84cc8b..8b7f7c4b4a90926a88e5eb6476852b4a68b56d56 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs
@@ -22,9 +22,9 @@ public class IHPCTest
//InitGraphWriter();
}
- public const string IHPCTEst_12speed = @"TestData\Hybrids\GenericIHPC\12SpeedGbx\IHPC Group 5.vecto";
+ public const string IHPCTEst_12speed = @"TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto";
- public const string IHPCTEst_6speed = @"TestData\Hybrids\GenericIHPC\6SpeedGbx\IHPC Group 5.vecto";
+ public const string IHPCTEst_6speed = @"TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto";
[
TestCase(IHPCTEst_12speed, 0, TestName = "IHPC 12spd Group 5 DriveCycle LongHaul"),
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
index 2f6c82d6805506cfcd7a12c0d28ed21409a90d83..a8f3c5ba2dc4c1df0103b29cd03a84b0375fc025 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
@@ -35,21 +35,21 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
public class ParallelHybridTest
{
//private ModalResultField[] Yfields;
- public const string MotorFile = @"TestData\Hybrids\ElectricMotor\GenericEMotor.vem";
- public const string BatFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
+ public const string MotorFile = @"TestData/Hybrids/ElectricMotor/GenericEMotor.vem";
+ public const string BatFile = @"TestData/Hybrids/Battery/GenericBattery.vbat";
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string MotorFile240kW = @"TestData\Hybrids\ElectricMotor\GenericEMotor240kW.vem";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string MotorFile240kW = @"TestData/Hybrids/ElectricMotor/GenericEMotor240kW.vem";
- public const string P1HybridMotor = @"Testdata\Hybrids\GenericVehicle_P1-APT\GenericEMotor20kW.vem";
- public const string P1BatteryFile = @"Testdata\Hybrids\GenericVehicle_P1-APT\GenericBattery.vbat";
+ public const string P1HybridMotor = @"TestData/Hybrids/GenericVehicle_P1-APT/GenericEMotor20kW.vem";
+ public const string P1BatteryFile = @"TestData/Hybrids/GenericVehicle_P1-APT/GenericBattery.vbat";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
- public const string TorqueConverterSerial = @"TestData\Hybrids\GenericVehicle_P1-APT\TorqueConverter.vtcc";
- public const string TorqueConverterPowerSplit = @"TestData\Hybrids\GenericVehicle_P1-APT\TorqueConverterPowerSplit.vtcc";
+ public const string TorqueConverterSerial = @"TestData/Hybrids/GenericVehicle_P1-APT/TorqueConverter.vtcc";
+ public const string TorqueConverterPowerSplit = @"TestData/Hybrids/GenericVehicle_P1-APT/TorqueConverterPowerSplit.vtcc";
public const bool PlotGraphs = true;
@@ -230,12 +230,12 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
graphWriter.Write(modFilename);
}
- const string TestJobP1_APTS = @"TestData\Hybrids\GenericVehicle_P1-APT\CityBus_AT_Ser.vecto";
- const string TestJobP1_APTP = @"TestData\Hybrids\GenericVehicle_P1-APT\CityBus_AT_PS.vecto";
+ const string TestJobP1_APTS = @"TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto";
+ const string TestJobP1_APTP = @"TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto";
- //private const string TestJobP1 = @"E:\QUAM\tmp\Citybus_P1-APT-S-175kW-6.8l_C1\CityBus_AT_Ser.vecto";
+ //private const string TestJobP1 = @"E:/QUAM/tmp/Citybus_P1-APT-S-175kW-6.8l_C1/CityBus_AT_Ser.vecto";
- private const string TestJobCityBusP1_APTP = @"TestData\Hybrids\Citybus_P1-APT-P-220kW-7.7l\CityBus_AT-P.vecto";
+ private const string TestJobCityBusP1_APTP = @"TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vecto";
[
TestCase(TestJobP1_APTS, 0, TestName = "P1 Hybrid APT-S, DriveCycle LongHaul"),
@@ -620,24 +620,24 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
- public const string Group2TestJob180kW = @"TestData\Hybrids\Hyb_P2_Group2\Class2_RigidTruck_ParHyb_ENG.vecto";
+ public const string Group2TestJob180kW = @"TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_ENG.vecto";
- public const string Group5TestJob = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5.vecto";
+ public const string Group5TestJob = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto";
- public const string Group5TestJob_GbxTqLimit = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_GbxTqLimit.vecto";
+ public const string Group5TestJob_GbxTqLimit = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_GbxTqLimit.vecto";
- public const string Group5TestJob_BoostingLimit = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_BoostingLimit.vecto";
+ public const string Group5TestJob_BoostingLimit = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimit.vecto";
- public const string Group5TestJob_BoostingAndGbxLimit = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_BoostingAndGbxLimit.vecto";
+ public const string Group5TestJob_BoostingAndGbxLimit = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto";
- public const string Group5TestJob_BoostingAndGbxLimitTopTorque = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_BoostingAndGbxLimitTopTorque.vecto";
+ public const string Group5TestJob_BoostingAndGbxLimitTopTorque = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto";
- public const string Group5TestJob_BoostingLimitTopTorque = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_BoostingLimitTopTorque.vecto";
+ public const string Group5TestJob_BoostingLimitTopTorque = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto";
- public const string Group5TestJob_BatterySystem = @"TestData\Hybrids\GenericVehicle_Group5_P2_BatSystem\P2 Group 5.vecto";
+ public const string Group5TestJob_BatterySystem = @"TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/P2 Group 5.vecto";
- public const string Group5TestJob_BatterySystem2 = @"TestData\Hybrids\GenericVehicle_Group5_P2_BatSystem\P2 Group 5_2.vecto";
+ public const string Group5TestJob_BatterySystem2 = @"TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/P2 Group 5_2.vecto";
[
TestCase(Group5TestJob, 0, TestName = "P2 Hybrid Group 5 DriveCycle LongHaul"),
@@ -745,9 +745,9 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob325kW = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_325kW.vecto";
+ public const string Group5TestJob325kW = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto";
- public const string Group5TestJob325kW_WhrEl = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_325kW_WHR.vecto";
+ public const string Group5TestJob325kW_WhrEl = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_WHR.vecto";
[
TestCase(Group5TestJob325kW, 0, TestName = "P2 Hybrid Group 5 325kW DriveCycle LongHaul"),
@@ -766,7 +766,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
public void P2HybridGroup5DriveCycle_325kW(string jobFile, int cycleIdx)
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group2TestJob = @"TestData\Hybrids\Hyb_P2_Group2\Class2_RigidTruck_ParHyb_ENG.vecto";
+ public const string Group2TestJob = @"TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_ENG.vecto";
[
TestCase(Group2TestJob, 0, TestName = "P2 Hybrid Group 2 DriveCycle LongHaul"),
@@ -785,7 +785,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
- public const string Group5_80kWh_TestJob = @"TestData\Hybrids\Hyb_P2_Group5\Hyb_P2_Group5_80kWh.vecto";
+ public const string Group5_80kWh_TestJob = @"TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vecto";
[
TestCase(Group5_80kWh_TestJob, 0, TestName = "P2 Hybrid Group 5 80kWh DriveCycle LongHaul"),
@@ -802,7 +802,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob2 = @"TestData\Hybrids\Hyb_P2_Group5\Hyb_P2_Group5.vecto";
+ public const string Group5TestJob2 = @"TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vecto";
[
TestCase(Group5TestJob2, 0, TestName = "P2 Hybrid Group 5 B DriveCycle LongHaul"),
@@ -820,7 +820,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob_noESS = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5.vecto";
+ public const string Group5TestJob_noESS = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto";
[
//// P2 without ESS is not really relevant
@@ -839,7 +839,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob325kW_noESS = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_325kW.vecto";
+ public const string Group5TestJob325kW_noESS = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto";
[
//// P2 without ESS is not really relevant
@@ -858,7 +858,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- //public const string CityBus6x2 = @"TestData\Hybrids\Input CityBus 6x2_HEV_P2\CityBus_6x2_HEV_P2.vecto";
+ //public const string CityBus6x2 = @"TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto";
//[
//TestCase(CityBus6x2, 0, TestName = "P2 Hybrid CityBus DriveCycle Coach"), // error
@@ -874,7 +874,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
//{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group2TestJobSuperCapOvl = @"TestData\Hybrids\Hyb_P2_Group2SuperCapOvl\Class2_RigidTruck_ParHyb_SuperCap_Ovl_ENG.vecto";
+ public const string Group2TestJobSuperCapOvl = @"TestData/Hybrids/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_ENG.vecto";
[
TestCase(Group2TestJobSuperCapOvl, 0, TestName = "P2 Hybrid Group 2 SuperCap Ovl, DriveCycle LongHaul"),
@@ -892,7 +892,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5_EMTorqueLimit_TestJob = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_LimitEMTorqueDrive.vecto";
+ public const string Group5_EMTorqueLimit_TestJob = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto";
[
TestCase(Group5_EMTorqueLimit_TestJob, 0, TestName = "P2 Hybrid Group 5 EM TorqueLimit DriveCycle LongHaul"),
@@ -910,7 +910,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5_LimitPropTq_TestJob = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_LimitVehiclePropTq.vecto";
+ public const string Group5_LimitPropTq_TestJob = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto";
[
TestCase(Group5_LimitPropTq_TestJob, 0, TestName = "P2 Hybrid Group 5 Vehicle Prop TorqueLimit DriveCycle LongHaul"),
@@ -927,7 +927,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
public void P2HybridGroup5DriveCycle_LimitPropTq(string jobFile, int cycleIdx)
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob_EMLossMap_1 = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_EMLossMap_1.vecto"; // non-linear EM Loss-Map
+ public const string Group5TestJob_EMLossMap_1 = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto"; // non-linear EM Loss-Map
[
TestCase(Group5TestJob_EMLossMap_1, 0, TestName = "P2 Hybrid Group 5 EM-LossMap 1 DriveCycle LongHaul"),
@@ -945,7 +945,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx); }
- public const string Group5TestJob_EMLossMap_2 = @"TestData\Hybrids\GenericVehicle_Group5_P2\P2 Group 5_EMLossMap_2.vecto"; // linear EM Loss-Map
+ public const string Group5TestJob_EMLossMap_2 = @"TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto"; // linear EM Loss-Map
[TestCase(Group5TestJob_EMLossMap_2, 0, TestName = "P2 Hybrid Group 5 EM-LossMap 2 DriveCycle LongHaul"),
TestCase(Group5TestJob_EMLossMap_2, 1, TestName = "P2 Hybrid Group 5 EM-LossMap 2 DriveCycle Coach"),
@@ -962,8 +962,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
{ RunHybridJob(jobFile, cycleIdx);}
- public const string Group2_5TestJob = @"TestData\Hybrids\GenericVehicle_Group5_P2.5\P2.5 Group 5.vecto";
- public const string Group2_5TestJob_2 = @"TestData\Hybrids\GenericVehicle_Group5_P2.5\P2.5 Group 5 2.vecto";
+ public const string Group2_5TestJob = @"TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5.vecto";
+ public const string Group2_5TestJob_2 = @"TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5 2.vecto";
[
TestCase(Group2_5TestJob, 0, TestName = "P2.5 Hybrid Group 2 DriveCycle LongHaul"),
@@ -1257,7 +1257,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
graphWriter.Write(modFilename);
}
- public const string Group5_P3_AMT = @"TestData\Hybrids\GenericVehicle_Group5_P3\P3 Group 5.vecto";
+ public const string Group5_P3_AMT = @"TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto";
[
TestCase(Group5_P3_AMT, 0, TestName = "P3 Hybrid DriveCycle LongHaul"),
@@ -1277,7 +1277,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
RunHybridJob(jobFile, cycleIdx);
}
- public const string Group5_P3_AMT_VehiclePropLimit = @"TestData\Hybrids\GenericVehicle_Group5_P3\P3 Group 5_LimitVehiclePropTq.vecto";
+ public const string Group5_P3_AMT_VehiclePropLimit = @"TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto";
[
TestCase(Group5_P3_AMT_VehiclePropLimit, 0, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle LongHaul"),
@@ -1297,8 +1297,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
RunHybridJob(jobFile, cycleIdx);
}
- public const string Group5_P3_APT = @"TestData\Hybrids\GenericVehicle_Group5_P3_APT\P3 APT Group 5.vecto";
- public const string Group5_P4_APT = @"TestData\Hybrids\GenericVehicle_Group5_P4_APT\P4 APT Group 5.vecto";
+ public const string Group5_P3_APT = @"TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5.vecto";
+ public const string Group5_P4_APT = @"TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5.vecto";
[
@@ -1495,7 +1495,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
graphWriter.Write(modFilename);
}
- public const string Group5_P4_AMT = @"TestData\Hybrids\GenericVehicle_Group5_P3\P3 Group 5.vecto";
+ public const string Group5_P4_AMT = @"TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto";
[
TestCase(Group5_P4_AMT, 0, TestName = "P4 Hybrid DriveCycle LongHaul"),
@@ -1515,7 +1515,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
RunHybridJob(jobFile, cycleIdx);
}
- public const string Group5_P4_AMT_VehiclePropLimit = @"TestData\Hybrids\GenericVehicle_Group5_P4\P4 Group 5_LimitVehiclePropTq.vecto";
+ public const string Group5_P4_AMT_VehiclePropLimit = @"TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto";
[
TestCase(Group5_P4_AMT_VehiclePropLimit, 0, TestName = "P4 Hybrid Limit Vehicle Prop.Tq DriveCycle LongHaul"),
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index 8a6f72a615e5c2fbcbc15c96d537d798105d47dd..ff8c37a02886c8ae8f829b6564778ce4bd5b67a5 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -37,25 +37,25 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
Parallelizable(ParallelScope.All)]
public class SerialHybridTest
{
- public const string BatFile = @"TestData\Hybrids\GenericVehicle_Sx\GenericBattery.vreess";
+ public const string BatFile = @"TestData/Hybrids/GenericVehicle_Sx/GenericBattery.vreess";
- public const string AccelerationFile = @"TestData\Hybrids\GenericVehicle_Sx\Truck.vacc";
- public const string MotorFile = @"TestData\Hybrids\GenericVehicle_Sx\GenericEMotor.vem";
+ public const string AccelerationFile = @"TestData/Hybrids/GenericVehicle_Sx/Truck.vacc";
+ public const string MotorFile = @"TestData/Hybrids/GenericVehicle_Sx/GenericEMotor.vem";
- public const string GeneratorFile = @"TestData\Hybrids\GenericVehicle_Sx\GenericGen.vem";
+ public const string GeneratorFile = @"TestData/Hybrids/GenericVehicle_Sx/GenericGen.vem";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
- public const string EngineFile = @"TestData\Hybrids\GenericVehicle_Sx\Group2_6l.veng";
+ public const string EngineFile = @"TestData/Hybrids/GenericVehicle_Sx/Group2_6l.veng";
- public const string SerialHybrid_S2_3Speed_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto";
- public const string SerialHybrid_S2_12Speed_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto";
- public const string SerialHybrid_S2_APTN_Job = @"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto";
- public const string SerialHybrid_S2_APTS_Job = @"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto";
- public const string SerialHybrid_S2_APTP_Job = @"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto";
+ public const string SerialHybrid_S2_3Speed_Job = @"TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_3Speed.vecto";
+ public const string SerialHybrid_S2_12Speed_Job = @"TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vecto";
+ public const string SerialHybrid_S2_APTN_Job = @"TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5LH_rl_APTN.vecto";
+ public const string SerialHybrid_S2_APTS_Job = @"TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5LH_rl_APTS.vecto";
+ public const string SerialHybrid_S2_APTP_Job = @"TestData/Hybrids/GenericVehicle_S2_AT/HEV_S2_Group5LH_rl_APTP.vecto";
- public const string SerialHybrid_S2_3Speed_PTO_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed_PTO.vecto";
+ public const string SerialHybrid_S2_3Speed_PTO_Job = @"TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_3Speed_PTO.vecto";
public const bool PlotGraphs = true;
@@ -127,7 +127,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
TestCase(SerialHybrid_S2_3Speed_PTO_Job, 7, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_WHR.vecto", 1, TestName = "Generic Serial Hybrid S2 AMT WHR 12speed Job, RegionalDelivery"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_WHR.vecto", 1, TestName = "Generic Serial Hybrid S2 AMT WHR 12speed Job, RegionalDelivery"),
]
public void S2SerialHybridJob(string jobFile, int runIdx)
{
@@ -483,14 +483,14 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
// =================================================
[
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 0, TestName = "Generic Serial Hybrid S4 Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 1, TestName = "Generic Serial Hybrid S4 Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 2, TestName = "Generic Serial Hybrid S4 Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 3, TestName = "Generic Serial Hybrid S4 Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 4, TestName = "Generic Serial Hybrid S4 Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 5, TestName = "Generic Serial Hybrid S4 Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 6, TestName = "Generic Serial Hybrid S4 Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_Sx_Job\SerialHybrid_S4.vecto", 7, TestName = "Generic Serial Hybrid S4 Job, Coach"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 0, TestName = "Generic Serial Hybrid S4 Job, LongHaul"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 1, TestName = "Generic Serial Hybrid S4 Job, RegionalDelivery"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 2, TestName = "Generic Serial Hybrid S4 Job, UrbanDelivery"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 3, TestName = "Generic Serial Hybrid S4 Job, Construction"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 4, TestName = "Generic Serial Hybrid S4 Job, Urban"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 5, TestName = "Generic Serial Hybrid S4 Job, Suburban"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 6, TestName = "Generic Serial Hybrid S4 Job, Interurban"),
+ TestCase(@"TestData/Hybrids/GenericVehicle_Sx_Job/SerialHybrid_S4.vecto", 7, TestName = "Generic Serial Hybrid S4 Job, Coach"),
]
public void S4SerialHybridJob(string jobFile, int runIdx)
{
@@ -576,7 +576,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
[TestCase]
public void RunJob_S3_AxlegearInputRetarder()
{
- var modData = RunHybridJob(@"TestData\Components\Retarder\S3\S3WithAxlegearInputRetarder.vecto", 0);
+ var modData = RunHybridJob(@"TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vecto", 0);
Assert.IsTrue(modData.Rows.Count > 0);
Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
@@ -587,7 +587,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
[TestCase]
public void RunJob_S3_NoAxlegearInputRetarder()
{
- var modData = RunHybridJob(@"TestData\Components\Retarder\S3\S3WithoutAxlegearInputRetarder.vecto", 0);
+ var modData = RunHybridJob(@"TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vecto", 0);
Assert.IsTrue(modData.Rows.Count > 0);
Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
index 62a554a0c80717e9e8ac822162bf48bf5d754260..905cb7bda3c155b46ebb9da86faea4c48a7db070 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[TestFixture]
public class MultistageMultipleRunsTest
{
- private const string TestDataDir = "TestData\\Integration\\Multistage\\";
+ private const string TestDataDir = "TestData//Integration//Multistage//";
private const string CompletedDiesel = TestDataDir + "newVifCompletedConventional.vecto";
private const string CompletedExempted = TestDataDir + "newVifExempted.vecto";
@@ -71,6 +71,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestContext.WriteLine($"Execution time: {_stopWatch.Elapsed}");
}
+ [NonParallelizable]
[Test]//, Timeout(3000)]
public void ExemptedPrimaryAndCompletedTest()
{
@@ -86,6 +87,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
}
+ [NonParallelizable]
[Test]
public void ExemptedPrimaryAndCompletedWithoutTPMLMTest()
{
@@ -101,6 +103,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
}
+ [NonParallelizable]
[Test]//, Timeout(3000)]
public void ExemptedPrimaryAndInterimTest()
{
@@ -110,6 +113,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
ShowWrittenFiles(writtenFiles);
Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
+ TestContext.WriteLine("ExemptedPrimaryAndInterimTest: " + _fileoutputWriter.XMLFullReportName);
Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
@@ -128,7 +132,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
}
//SpecialCase II
- [Test, Timeout(1000 * 20 * 60)]
+ [NonParallelizable]
+ [Test]
public void PrimaryAndCompletedTest()
{
StartSimulation(CompletedDiesel);
@@ -144,6 +149,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
}
+ [NonParallelizable]
[Test]
public void PrimaryAndCompletedWithoutADASAndTPMLM()
{
@@ -160,7 +166,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
}
//SpecialCase I
- [Test, Timeout(1000 * 10 * 60)]
+ [NonParallelizable]
+ [Test]
public void PrimaryAndInterimTest()
{
StartSimulation(InterimDiesel);
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index 205d21d0d2055490f61d03b937268fe307c37588..17f25df8217f3f35179fec56962f4b5e2b15cc85 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -32,9 +32,9 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[Parallelizable(ParallelScope.All)]
public class MultistageVehicleTest
{
- const string VIFDirPath = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\";
- const string InputDirPath = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\";
- private const string PrimaryInputDirPath = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\";
+ const string VIFDirPath = @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/";
+ const string InputDirPath = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/";
+ private const string PrimaryInputDirPath = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/";
const string InputFilePath = InputDirPath + "vecto_vehicle-stage_input_full-sample.xml";
diff --git a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
index 258f8d9668b62488919f21c44d6d16a8f63c545a..1b54ae8bfc8d501baa55d9b61a88a423217ac8ff 100644
--- a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
@@ -28,10 +28,10 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
public class RoadSweeperTests
{
public const string RoadSweeperJob =
- @"TestData\RoadSweepers\Class9_RigidTruck_6x2_PTO\Class9_RigidTruck_ENG_PTO.vecto";
+ @"TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto";
public const string SideLoaderJob =
- @"TestData\RoadSweepers\Class9_RigidTruck_6x2_PTO\Class9_RigidTruck_ENG_PTO-SideLoader.vecto";
+ @"TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO-SideLoader.vecto";
[OneTimeSetUp]
public void OneTimeSetup()
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
[TestCase()]
public void TestReadingPTOCycleDuringDrive()
{
- var cycle = @"TestData\RoadSweepers\Class9_RigidTruck_6x2_PTO\PTO-cycle.vptor";
+ var cycle = @"TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/PTO-cycle.vptor";
var cyleTbl = VectoCSVFile.Read(cycle);
var cycleData = DrivingCycleDataReader.ReadFromDataTable(cyleTbl, "PTO During Drive", false);
diff --git a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
index 3d024f5dd3c4fb2e898a85c09c28e73ea450400b..1dd72080a4ef079cad5a2b46f735e7949bd5de1f 100644
--- a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
@@ -115,8 +115,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ShiftStrategy
//[TestCase()]
//public void TestGearshiftTrigger()
//{
- // var amtTestcase = @"E:\QUAM\tmp\AT_Vdrop\AMT_normal\MB_Citaro_G_MP156_ZF_Sort.vecto";
- // var atTestcase = @"E:\QUAM\tmp\AT_Vdrop\AT_normal\MB_Citaro_G_MP156_ZF_Sort.vecto";
+ // var amtTestcase = @"E:/QUAM/tmp/AT_Vdrop/AMT_normal/MB_Citaro_G_MP156_ZF_Sort.vecto";
+ // var atTestcase = @"E:/QUAM/tmp/AT_Vdrop/AT_normal/MB_Citaro_G_MP156_ZF_Sort.vecto";
// var relativeJobPath = amtTestcase;
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 2e96e7ad0d6165d5fae4bca65a3669d1d4761ca5..1034f759f00e7765f1f18260aa3366798a40e58a 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -61,14 +61,14 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
[Parallelizable(ParallelScope.All)]
public class FullPowerTrain
{
- public const string CycleFile = @"TestData\Integration\FullPowerTrain\1-Gear-Test-dist.vdri";
- public const string CoachCycleFile = @"TestData\Integration\FullPowerTrain\Coach.vdri";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
- public const string AccelerationFile = @"TestData\Components\Coach.vacc";
- public const string GearboxLossMap = @"TestData\Components\Indirect Gear.vtlm";
- public const string AxleLossMap = @"TestData\Components\Axle.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+ public const string CycleFile = @"TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri";
+ public const string CoachCycleFile = @"TestData/Integration/FullPowerTrain/Coach.vdri";
+ public const string EngineFile = @"TestData/Components/24t Coach.veng";
+ public const string AccelerationFile = @"TestData/Components/Coach.vacc";
+ public const string GearboxLossMap = @"TestData/Components/Indirect Gear.vtlm";
+ public const string AxleLossMap = @"TestData/Components/Axle.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
private static readonly LoggingObject Log = LogManager.GetLogger(typeof(FullPowerTrain).ToString());
[OneTimeSetUp]
@@ -336,7 +336,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
[TestCase]
public void Test_FullPowerTrain_JobFile()
{
- const string jobFile = @"TestData\job.vecto";
+ const string jobFile = @"TestData/job.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumData = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumData);
@@ -348,10 +348,10 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
jobContainer.Execute();
jobContainer.WaitFinished();
- ResultFileHelper.TestSumFile(@"TestData\Results\Integration\job.vsum", @"TestData\job.vsum");
+ ResultFileHelper.TestSumFile(@"TestData/Results/Integration/job.vsum", @"TestData/job.vsum");
- ResultFileHelper.TestModFile(@"TestData\Results\Integration\job_1-Gear-Test-dist.vmod",
- @"TestData\job_1-Gear-Test-dist.vmod", testRowCount: false);
+ ResultFileHelper.TestModFile(@"TestData/Results/Integration/job_1-Gear-Test-dist.vmod",
+ @"TestData/job_1-Gear-Test-dist.vmod", testRowCount: false);
}
private static GearboxData CreateGearboxData()
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index cba3cbc4320426276fec74b6c97d6995d31d9fc1..09f608b422cf2e267d058b50740be0eac4154601 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -59,13 +59,13 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
[Parallelizable(ParallelScope.All)]
public class MinimalPowertrain
{
- public const string CycleFile = @"TestData\Integration\MinimalPowerTrain\1-Gear-Test-dist.vdri";
- public const string CycleFileStop = @"TestData\Integration\MinimalPowerTrain\1-Gear-StopTest-dist.vdri";
- public const string EngineFile = @"TestData\Integration\MinimalPowerTrain\24t Coach.veng";
- public const string GearboxFile = @"TestData\Integration\MinimalPowerTrain\24t Coach-1Gear.vgbx";
- public const string GbxLossMap = @"TestData\Integration\MinimalPowerTrain\NoLossGbxMap.vtlm";
- public const string AccelerationFile = @"TestData\Components\Coach.vacc";
- public const string AccelerationFile2 = @"TestData\Components\Truck.vacc";
+ public const string CycleFile = @"TestData/Integration/MinimalPowerTrain/1-Gear-Test-dist.vdri";
+ public const string CycleFileStop = @"TestData/Integration/MinimalPowerTrain/1-Gear-StopTest-dist.vdri";
+ public const string EngineFile = @"TestData/Integration/MinimalPowerTrain/24t Coach.veng";
+ public const string GearboxFile = @"TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vgbx";
+ public const string GbxLossMap = @"TestData/Integration/MinimalPowerTrain/NoLossGbxMap.vtlm";
+ public const string AccelerationFile = @"TestData/Components/Coach.vacc";
+ public const string AccelerationFile2 = @"TestData/Components/Truck.vacc";
public const double Tolerance = 0.001;
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
index bc38385e9c6de6d1d69e9a11385d6bc8d2054e6b..fd751f341bb6713698c3ed0bbf3a415b151fb593 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -52,29 +52,29 @@ namespace TUGraz.VectoCore.Tests.Integration
public class TorqueLimitsTest
{
const string GearboxLimitJobDecl_865 =
- @"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_GbxTorqueLimits\Class2_RigidTruck_gbxTqLimit-865_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck_gbxTqLimit-865_DECL.vecto";
const string GearboxLimitJobDecl_800 =
- @"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_GbxTorqueLimits\Class2_RigidTruck_gbxTqLimit-800_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxTorqueLimits/Class2_RigidTruck_gbxTqLimit-800_DECL.vecto";
const string VehicleLimitJobDecl_910 =
- @"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-910_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-910_DECL.vecto";
const string VehicleLimitJobDecl_850 =
- @"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\Class2_RigidTruck_vehTqLimit-850_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_VehTorqueLimits/Class2_RigidTruck_vehTqLimit-850_DECL.vecto";
const string GearboxSpeedLimitJobDecl =
- @"Testdata\Integration\DeclarationMode\Class2_RigidTruck_4x2_GbxSpeedLimits\Class2_RigidTruck_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_GbxSpeedLimits/Class2_RigidTruck_DECL.vecto";
const string EngineSpeedLimitJobDecl =
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_engineSpeedlimit\Class2_RigidTruck_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_engineSpeedlimit/Class2_RigidTruck_DECL.vecto";
const string EngineSpeedLimitJobATDecl =
- @"TestData\Integration\EngineeringMode\TruckAT_GbxSpeedLimit\TruckAT.vecto";
+ @"TestData/Integration/EngineeringMode/TruckAT_GbxSpeedLimit/TruckAT.vecto";
private const string DeclarationVehicle9GearsFord =
- @"TestData\Integration\DeclarationMode\EngineSpeedTooHigh\vecto_vehicle-sample_9gears.xml";
+ @"TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index e29ad6d0ad4f28fc3316d5705a8b2b5df5037e30..be95572a0f26defd19e3bcb1a398ef6964c61118 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -56,14 +56,14 @@ namespace TUGraz.VectoCore.Tests.Integration
// ReSharper disable once InconsistentNaming
public class Truck40tPowerTrain
{
- public const string ShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\40t_Long_Haul_Truck.veng";
- public const string AxleGearLossMap = @"TestData\Components\Axle 40t Truck.vtlm";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+ public const string ShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string EngineFile = @"TestData/Components/40t_Long_Haul_Truck.veng";
+ public const string AxleGearLossMap = @"TestData/Components/Axle 40t Truck.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
public static VectoRun CreateEngineeringRun(DrivingCycleData cycleData, string modFileName,
bool overspeed = false, GearboxType gbxType = GearboxType.AMT)
diff --git a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
index 030e54a2c5fa526d00b707bab746d85f2299a8bf..d466c0b0b1cd4b4e7d3f5d26ea104235da6dffb8 100644
--- a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
@@ -56,9 +56,9 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto"),
- TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_noGear.vecto"),
- //TestCase(@"TestData\Integration\VTPMode\HeavyBus\VTP_PrimaryBus_ENG.vecto", TestName = "RunVTPHeavyPrimaryBus Engineering")
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle.vecto"),
+ TestCase(@"TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle_noGear.vecto"),
+ //TestCase(@"TestData/Integration/VTPMode/HeavyBus/VTP_PrimaryBus_ENG.vecto", TestName = "RunVTPHeavyPrimaryBus Engineering")
]
public void RunVTP(string jobFile)
{
@@ -87,10 +87,10 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
[Category("LongRunning")]
[Category("Integration")]
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_DECL.vecto", 45.6, 0.8972, TestName = "RunVTPHeavyLorry_Declaration"),
- TestCase(@"TestData\Integration\VTPMode\MediumLorry\VTP_MediumLorry.vecto", 400.0, 1.06, TestName = "RunVTPMediumLorry_Declaration"),
- TestCase(@"TestData\Integration\VTPMode\DualFuelVehicle\VTP_DualFuel.vecto", 43.5, 1.0107, TestName = "RunVTPDualFuel_Declaration"),
- TestCase(@"TestData\Integration\VTPMode\HeavyBus\VTP_PrimaryBus.vecto", 14.2, 1.1413, TestName = "RunVTPHeavyPrimaryBus")
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle_DECL.vecto", 45.6, 0.8972, TestName = "RunVTPHeavyLorry_Declaration"),
+ TestCase(@"TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto", 400.0, 1.06, TestName = "RunVTPMediumLorry_Declaration"),
+ TestCase(@"TestData/Integration/VTPMode/DualFuelVehicle/VTP_DualFuel.vecto", 43.5, 1.0107, TestName = "RunVTPDualFuel_Declaration"),
+ TestCase(@"TestData/Integration/VTPMode/HeavyBus/VTP_PrimaryBus.vecto", 14.2, 1.1413, TestName = "RunVTPHeavyPrimaryBus")
]
public void RunVTP_Declaration(string jobFile, double expectedDeclaredCO2, double expectedCVTP)
{
@@ -129,7 +129,7 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
[Category("LongRunning")]
[Category("Integration")]
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle_CNG\class_5_generic vehicle_DECL.vecto")]
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle_CNG/class_5_generic vehicle_DECL.vecto")]
public void RunVTP_Declaration_NCVCorrection_CNG(string jobFile)
{
var fileWriter = new FileOutputWriter(jobFile);
@@ -164,8 +164,8 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
[Category("LongRunning")]
[Category("Integration")]
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\VTP_AT-gbx.vecto")]
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\VTP_AT-gbx_2TC.vecto")]
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/VTP_AT-gbx.vecto")]
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/VTP_AT-gbx_2TC.vecto")]
public void RunVTPWithAT(string jobFile)
{
var fileWriter = new FileOutputWriter(jobFile);
diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
index 0cc437a0238b53d8f57c1dfc69a7f17f66d64cf7..d0cecace2a0ce88b689021c86e5f61a1e125befd 100644
--- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Tests.Integration
[TestCase]
public void TestXMLReportMetaInformation()
{
- var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
+ var jobfile = @"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
@@ -124,16 +124,16 @@ 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\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\Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml")]
+ [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/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/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml")]
public void TestXMLSummaryReportExists(string jobfile)
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
@@ -163,8 +163,8 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.AreNotEqual(null,customerReport.XPathSelectElement("//*[local-name()='Summary']"));
}
- [TestCase(@"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"),
- TestCase(@"TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml")]
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml"),
+ TestCase(@"TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml")]
public void TestValidationXMLReports(string jobfile)
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
@@ -229,7 +229,7 @@ namespace TUGraz.VectoCore.Tests.Integration
}
}
- var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
+ var jobfile = @"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml";
var doc = new XmlDocument();
doc.Load(XmlReader.Create(jobfile));
@@ -293,7 +293,7 @@ namespace TUGraz.VectoCore.Tests.Integration
[TestCase]
public void TestXMLReportCorrectHashes()
{
- var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
+ var jobfile = @"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
@@ -342,7 +342,7 @@ namespace TUGraz.VectoCore.Tests.Integration
[TestCase]
public void TestXMLPrimaryVehicleReportTest()
{
- var jobfile = @"Testdata\XML\XMLReaderDeclaration\SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml";
+ var jobfile = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/AirdragDefaultValuesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/AirdragDefaultValuesTest.cs
index 6defc9c2dce4b432f3debf9bc7c5bfd1fd82534a..62673b77413e2eac358be08f5c3a6cc57f158669 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/AirdragDefaultValuesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/AirdragDefaultValuesTest.cs
@@ -48,9 +48,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void TestClass2()
{
- var file = @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto";
+ var file = @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto";
var fileNoAirdrag =
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_NoAirdrag_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_NoAirdrag_DECL.vecto";
var runData = DeclarationAdapterTestHelper.CreateVectoRunData(fileNoAirdrag);
var runDataOrig = DeclarationAdapterTestHelper.CreateVectoRunData(file);
@@ -63,8 +63,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void TestClass5()
{
- var file = @"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto";
- var fileNoAirdrag = @"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_NoAirdrag_DECL.vecto";
+ var file = @"TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto";
+ var fileNoAirdrag = @"TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_NoAirdrag_DECL.vecto";
var runData = DeclarationAdapterTestHelper.CreateVectoRunData(fileNoAirdrag);
var runDataOrig = DeclarationAdapterTestHelper.CreateVectoRunData(file);
@@ -76,9 +76,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void TestClass9()
{
- var file = @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+ var file = @"TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto";
var fileNoAirdrag =
- @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_NoAirdrag_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_NoAirdrag_DECL.vecto";
var runData = DeclarationAdapterTestHelper.CreateVectoRunData(fileNoAirdrag);
var runDataOrig = DeclarationAdapterTestHelper.CreateVectoRunData(file);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
index 9a5abb26b2a02794b8a0080ed230124c164bd22d..31ae633a61da976b3f522a4dc33ea85ab7ed18d1 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
@@ -30,21 +30,21 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart.xml", 0, TestName = "Run Primary Bus NonSmart HeavyUrban Low"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml", -1, TestName = "Run Primary Bus SmartPS ALL"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml", 0, TestName = "Run Primary Bus NonSmart HeavyUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml", -1, TestName = "Run Primary Bus SmartPS ALL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml", 0, TestName = "Run Primary Bus SmartPS HeavyUrban Low"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml", 1, TestName = "Run Primary Bus SmartPS HeavyUrban Ref"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml", 13, TestName = "Run Primary Bus SmartPS InterUrban Ref"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml", 0, TestName = "Run Primary Bus SmartPS HeavyUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml", 1, TestName = "Run Primary Bus SmartPS HeavyUrban Ref"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml", 13, TestName = "Run Primary Bus SmartPS InterUrban Ref"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart.xml", -1, TestName = "Run Primary Bus NonSmart ALL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartES.xml", -1, TestName = "Run Primary Bus SmartES ALL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml", -1, TestName = "Run Primary Bus NonSmart ESS ALL"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml", -1, TestName = "Run Primary Bus NonSmart ALL"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml", -1, TestName = "Run Primary Bus SmartES ALL"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml", -1, TestName = "Run Primary Bus NonSmart ESS ALL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart.xml", 4, TestName = "Run Primary Bus NonSmart SubUrban Low"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml", 4, TestName = "Run Primary Bus SmartPS SubUrban Low"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartES.xml", 4, TestName = "Run Primary Bus SmartES SubUrban Low"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml", 4, TestName = "Run Primary Bus NonSmart ESS SubUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml", 4, TestName = "Run Primary Bus NonSmart SubUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml", 4, TestName = "Run Primary Bus SmartPS SubUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml", 4, TestName = "Run Primary Bus SmartES SubUrban Low"),
+ TestCase(@"TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml", 4, TestName = "Run Primary Bus NonSmart ESS SubUrban Low"),
]
public void CreateRunDataPrimaryBus(string jobFile, int runIdx)
{
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void CreateRunSingleBus()
{
var jobFile =
- @"TestData\Integration\Buses\SingleBus.vecto";
+ @"TestData/Integration/Buses/SingleBus.vecto";
var writer = new FileOutputWriter(jobFile);
var inputData = Path.GetExtension(jobFile) == ".xml"
? xmlInputReader.CreateDeclaration(jobFile)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
index a22afffcb0369e3e237df24601ab2ed3a7daeede..7201e6e4e98fd149805045f6dc034820d73431fa 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
@@ -40,7 +40,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
public class DeclarationDataAdapterTest_Class2
{
public const string Class2RigidTruckNoEMSJob =
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto";
public const int CurbWeight = 4670;
public const double CdxA = 4.83;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
index 70eab05f3f1c7027cf1dad0d04ff8a401a377746..e8fe0140df1188c30dd52701099581773219c00c 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
@@ -40,7 +40,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
public class DeclarationDataAdapterTest_Class5
{
public const string Class5TractorPTOJob =
- @"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto";
public const int CurbWeight = 8229;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
index efd4dcf8723e5f91ce08c3838bdf83890f29a049..ee923996a55070ab7d73cfe3f235c0fca9ec3de6 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
@@ -39,7 +39,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
public class DeclarationDataAdapterTest_Class9
{
public const string Class9RigidTruckJob =
- @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+ @"TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto";
public const int CurbWeight = 9300;
public const double CdxA = 5.2;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 9693e144ff62a8a0d1bd9a5a3e7256eeaa8c7bdc..0b347cf25b83f22f1ed86f366e441a7c0ff93671 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -2083,7 +2083,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void Declaration_WheelsForT1_Class2()
{
var dataProvider =
- JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\12t Delivery Truck.vecto") as IDeclarationInputDataProvider;
+ JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/12t Delivery Truck.vecto") as IDeclarationInputDataProvider;
var dataReader = new DeclarationModeTruckVectoRunDataFactory(dataProvider, null);
var runs = dataReader.NextRun().ToList();
@@ -2107,7 +2107,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
{
var dataProvider =
JSONInputDataFactory.ReadJsonJob(
- @"TestData\Jobs\Class4_40t_Long_Haul_Truck.vecto") as IDeclarationInputDataProvider;
+ @"TestData/Jobs/Class4_40t_Long_Haul_Truck.vecto") as IDeclarationInputDataProvider;
var dataReader = new DeclarationModeTruckVectoRunDataFactory(dataProvider, null);
var runs = dataReader.NextRun().ToList();
@@ -2131,7 +2131,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void Declaration_WheelsForDefault_Class5()
{
var dataProvider =
- JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\40t_Long_Haul_Truck.vecto") as IDeclarationInputDataProvider;
+ JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/40t_Long_Haul_Truck.vecto") as IDeclarationInputDataProvider;
var dataReader = new DeclarationModeTruckVectoRunDataFactory(dataProvider, null);
var runs = dataReader.NextRun().ToList();
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/InputDataSanityChecks.cs b/VectoCore/VectoCoreTest/Models/Declaration/InputDataSanityChecks.cs
index 3f8c30de253899158ad604ba717d9144ce16366f..86ebfab745c48a76b3aeb1c552ee199301d25789 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/InputDataSanityChecks.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/InputDataSanityChecks.cs
@@ -17,9 +17,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestFixture]
public class InputDataSanityChecks
{
- public const string HeavyLorryConventional = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
- public const string MediumLorryConventional = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\MediumLorry\Conventional_mediumLorry_AMT.xml";
- public const string PrimaryBusConventional = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
+ public const string HeavyLorryConventional = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml";
+ public const string MediumLorryConventional = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml";
+ public const string PrimaryBusConventional = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml";
private IXMLInputDataReader _xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
index 89c56a1bfaa7430be54ec5fb05f111ca898f3348..6e26d4e97c23bc7b3da019b2e22c2b68c6daedd6 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
@@ -404,8 +404,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void ComputeShiftPolygonDeclarationTest()
{
- var engineFile = @"TestData\Components\40t_Long_Haul_Truck.veng";
- var gearboxFile = @"TestData\Components\40t_Long_Haul_Truck.vgbx";
+ var engineFile = @"TestData/Components/40t_Long_Haul_Truck.veng";
+ var gearboxFile = @"TestData/Components/40t_Long_Haul_Truck.vgbx";
var rdyn = 0.4882675.SI<Meter>();
var axlegearRatio = 2.59;
@@ -488,8 +488,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void ComputeShiftPolygonATDeclarationTest()
{
- var engineFile = @"TestData\Components\40t_Long_Haul_Truck.veng";
- var gearboxFile = @"TestData\Components\40t_Long_Haul_Truck.vgbx";
+ var engineFile = @"TestData/Components/40t_Long_Haul_Truck.veng";
+ var gearboxFile = @"TestData/Components/40t_Long_Haul_Truck.vgbx";
var rdyn = 0.4882675.SI<Meter>();
var axlegearRatio = 2.59;
@@ -540,13 +540,13 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase]
public void ComputeShiftPolygonDeclarationTestConfidentialEngine()
{
- //var engineFldFile = @"E:\QUAM\Downloads\EngineFLD\Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
- //var engineFldFile = @"E:\QUAM\tmp\scania_fullload_shiftpolygon-test.csv";
- //var gearboxFile = @"E:\QUAM\Downloads\TUG_dev_gbx\TUG_dev\GRS905R.vgbx";
- var engineFldFile = @"E:\QUAM\Downloads\attachment\Models_Declaration-mode\Overdrive\text\VENG_330kW_GENERIC.vfld";
- var gearboxFile = @"E:\QUAM\Downloads\attachment\Models_Declaration-mode\Overdrive\text\VGBX_AMT_12_overdr_DECL.vgbx";
+ //var engineFldFile = @"E:/QUAM/Downloads/EngineFLD/Map_375c_BB1390_modTUG_R49_375c_BB1386.vfld";
+ //var engineFldFile = @"E:/QUAM/tmp/scania_fullload_shiftpolygon-test.csv";
+ //var gearboxFile = @"E:/QUAM/Downloads/TUG_dev_gbx/TUG_dev/GRS905R.vgbx";
+ var engineFldFile = @"E:/QUAM/Downloads/attachment/Models_Declaration-mode/Overdrive/text/VENG_330kW_GENERIC.vfld";
+ var gearboxFile = @"E:/QUAM/Downloads/attachment/Models_Declaration-mode/Overdrive/text/VGBX_AMT_12_overdr_DECL.vgbx";
- //@"TestData\Components\40t_Long_Haul_Truck.vgbx";
+ //@"TestData/Components/40t_Long_Haul_Truck.vgbx";
if (!File.Exists(engineFldFile)) {
Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
@@ -608,8 +608,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(@"E:\QUAM\Downloads\upshifts-missing_over-revving\FL_curve_orig.xml"),
- TestCase(@"E:\QUAM\Downloads\VECTO_821\VECTO_lorry_6x2_13L_276kW.vecto")]
+ [TestCase(@"E:/QUAM/Downloads/upshifts-missing_over-revving/FL_curve_orig.xml"),
+ TestCase(@"E:/QUAM/Downloads/VECTO_821/VECTO_lorry_6x2_13L_276kW.vecto")]
public void ComputeShiftPolygonDeclarationTestConfidentialXMLJob(string jobFile)
{
if (!File.Exists(jobFile)) {
@@ -673,7 +673,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[Parallelizable(ParallelScope.All)]
public class ShiftPolygonComparison
{
- const string BasePath = @"E:\QUAM\Workspace\Daten_INTERN\Testfahrzeuge\";
+ const string BasePath = @"E:/QUAM/Workspace/Daten_INTERN/Testfahrzeuge/";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
@@ -690,26 +690,26 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[Category("LongRunning")]
[Ignore("No Assertions - only plotting shift polygons")]
[
- TestCase(@"class2_12t_baseline\175kW_Diesel_example.vfld", @"class2_12t_baseline\delivery_12t_example.vgbx", 0.421,
+ TestCase(@"class2_12t_baseline/175kW_Diesel_example.vfld", @"class2_12t_baseline/delivery_12t_example.vgbx", 0.421,
4.18, 600),
- TestCase(@"class2_12t_iaxle_long\175kW_Diesel_example.vfld", @"class2_12t_iaxle_long\delivery_12t_example.vgbx",
+ TestCase(@"class2_12t_iaxle_long/175kW_Diesel_example.vfld", @"class2_12t_iaxle_long/delivery_12t_example.vgbx",
0.421, 2.85, 600),
- TestCase(@"class2_12t_iaxle_short\175kW_Diesel_example.vfld", @"class2_12t_iaxle_short\delivery_12t_example.vgbx",
+ TestCase(@"class2_12t_iaxle_short/175kW_Diesel_example.vfld", @"class2_12t_iaxle_short/delivery_12t_example.vgbx",
0.421, 5.33, 600),
- TestCase(@"class2_12t_Pmax_high\220kW_Diesel_example.vfld", @"class2_12t_Pmax_high\delivery_12t_example_220kW.vgbx",
+ TestCase(@"class2_12t_Pmax_high/220kW_Diesel_example.vfld", @"class2_12t_Pmax_high/delivery_12t_example_220kW.vgbx",
0.421, 4.18, 600),
- TestCase(@"class2_12t_Pmax_low\130kW_Diesel_example.vfld", @"class2_12t_Pmax_low\delivery_12t_example.vgbx", 0.421,
+ TestCase(@"class2_12t_Pmax_low/130kW_Diesel_example.vfld", @"class2_12t_Pmax_low/delivery_12t_example.vgbx", 0.421,
4.18, 600),
- TestCase(@"class5_40t_baseline\12L-324kW.vfld", @"class5_40t_baseline\tractor_12gear_example.vgbx", 0.421, 2.64,
+ TestCase(@"class5_40t_baseline/12L-324kW.vfld", @"class5_40t_baseline/tractor_12gear_example.vgbx", 0.421, 2.64,
600),
- TestCase(@"class5_40t_iaxle_long\12L-324kW.vfld", @"class5_40t_iaxle_long\tractor_12gear_example.vgbx", 0.421, 2.31,
+ TestCase(@"class5_40t_iaxle_long/12L-324kW.vfld", @"class5_40t_iaxle_long/tractor_12gear_example.vgbx", 0.421, 2.31,
600),
- TestCase(@"class5_40t_iaxle_short\12L-324kW.vfld", @"class5_40t_iaxle_short\tractor_12gear_example.vgbx", 0.421,
+ TestCase(@"class5_40t_iaxle_short/12L-324kW.vfld", @"class5_40t_iaxle_short/tractor_12gear_example.vgbx", 0.421,
3.71,
600),
- TestCase(@"class5_40t_Pmax_high\13-9-L-375kW.vfld", @"class5_40t_Pmax_high\tractor_12gear_example.vgbx", 0.421,
+ TestCase(@"class5_40t_Pmax_high/13-9-L-375kW.vfld", @"class5_40t_Pmax_high/tractor_12gear_example.vgbx", 0.421,
2.64, 600),
- TestCase(@"class5_40t_Pmax_low\9-6-L_260kW.vfld", @"class5_40t_Pmax_low\tractor_12gear_example.vgbx", 0.421, 2.64,
+ TestCase(@"class5_40t_Pmax_low/9-6-L_260kW.vfld", @"class5_40t_Pmax_low/tractor_12gear_example.vgbx", 0.421, 2.64,
600),
]
public void ComputeShiftPolygon(string engineFldFile, string gearboxFile, double rdyn, double axlegearRatio,
@@ -867,8 +867,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(@"E:\QUAM\Workspace\VECTO-Bugreports\BugReportTests\Bugreport Jobs\20190307_VECTO-904_Extrapolation\OM-18173493.xml")]
- //[TestCase(@"E:\QUAM\Workspace\VECTO_DEV_Hybrid\Generic Vehicles\Declaration Mode\Group5_Tractor_4x2\Class5_Tractor_DECL.xml")]
+ [TestCase(@"E:/QUAM/Workspace/VECTO-Bugreports/BugReportTests/Bugreport Jobs/20190307_VECTO-904_Extrapolation/OM-18173493.xml")]
+ //[TestCase(@"E:/QUAM/Workspace/VECTO_DEV_Hybrid/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml")]
public void ComputeShiftPolygonXML(string xmlJob)
{
if (!File.Exists(xmlJob)) {
@@ -927,10 +927,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(@"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG.vecto", null),
- TestCase(@"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_cont30kW.vecto", null),
- TestCase(@"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_cont30kW.vecto", 0.9),
- TestCase(@"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_cont30kW.vecto", 1.1),
+ [TestCase(@"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto", null),
+ TestCase(@"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto", null),
+ TestCase(@"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto", 0.9),
+ TestCase(@"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto", 1.1),
]
public void ComputePEVShiftLines(string pevE2Job, double? factorDownshiftSpeed)
{
@@ -983,7 +983,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(0.9)]
public void ComputePEVShiftLinesDeRated(double? factorDownshiftSpeed)
{
- var pevE2Job = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_cont30kW.vecto";
+ var pevE2Job = @"TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto";
var inputData = JSONInputDataFactory.ReadJsonJob(pevE2Job) as IEngineeringInputDataProvider;
var gearboxData = inputData.JobInputData.Vehicle.Components.GearboxInputData;
diff --git a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
index 0dbc656f2cd038a38be872715789ae68e9e4bc9e..1a427f38a605b98cb09d1beb19e0312c322ab0a4 100644
--- a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
@@ -59,23 +59,23 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- const string JobFile = @"TestData\Integration\Buses\EngineeringMode\InterurbanBus_ENG_BusAux.vecto";
- const string JobFile_SmartES = @"TestData\Integration\Buses\EngineeringMode\InterurbanBus_ENG_BusAux_SmartES.vecto";
- const string JobFile_SmartPS = @"TestData\Integration\Buses\EngineeringMode\InterurbanBus_ENG_BusAux_SmartPS.vecto";
- const string JobFile_SmartES_SmartPS = @"TestData\Integration\Buses\EngineeringMode\InterurbanBus_ENG_BusAux_SmartES-SmartPS.vecto";
+ const string JobFile = @"TestData/Integration/Buses/EngineeringMode/InterurbanBus_ENG_BusAux.vecto";
+ const string JobFile_SmartES = @"TestData/Integration/Buses/EngineeringMode/InterurbanBus_ENG_BusAux_SmartES.vecto";
+ const string JobFile_SmartPS = @"TestData/Integration/Buses/EngineeringMode/InterurbanBus_ENG_BusAux_SmartPS.vecto";
+ const string JobFile_SmartES_SmartPS = @"TestData/Integration/Buses/EngineeringMode/InterurbanBus_ENG_BusAux_SmartES-SmartPS.vecto";
- const string JobFile_A = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_A.vecto";
- const string JobFile_A_ESS = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_A_ESS.vecto";
- const string JobFile_B = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_B.vecto";
- const string JobFile_C1 = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C1.vecto";
- const string JobFile_C2a = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C2a.vecto";
- const string JobFile_C2b = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C2b.vecto";
- const string JobFile_C3a = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C3a.vecto";
- const string JobFile_C3b = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C3b.vecto";
+ const string JobFile_A = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A.vecto";
+ const string JobFile_A_ESS = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A_ESS.vecto";
+ const string JobFile_B = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_B.vecto";
+ const string JobFile_C1 = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C1.vecto";
+ const string JobFile_C2a = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2a.vecto";
+ const string JobFile_C2b = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2b.vecto";
+ const string JobFile_C3a = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3a.vecto";
+ const string JobFile_C3b = @"TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3b.vecto";
//private const string JobRoeck_BusAux_B =
- // @"J:\TE-Em\Emissionsmodelle\VECTO\Arbeitsordner\AAUX\Check bus aux electrical system configurations\System type B\Citybus_P0-APT-S-175kW-6.8l_B\Citybus_P0_B.vecto";
+ // @"J:/TE-Em/Emissionsmodelle/VECTO/Arbeitsordner/AAUX/Check bus aux electrical system configurations/System type B/Citybus_P0-APT-S-175kW-6.8l_B/Citybus_P0_B.vecto";
[
TestCase(JobFile, 0, TestName = "InterurbanBus ENG BusAux NonSmart Interurban"),
TestCase(JobFile, 1, TestName = "InterurbanBus ENG BusAux NonSmart Coach"),
@@ -836,7 +836,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
}
}
- public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
+ public const string EngineFileHigh = @"TestData/Components/24t Coach_high.veng";
public static MockVehicleContainer CreatePowerTrain(AlternatorType alternatorType, double initialSoC,
double? reessSoC, bool connectEsToReess)
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index 3649573fa741e6d3a06d99a9c69747f59aaa1b94..043731387eb9f807ad6218d49e7fa45836678f8d 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
EngineData = new CombustionEngineData() {
Fuels = new[] {new CombustionEngineFuelData {
FuelData = FuelData.Diesel,
- ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vmap"),
+ ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vmap"),
}}.ToList(),
IdleSpeed = 600.RPMtoRad()
},
@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var sumWriter = new SummaryDataContainer(fileWriter);
var container = new VehicleContainer(ExecutionMode.Declaration, modData,
(modalData) => sumWriter.Write(modalData, 0, 0, runData));
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\LongHaul_short.vdri", CycleType.DistanceBased, false);
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData/Cycles/LongHaul_short.vdri", CycleType.DistanceBased, false);
new MockDrivingCycle(container, data);
new ZeroMileageCounter(container);
new DummyDriverInfo(container);
@@ -148,9 +148,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var testColumns = new[] { "P_aux_FAN", "P_aux_STP", "P_aux_AC", "P_aux_ES", "P_aux_PS", "P_aux_mech" };
- ResultFileHelper.TestModFile(@"TestData\Results\EngineOnlyCycles\AuxWriteModFileSumFile.vmod",
+ ResultFileHelper.TestModFile(@"TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vmod",
@"AuxWriteModFileSumFile_MockCycle.vmod", testColumns);
- ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\AuxWriteModFileSumFile.vsum",
+ ResultFileHelper.TestSumFile(@"TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum",
@"AuxWriteModFileSumFile.vsum");
}
@@ -192,7 +192,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
{
var dataWriter = new MockModalDataContainer();
var container = new VehicleContainer(ExecutionMode.Engineering, dataWriter);
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData/Cycles/Coach time based short.vdri",
CycleType.MeasuredSpeed, false);
var cycle = new MockDrivingCycle(container, data);
@@ -224,7 +224,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
dataWriter.AddAuxiliary("CONSTANT");
var container = new VehicleContainer(ExecutionMode.Engineering, dataWriter);
- var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach time based short.vdri",
+ var data = DrivingCycleDataReader.ReadFromFile(@"TestData/Cycles/Coach time based short.vdri",
CycleType.MeasuredSpeed, false);
// cycle ALT1 is set to values to equal the first few fixed points in the auxiliary file.
// ALT1.aux file: nAuxiliary speed 2358: 0, 0.38, 0.49, 0.64, ...
@@ -280,7 +280,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var jobContainer = new JobContainer(sumData);
var inputData = JSONInputDataFactory.ReadJsonJob(
- @"TestData\Generic Vehicles\Declaration Mode\40t Long Haul Truck\40t_Long_Haul_Truck.vecto");
+ @"TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter);
jobContainer.AddRuns(runsFactory);
@@ -295,7 +295,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var jobContainer = new JobContainer(sumData);
var inputData =
- JSONInputDataFactory.ReadJsonJob(@"TestData\Generic Vehicles\Engineering Mode\24t Coach\24t Coach.vecto");
+ JSONInputDataFactory.ReadJsonJob(@"TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputData, fileWriter);
jobContainer.AddRuns(runsFactory);
@@ -308,7 +308,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var sumData = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumData);
- var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\40t_Long_Haul_Truck_wrong_AUX.vecto");
+ var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/40t_Long_Haul_Truck_wrong_AUX.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter);
AssertHelper.Exception<VectoException>(() => jobContainer.AddRuns(runsFactory));
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
index b62d6b9a510118ddebd0fc9b5e6bdc4a76fb7620..75859abe40d6baddcdd9d6a819f66e9496323ffb 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var dataWriter = new MockModalDataContainer();
var container = new VehicleContainer(ExecutionMode.Engineering, dataWriter);
- var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach Engine Only.vdri", CycleType.EngineOnly,
+ var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData/Cycles/Coach Engine Only.vdri", CycleType.EngineOnly,
false);
var cycle = new PowertrainDrivingCycle(container, cycleData);
new EngineOnlyGearboxInfo(container);
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
{
var container = new VehicleContainer(ExecutionMode.Engineering);
- var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\Coach Engine Only Paux_var-dt.vdri",
+ var cycleData = DrivingCycleDataReader.ReadFromFile(@"TestData/Cycles/Coach Engine Only Paux_var-dt.vdri",
CycleType.EngineOnly, false);
var cycle = new PowertrainDrivingCycle(container, cycleData);
new EngineOnlyGearboxInfo(container);
@@ -334,11 +334,11 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
AssertHelper.Exception<VectoException>(() => TestCycleRead(cycle, type));
}
- [TestCase(@"TestData\Cycles\Coach.vdri", CycleType.DistanceBased),
- TestCase(@"TestData\Cycles\Engine Only1.vdri", CycleType.EngineOnly),
- TestCase(@"TestData\Pwheel\RD_#1_Pwheel_AuxStd.vdri", CycleType.PWheel),
- TestCase(@"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vdri", CycleType.MeasuredSpeed),
- TestCase(@"TestData\MeasuredSpeed\MeasuredSpeed_Gear_Rural_VairAux.vdri",
+ [TestCase(@"TestData/Cycles/Coach.vdri", CycleType.DistanceBased),
+ TestCase(@"TestData/Cycles/Engine Only1.vdri", CycleType.EngineOnly),
+ TestCase(@"TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri", CycleType.PWheel),
+ TestCase(@"TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri", CycleType.MeasuredSpeed),
+ TestCase(@"TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri",
CycleType.MeasuredSpeedGear),
]
public void DrivingCycle_Detect_File(string filename, CycleType type)
@@ -346,11 +346,11 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
TestCycleDetect(File.ReadAllText(filename), type);
}
- [TestCase(@"TestData\Cycles\Coach.vdri", CycleType.DistanceBased, 6036),
- TestCase(@"TestData\Cycles\Engine Only1.vdri", CycleType.EngineOnly, 696),
- TestCase(@"TestData\Pwheel\RD_#1_Pwheel_AuxStd.vdri", CycleType.PWheel, 3917),
- TestCase(@"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vdri", CycleType.MeasuredSpeed, 1300),
- TestCase(@"TestData\MeasuredSpeed\MeasuredSpeed_Gear_Rural_VairAux.vdri",
+ [TestCase(@"TestData/Cycles/Coach.vdri", CycleType.DistanceBased, 6036),
+ TestCase(@"TestData/Cycles/Engine Only1.vdri", CycleType.EngineOnly, 696),
+ TestCase(@"TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri", CycleType.PWheel, 3917),
+ TestCase(@"TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri", CycleType.MeasuredSpeed, 1300),
+ TestCase(@"TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri",
CycleType.MeasuredSpeedGear, 1300),
]
public void DrivingCycle_Read_File(string filename, CycleType type, int entryCount)
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
index c7671f3919645ff223523ceef0fb8e4ff2e4c4db..d778bb94db29860cf5a59badd3ddc71c284a0349 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
@@ -48,9 +48,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[Parallelizable(ParallelScope.All)]
public class FactoryTest
{
- public const string DeclarationJobFile = @"Testdata\Jobs\12t Delivery Truck.vecto";
+ public const string DeclarationJobFile = @"TestData/Jobs/12t Delivery Truck.vecto";
- public const string EngineeringJobFile = @"Testdata\Jobs\24t Coach.vecto";
+ public const string EngineeringJobFile = @"TestData/Jobs/24t Coach.vecto";
[OneTimeSetUp]
@@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void TestDistanceCycleInVTPEngineering()
{
- var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\VTPModeWithDistanceCycle.vecto");
+ var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/VTPModeWithDistanceCycle.vecto");
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputData, null);
AssertHelper.Exception<VectoException>(() => factory.SimulationRuns().ToArray(), "Distance-based cycle can not be simulated in VerificationTest mode");
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void TestDistanceCycleInEngineOnly()
{
- var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\EngineOnlyJobWithDistanceCycle.vecto");
+ var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/EngineOnlyJobWithDistanceCycle.vecto");
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputData, null);
AssertHelper.Exception<VectoException>(() => factory.SimulationRuns().ToArray(), "Distance-based cycle can not be simulated in EngineOnly mode");
@@ -151,7 +151,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void TestMeasuredSpeedCycleInEngineOnly()
{
- var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\EngineOnlyJobWithMeasuredCycle.vecto");
+ var inputData = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/EngineOnlyJobWithMeasuredCycle.vecto");
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputData, null);
AssertHelper.Exception<VectoException>(() => {
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
index 3f1881fe6c7d320c531fb966a1076f51dab7ea3b..a9348d9f2370c61baf430f32adc1e730d14dd3dd 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
@@ -56,15 +56,15 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[Parallelizable(ParallelScope.All)]
public class LossMapRangeValidationTest
{
- public const string ShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- public const string AccelerationFile = @"TestData\Components\Truck.vacc";
- public const string EngineFile = @"TestData\Components\40t_Long_Haul_Truck.veng";
- public const string AxleGearLossMap = @"TestData\Components\Axle 40t Truck.vtlm";
- public const string GearboxIndirectLoss = @"TestData\Components\Indirect Gear.vtlm";
- public const string GearboxDirectLoss = @"TestData\Components\Direct Gear.vtlm";
- public const string GearboxLimited = @"TestData\Components\limited.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+ public const string ShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ public const string AccelerationFile = @"TestData/Components/Truck.vacc";
+ public const string EngineFile = @"TestData/Components/40t_Long_Haul_Truck.veng";
+ public const string AxleGearLossMap = @"TestData/Components/Axle 40t Truck.vtlm";
+ public const string GearboxIndirectLoss = @"TestData/Components/Indirect Gear.vtlm";
+ public const string GearboxDirectLoss = @"TestData/Components/Direct Gear.vtlm";
+ public const string GearboxLimited = @"TestData/Components/limited.vtlm";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
[OneTimeSetUp]
@@ -262,7 +262,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void CreateJobWithLossMapEfficiency_Engineering()
{
- var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\12t Delivery Truck Engineering Efficiency.vecto");
+ var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/12t Delivery Truck Engineering Efficiency.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, dataProvider, null);
var jobContainer = new JobContainer(null);
jobContainer.AddRuns(runsFactory);
@@ -274,7 +274,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void RunJobWithLossMapEfficiency_Engineering()
{
- const string jobFileName = @"TestData\Jobs\12t Delivery Truck Engineering Efficiency.vecto";
+ const string jobFileName = @"TestData/Jobs/12t Delivery Truck Engineering Efficiency.vecto";
var fileWriter = new FileOutputWriter(jobFileName);
var dataProvider = JSONInputDataFactory.ReadJsonJob(jobFileName);
@@ -295,7 +295,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void CreateJobWith_Axle_LossMapEfficiency_Declaration()
{
- var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\40t_Long_Haul_Truck with AxleEfficiency.vecto");
+ var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/40t_Long_Haul_Truck with AxleEfficiency.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, null);
var jobContainer = new JobContainer(null);
@@ -308,7 +308,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void CreateJobWith_Gear_LossMapEfficiency_Declaration()
{
- var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData\Jobs\40t_Long_Haul_Truck with GearEfficiency.vecto");
+ var dataProvider = JSONInputDataFactory.ReadJsonJob(@"TestData/Jobs/40t_Long_Haul_Truck with GearEfficiency.vecto");
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, null);
var jobContainer = new JobContainer(null);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index 2347bc503caef67d8a8ae02ee3b425dd1095b561..20a94719f58354c38a4ccd4865d1bc0528613666 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -391,133 +391,133 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void MeasuredSpeed_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeed.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeed_MeasuredSpeed.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeed_MeasuredSpeed.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeed.vsum", @"TestData\MeasuredSpeed\MeasuredSpeed.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeed.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeed_MeasuredSpeed.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum", @"TestData/MeasuredSpeed/MeasuredSpeed.vsum");
}
[TestCase]
public void MeasuredSpeedAux_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedAux.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedAux_MeasuredSpeedAux.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedAux_MeasuredSpeedAux.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedAux.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedAux.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedAux_MeasuredSpeedAux.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedAux.vsum");
}
[TestCase]
public void MeasuredSpeedVair_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVair.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVair_MeasuredSpeedVair.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedVair_MeasuredSpeedVair.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVair.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVair.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedVair.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVair_MeasuredSpeedVair.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedVair.vsum");
}
[TestCase]
public void MeasuredSpeedVair_WindFromFront_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVairFront.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairFront.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVairFront.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedVairFront.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedVairFront.vsum");
}
[TestCase]
public void MeasuredSpeedVair_WindFromBack_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVairBack.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairBack.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVairBack.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedVairBack.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedVairBack.vsum");
}
[Category("LongRunning")]
[TestCase]
public void MeasuredSpeedVair_NoWind_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVairNoWind.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairNoWind.vsum",
- @"TestData\MeasuredSpeed\MeasuredSpeedVairNoWind.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vsum");
}
[TestCase]
public void MeasuredSpeedVairAux_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedVairAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedVairAux.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGear.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGear.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGear.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGear.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedGear.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_TractionInterruption_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_TractionInterruption.vsum",
- @"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGear_TractionInterruption.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGear_TractionInterruption.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_Aux_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearAux.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGearAux.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGearAux.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedGearAux.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_Vair_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearVair.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVair.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGearVair.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum", @"TestData/MeasuredSpeed/MeasuredSpeedGearVair.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_VairAux_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVairAux.vsum",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_AT_PS_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearAT-PS.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAT-PS.vsum",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearAT-PS.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGearAT-PS.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearAT-PS.vsum");
}
[TestCase]
public void MeasuredSpeed_Gear_AT_Ser_Run()
{
- RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearAT-Ser.vecto",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod",
- @"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAT-Ser.vsum",
- @"TestData\MeasuredSpeed\MeasuredSpeedGearAT-Ser.vsum");
+ RunJob(@"TestData/MeasuredSpeed/MeasuredSpeedGearAT-Ser.vecto",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod",
+ @"TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum",
+ @"TestData/MeasuredSpeed/MeasuredSpeedGearAT-Ser.vsum");
}
[TestCase]
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
index b96aef018182cfa4c73e2b2fb20758362f1e9b8c..7fe63efafb095422f02c4c733e507326449b2493 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
@@ -48,13 +48,13 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[Parallelizable(ParallelScope.All)]
public class PowerTrainBuilderTest
{
- public const string JobFile = @"TestData\Jobs\24t Coach.vecto";
- public const string JobFileNoAngular = @"TestData\Jobs\24t CoachNoAng.vecto";
- public const string JobFileAngEfficiency = @"TestData\Jobs\24t Coach_Ang_Efficiency.vecto";
+ public const string JobFile = @"TestData/Jobs/24t Coach.vecto";
+ public const string JobFileNoAngular = @"TestData/Jobs/24t CoachNoAng.vecto";
+ public const string JobFileAngEfficiency = @"TestData/Jobs/24t Coach_Ang_Efficiency.vecto";
- public const string JobFileDecl = @"TestData\Jobs\40t_Long_Haul_Truck.vecto";
- 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 JobFileDecl = @"TestData/Jobs/40t_Long_Haul_Truck.vecto";
+ 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";
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
index 479abf518325f8a4b02b3f643f04f50443ead14a..b80bbdde0ab3f639d64edc0b7d8250dd133627ca 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
@@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void Pwheel_Run_Test()
{
- var jobFile = @"TestData\Pwheel\Pwheel.vecto";
+ var jobFile = @"TestData/Pwheel/Pwheel.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
@@ -204,10 +204,10 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
- ResultFileHelper.TestSumFile(@"TestData\Pwheel\Results\Pwheel.vsum", @"TestData\Pwheel\Pwheel.vsum");
+ ResultFileHelper.TestSumFile(@"TestData/Pwheel/Results/Pwheel.vsum", @"TestData/Pwheel/Pwheel.vsum");
- ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\Pwheel_Gear2_pt1_rep1_actual.vmod",
- @"TestData\Pwheel\Pwheel_Gear2_pt1_rep1_actual.vmod");
+ ResultFileHelper.TestModFile(@"TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod",
+ @"TestData/Pwheel/Pwheel_Gear2_pt1_rep1_actual.vmod");
}
/// <summary>
@@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void Pwheel_ultimate_Run_Test()
{
- var jobFile = @"TestData\Pwheel\Pwheel_ultimate.vecto";
+ var jobFile = @"TestData/Pwheel/Pwheel_ultimate.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
@@ -233,10 +233,10 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
- ResultFileHelper.TestSumFile(@"TestData\Pwheel\Results\Pwheel_ultimate.vsum", @"TestData\Pwheel\Pwheel_ultimate.vsum");
+ ResultFileHelper.TestSumFile(@"TestData/Pwheel/Results/Pwheel_ultimate.vsum", @"TestData/Pwheel/Pwheel_ultimate.vsum");
- ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod",
- @"TestData\Pwheel\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod");
+ ResultFileHelper.TestModFile(@"TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod",
+ @"TestData/Pwheel/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod");
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
index eb5451e5e9bd165d3a69b3ec547dd1ab1254e6aa..9454ff0306512fb53d82bd9839775de9192945aa 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public class ShiftStrategyV2Test
{
public const string Class9Decl =
- @"TestData\Generic Vehicles\Declaration Mode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+ @"TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
@@ -35,8 +35,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
}
- [TestCase(@"TestData\Integration\ShiftStrategyV2\Class5_Tractor_4x2\Class5_Tractor_ENG_TCU.vecto"),
- TestCase(@"TestData\Integration\ShiftStrategyV2\Class5_Tractor_4x2\Class5_Tractor_ENG_FC.vecto")]
+ [TestCase(@"TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor_ENG_TCU.vecto"),
+ TestCase(@"TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/Class5_Tractor_ENG_FC.vecto")]
public void TestShiftStrategyEngineering(string jobFile, int runIdx = 0)
{
var relativeJobPath = jobFile;
@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group1(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group2(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group3(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -127,7 +127,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group4(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -150,7 +150,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group5(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -173,7 +173,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group9(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -198,7 +198,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group10(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
@@ -224,7 +224,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group11(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
@@ -248,7 +248,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group12(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
@@ -265,7 +265,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group16(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
@@ -281,7 +281,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
]
public void RunDeclarationTestNewShiftStrategy_Group5_FCMapInfluence(string filename, int? idx)
{
- var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+ var job = @"TestData/Integration/ShiftStrategyV2/SampleVehicles/" + filename;
if (idx.HasValue) {
RunJob_DeclSingle(job, idx.Value);
@@ -291,16 +291,16 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
}
- [TestCase(@"TestData\Integration\ShiftStrategyV2\CityBus_AT_GSVoith\CityBus_AT_PS.vecto"),
- TestCase(@"TestData\Integration\ShiftStrategyV2\CityBus_AT_GSVoith\CityBus_AT_Ser.vecto"),
+ [TestCase(@"TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_PS.vecto"),
+ TestCase(@"TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/CityBus_AT_Ser.vecto"),
Ignore("Voith Shift strategy no longer maintained")]
public void RunEngineeringVoith(string jobName)
{
RunJob_Engineering(jobName);
}
- [TestCase(@"TestData\Integration\ShiftStrategyV2\CityBus_AT_FCOpt\CityBus_AT_PS.vecto"),
- TestCase(@"TestData\Integration\ShiftStrategyV2\CityBus_AT_FCOpt\CityBus_AT_Ser.vecto")]
+ [TestCase(@"TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vecto"),
+ TestCase(@"TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vecto")]
public void RunEngineeringFCoptimized(string jobName)
{
RunJob_Engineering(jobName);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
index 54b39cac2af7e6a28bf466e94d368b1e169f621d..1f84fced92314a561b4561083952f24689ef1afa 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
@@ -26,12 +26,12 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
private IXMLInputDataReader xmlInputReader;
public const string Class9Decl =
- @"TestData\Generic Vehicles\Declaration Mode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+ @"TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto";
public const string Class9DeclAT =
- @"TestData\Integration\ADAS\Group9_AT_PCC.xml";
+ @"TestData/Integration/ADAS/Group9_AT_PCC.xml";
- public const string Class5Eng = @"TestData\Integration\ADAS\Group5PCCEng\Class5_Tractor_ENG.vecto";
+ public const string Class5Eng = @"TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto";
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -115,9 +115,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase(Class9Decl, ExecutionMode.Declaration, 0),
- TestCase(@"TestData\Integration\ADAS\Group5PCCEng\Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 0),
- TestCase(@"TestData\Integration\ADAS\Group5PCCEng\Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 1),
- TestCase(@"TestData\Integration\ADAS\Group5PCCEng\Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 12),
+ TestCase(@"TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 0),
+ TestCase(@"TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 1),
+ TestCase(@"TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 12),
]
public void TestSimulationPreprocessingPccSegments(string jobFile, ExecutionMode mode, int i)
{
@@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
}
[
- TestCase(@"TestData\Integration\ADAS\Group5PCCEng\Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 12),
+ TestCase(@"TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto", ExecutionMode.Engineering, 12),
]
public void TestSimulationPreprocessingPccSegmentsVehicleStop(string jobFile, ExecutionMode mode, int i)
{
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
index fa2df82d7ed1dd4d5607416c47dee22fa35c4a3e..ba513da6670847a4bd73431ea9f998eb98d4c0fa 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[Parallelizable(ParallelScope.All)]
public class SimulationTests
{
- private const string EngineOnlyJob = @"TestData\Jobs\EngineOnlyJob.vecto";
+ private const string EngineOnlyJob = @"TestData/Jobs/EngineOnlyJob.vecto";
[OneTimeSetUp]
@@ -72,8 +72,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void TestEngineOnly_JobRun()
{
- var actual = @"TestData\Jobs\EngineOnlyJob_Coach Engine Only short.vmod";
- var expected = @"TestData\Results\EngineOnlyCycles\EngineOnlyJob_Coach Engine Only short.vmod";
+ var actual = @"TestData/Jobs/EngineOnlyJob_Coach Engine Only short.vmod";
+ var expected = @"TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod";
var job = CreateRun(actual);
job.Run();
@@ -86,8 +86,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void TestEngineOnly_SimulatorRun()
{
- var actual = @"TestData\Jobs\EngineOnlyJob_Coach Engine Only short.vmod";
- var expected = @"TestData\Results\EngineOnlyCycles\EngineOnlyJob_Coach Engine Only short.vmod";
+ var actual = @"TestData/Jobs/EngineOnlyJob_Coach Engine Only short.vmod";
+ var expected = @"TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod";
var run = CreateRun(actual);
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestCase]
public void Test_VectoJob()
{
- var jobFile = @"TestData\Jobs\24t Coach EngineOnly.vecto";
+ var jobFile = @"TestData/Jobs/24t Coach EngineOnly.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
@@ -135,17 +135,17 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(run.Run.FinishedWithoutErrors, $"{run.ExecException}");
}
- ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly.vsum",
- @"TestData\Jobs\24t Coach EngineOnly.vsum");
+ ResultFileHelper.TestSumFile(@"TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum",
+ @"TestData/Jobs/24t Coach EngineOnly.vsum");
ResultFileHelper.TestModFiles(new[] {
- @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only1.vmod",
- @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only2.vmod",
- @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only3.vmod"
+ @"TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod",
+ @"TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod",
+ @"TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod"
}, new[] {
- @"TestData\Jobs\24t Coach EngineOnly_Engine Only1.vmod",
- @"TestData\Jobs\24t Coach EngineOnly_Engine Only2.vmod",
- @"TestData\Jobs\24t Coach EngineOnly_Engine Only3.vmod"
+ @"TestData/Jobs/24t Coach EngineOnly_Engine Only1.vmod",
+ @"TestData/Jobs/24t Coach EngineOnly_Engine Only2.vmod",
+ @"TestData/Jobs/24t Coach EngineOnly_Engine Only3.vmod"
})
;
}
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs
index 47971aecba39d44434773ebc107d6f87e4ca3ef6..2bb8b8a7b95f42c23e5eebacabd45d5a4359503d 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[Parallelizable(ParallelScope.All)]
public class VechicleContainerTests
{
- private const string EngineFile = @"TestData\Components\24t Coach.veng";
+ private const string EngineFile = @"TestData/Components/24t Coach.veng";
[TestCase]
public void VechicleContainerHasEngine()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
index e84ed5e7500888f67281e06a47490a6095a0a047..8a3828e11fb701122c2846bf98cc2cfb7b465b6e 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
@@ -59,10 +59,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class ATGearboxTest
{
- public const string EngineDataFile = @"TestData\Components\AT_GBX\Engine.veng";
- public const string GearboxDataFile = @"TestData\Components\AT_GBX\GearboxSerial.vgbx";
+ public const string EngineDataFile = @"TestData/Components/AT_GBX/Engine.veng";
+ public const string GearboxDataFile = @"TestData/Components/AT_GBX/GearboxSerial.vgbx";
- public const string GearboxData8SpdFile = @"TestData\Components\AT_GBX\GearboxSerial8Spd.vgbx";
+ public const string GearboxData8SpdFile = @"TestData/Components/AT_GBX/GearboxSerial8Spd.vgbx";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
index ef1426456a7b83982ee682643c501afd88830eb5..b713680d298dbf4a4c52faf033865069b710a6cf 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class BatterySystemTest
{
- public const string componentFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
+ public const string componentFile = @"TestData/Hybrids/Battery/GenericBattery.vbat";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
index a1da0d0f84636af6444e8d8064fbca05029b7b0e..6caa8eeb47df30487f6cdf015d0f1692fc2adeca 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
@@ -21,7 +21,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class BatteryTest
{
- public const string componentFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
+ public const string componentFile = @"TestData/Hybrids/Battery/GenericBattery.vbat";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
index 61ebd645060df5cc22713548d901acc0c11499aa..fe05842043b72d59e99d9d7ad70ea5f19249427c 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class ClutchTest
{
- private const string CoachEngine = @"TestData\Components\24t Coach.veng";
+ private const string CoachEngine = @"TestData/Components/24t Coach.veng";
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
index 936f118c7886ce0de584304e000cd64f18af3a21..8c11944c8596eeb26cee78a0e3458916dcade9e0 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
@@ -58,9 +58,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
{
protected double Tolerance = 1E-3;
- private const string CoachEngine = @"TestData\Components\24t Coach.veng";
+ private const string CoachEngine = @"TestData/Components/24t Coach.veng";
- private const string TruckEngine = @"TestData\Components\40t_Long_Haul_Truck.veng";
+ private const string TruckEngine = @"TestData/Components/40t_Long_Haul_Truck.veng";
[OneTimeSetUp]
@@ -160,14 +160,14 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
VectoCSVFile.Write(@"test1.csv", dataWriter.Data, true);
}
- [TestCase("Test1Hz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_1Hz.csv")]
- [TestCase("Test10Hz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_10Hz.csv")]
- [TestCase("TestvarHz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_varHz.csv")]
- [TestCase("Test10Hz", @"TestData\Components\24t Coach_IncPT1.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_10Hz_IncPT1.csv")]
+ [TestCase("Test1Hz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv")]
+ [TestCase("Test10Hz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv")]
+ [TestCase("TestvarHz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv")]
+ [TestCase("Test10Hz", @"TestData/Components/24t Coach_IncPT1.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv")]
public void TestEngineOnlyEngineFullLoadJump(string testName, string engineFile, double rpm, double initialIdleLoad,
double finalIdleLoad, string resultFile)
{
@@ -219,14 +219,14 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
modalData.Finish(VectoRun.Status.Success);
}
- [TestCase("Test1Hz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_1Hz.csv")]
- [TestCase("Test10Hz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_10Hz.csv")]
- [TestCase("TestvarHz", @"TestData\Components\24t Coach.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_varHz.csv")]
- [TestCase("Test10Hz", @"TestData\Components\24t Coach_IncPT1.veng", 1000, 50, 50,
- @"TestData\Results\EngineFullLoadJumps\EngineFLJ_1000rpm_10Hz_IncPT1.csv")]
+ [TestCase("Test1Hz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv")]
+ [TestCase("Test10Hz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv")]
+ [TestCase("TestvarHz", @"TestData/Components/24t Coach.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv")]
+ [TestCase("Test10Hz", @"TestData/Components/24t Coach_IncPT1.veng", 1000, 50, 50,
+ @"TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv")]
public void TestEngineFullLoadJump(string testName, string engineFile, double rpm, double initialIdleLoad,
double finalIdleLoad, string resultFile)
{
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
index f51d0443de5e366a56a4d82829090a901a8252fe..61721848776237f9638a255c52b564c1992e49fd 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class DistanceBasedDrivingCycleTest
{
- public const string ShortCycle = @"TestData\Cycles\Coach_24t_xshort.vdri";
+ public const string ShortCycle = @"TestData/Cycles/Coach_24t_xshort.vdri";
public const double Tolerance = 0.0001;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 4cf4702964c30721f842134ba2bd0d20c80972e2..b83d2529e331d5e4e26738942a9529235543eab4 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -60,10 +60,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class DriverTest
{
- public const string JobFile = @"TestData\Jobs\24t Coach EngineOnly.vecto";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
- public const string EngineFileHigh = @"TestData\Components\24t Coach_high.veng";
- public const string AccelerationFile = @"TestData\Components\Coach.vacc";
+ public const string JobFile = @"TestData/Jobs/24t Coach EngineOnly.vecto";
+ public const string EngineFile = @"TestData/Components/24t Coach.veng";
+ public const string EngineFileHigh = @"TestData/Components/24t Coach_high.veng";
+ public const string AccelerationFile = @"TestData/Components/Coach.vacc";
public const double Tolerance = 0.001;
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index ec64ea8f114a8446b7f2bdb1c97d3966ee2a09f0..5e505350ffb84bdbd820c3608f238ce41b13ce2b 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -27,9 +27,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class ElectricMotorTest
{
- public const string MotorFile = @"TestData\Hybrids\ElectricMotor\GenericEMotor.vem";
- public const string MotorFile_v2 = @"TestData\Hybrids\ElectricMotor\GenericEMotorV2.vem";
- public const string BatFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
+ public const string MotorFile = @"TestData/Hybrids/ElectricMotor/GenericEMotor.vem";
+ public const string MotorFile_v2 = @"TestData/Hybrids/ElectricMotor/GenericEMotorV2.vem";
+ public const string BatFile = @"TestData/Hybrids/Battery/GenericBattery.vbat";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index 94f1b6fbde457003cf2fb1f6f496172a9a9db82b..0515f16cd4764fa63ce195aa61219da12870f964 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -64,25 +64,25 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class GearboxTest
{
- public const string GearboxDataFile = @"TestData\Components\24t Coach.vgbx";
- public const string EngineDataFile = @"TestData\Components\24t Coach.veng";
+ public const string GearboxDataFile = @"TestData/Components/24t Coach.vgbx";
+ public const string EngineDataFile = @"TestData/Components/24t Coach.veng";
- public const string CycleFile = @"TestData\Integration\FullPowerTrain\1-Gear-Test-dist.vdri";
- public const string CoachCycleFile = @"TestData\Integration\FullPowerTrain\Coach.vdri";
- public const string EngineFile = @"TestData\Components\24t Coach.veng";
+ public const string CycleFile = @"TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri";
+ public const string CoachCycleFile = @"TestData/Integration/FullPowerTrain/Coach.vdri";
+ public const string EngineFile = @"TestData/Components/24t Coach.veng";
- public const string AccelerationFile = @"TestData\Components\Coach.vacc";
+ public const string AccelerationFile = @"TestData/Components/Coach.vacc";
- public const string IndirectLossMap = @"TestData\Components\Indirect Gear.vtlm";
- public const string DirectLossMap = @"TestData\Components\Direct Gear.vtlm";
+ public const string IndirectLossMap = @"TestData/Components/Indirect Gear.vtlm";
+ public const string DirectLossMap = @"TestData/Components/Direct Gear.vtlm";
- public const string GearboxShiftPolygonFile = @"TestData\Components\ShiftPolygons.vgbs";
- //public const string GearboxFullLoadCurveFile = @"TestData\Components\Gearbox.vfld";
+ public const string GearboxShiftPolygonFile = @"TestData/Components/ShiftPolygons.vgbs";
+ //public const string GearboxFullLoadCurveFile = @"TestData/Components/Gearbox.vfld";
- public const string AxleGearValidRangeDataFile = @"TestData\Components\AxleGearValidRange.vgbx";
- public const string AxleGearInvalidRangeDataFile = @"TestData\Components\AxleGearInvalidRange.vgbx";
+ public const string AxleGearValidRangeDataFile = @"TestData/Components/AxleGearValidRange.vgbx";
+ public const string AxleGearInvalidRangeDataFile = @"TestData/Components/AxleGearInvalidRange.vgbx";
- public const string AngledriveLossMap = @"TestData\Components\AngleGear.vtlm";
+ public const string AngledriveLossMap = @"TestData/Components/AngleGear.vtlm";
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -198,7 +198,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
message: "Torque Engine Side");
}
- [TestCase(@"TestData\Components\24t Coach LessThanTwoGears.vgbx")]
+ [TestCase(@"TestData/Components/24t Coach LessThanTwoGears.vgbx")]
public void Gearbox_LessThanTwoGearsException(string wrongFile)
{
AssertHelper.Exception<VectoSimulationException>(
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
index 83aa83443b053e0e5b020f6df48b398291f62884..c1f48b67186f2c6d6eca4caa88d1b5d35dc97ab9 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class RetarderTest
{
- private const string RetarderLossMapFile = @"TestData\Components\Retarder.vrlm";
+ private const string RetarderLossMapFile = @"TestData/Components/Retarder.vrlm";
private const double Delta = 0.0001;
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
index 55ea5a53bdd9f6819199a48c7d3baf1e8c0697fc..1259e76c2914d240038bb6660ff0c200d437a062 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
@@ -53,8 +53,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class VehicleTest
{
- private const string VehicleDataFileCoach = @"TestData\Components\24t Coach.vveh";
- private const string VehicleDataFileTruck = @"TestData\Components\40t_Long_Haul_Truck.vveh";
+ private const string VehicleDataFileCoach = @"TestData/Components/24t Coach.vveh";
+ private const string VehicleDataFileTruck = @"TestData/Components/40t_Long_Haul_Truck.vveh";
public static readonly double Tolerance = 0.001;
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
index ba5e7afbc6c08be437275e8370507747b1f46a1d..cecb8a2639cac620c17127a01f77c2048e0fc589 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
[Parallelizable(ParallelScope.All)]
public class WheelsTest
{
- private const string VehicleDataFile = @"TestData\Components\24t Coach.vveh";
+ private const string VehicleDataFile = @"TestData/Components/24t Coach.vveh";
[TestCase]
public void WheelsRequestTest()
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
index b159db1d866b905e2afd60c113dad2cf9f6f45c1..165cb8ac1fab9fae79cd5aa40d32507130568872 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestCase]
public void AccelerationTest()
{
- Data = AccelerationCurveReader.ReadFromFile(@"TestData\Components\Coach.vacc");
+ Data = AccelerationCurveReader.ReadFromFile(@"TestData/Components/Coach.vacc");
// FIXED POINTS
EqualAcceleration(0, 1.01570922360353, -0.231742702878269);
@@ -136,7 +136,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
]
public void ComputeAccelerationDistanceTest(double v1, double v2, double expectedDistance)
{
- Data = AccelerationCurveReader.ReadFromFile(@"TestData\Components\Truck.vacc");
+ Data = AccelerationCurveReader.ReadFromFile(@"TestData/Components/Truck.vacc");
var result = Data.ComputeDecelerationDistance(v1.KMPHtoMeterPerSecond(), v2.KMPHtoMeterPerSecond());
Assert.AreEqual(expectedDistance, result.Value(), Tolerance);
@@ -159,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
]
public void ComputeEndVelocity(double startSpeed, double accTime, double expectedVelocity)
{
- Data = AccelerationCurveReader.ReadFromFile(@"TestData\Components\Truck.vacc");
+ Data = AccelerationCurveReader.ReadFromFile(@"TestData/Components/Truck.vacc");
var result = Data.ComputeEndVelocityAccelerate(startSpeed.KMPHtoMeterPerSecond(), accTime.SI<Second>());
Assert.AreEqual(expectedVelocity, result.AsKmph, 1e-3);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
index 497bf92dc6563c5e3eeec09fb483aabe51e3ad00..1ea74a71b071fb4a1c5a57aa7f6a6d9441e59a80 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
@@ -44,7 +44,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[Parallelizable(ParallelScope.All)]
public class DistanceCycleDataTest
{
-// public readonly string CycleFile = @"TestData\Cycles\";
+// public readonly string CycleFile = @"TestData/Cycles/";
private const string ResourceNamespace = "TUGraz.VectoCore.Resources.Declaration.";
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index a5bf2b56d4f980d849de32d77779fa204f0e08f3..0d05b3bb03e84f3500ecc7ec03daa4147c563219 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
public void TestLookupTorqueForBatPower(double batPwr, double emSpeed, double expectedTq)
{
var inputProvider =
- JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotor.vem", false);
+ JSONInputDataFactory.ReadElectricMotorData(@"TestData/Hybrids/ElectricMotor/GenericEMotor.vem", false);
var fld = inputProvider.VoltageLevels.First().FullLoadCurve;
var fldMap = ElectricFullLoadCurveReader.Create(fld, 1);
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
public void TestLookupTorqueForBatPower2(double batPwr, double emSpeed)
{
var inputProvider =
- JSONInputDataFactory.ReadElectricMotorData(@"TestData\Hybrids\ElectricMotor\GenericEMotor.vem", false);
+ JSONInputDataFactory.ReadElectricMotorData(@"TestData/Hybrids/ElectricMotor/GenericEMotor.vem", false);
var fld = inputProvider.VoltageLevels.First().FullLoadCurve;
var fldMap = ElectricFullLoadCurveReader.Create(fld, 1);
@@ -74,9 +74,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
}
- [TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_90_fine.vemo", 0.8999, 0.9001),
- TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_90_coarse.vemo", 0.8999, 0.9001),
- TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_std.vemo", 0, 1)]
+ [TestCase(@"TestData/Components/ElectricMotor/vem_P_inverter_DC_90_fine.vemo", 0.8999, 0.9001),
+ TestCase(@"TestData/Components/ElectricMotor/vem_P_inverter_DC_90_coarse.vemo", 0.8999, 0.9001),
+ TestCase(@"TestData/Components/ElectricMotor/vem_P_inverter_DC_std.vemo", 0, 1)]
public void TestInterpolationMethod_PowerMap(string filename, double etaMin, double etaMax)
{
EfficiencyMap emMap;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
index 407d9b8ceea67e32feeefe3d2a3b45de6c765a6a..a76df5dec6dfc93e9a95728a5b685e5fabee2cab 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
@@ -50,16 +50,16 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestCase]
public void TestFuelConsumption_FixedPoints()
{
- var map = FuelConsumptionMapReader.ReadFromFile(@"TestData\Components\24t Coach.vmap");
- var lines = File.ReadAllLines(@"TestData\Components\24t Coach.vmap").Skip(1).ToArray();
+ var map = FuelConsumptionMapReader.ReadFromFile(@"TestData/Components/24t Coach.vmap");
+ var lines = File.ReadAllLines(@"TestData/Components/24t Coach.vmap").Skip(1).ToArray();
AssertMapValuesEqual(lines, map);
}
[TestCase]
public void TestFuelConsumption_InterpolatedPoints()
{
- var map = FuelConsumptionMapReader.ReadFromFile(@"TestData\Components\24t Coach.vmap");
- var lines = File.ReadAllLines(@"TestData\Components\24t CoachInterpolated.vmap").Skip(1).ToArray();
+ var map = FuelConsumptionMapReader.ReadFromFile(@"TestData/Components/24t Coach.vmap");
+ var lines = File.ReadAllLines(@"TestData/Components/24t CoachInterpolated.vmap").Skip(1).ToArray();
AssertMapValuesEqual(lines, map);
}
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
index 9fb8536dcc3715b2a4a1ff9aed75c7e7be424e3f..7cb7b9214b5c98eb4e431a9d3f62d4818dabc190 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[Parallelizable(ParallelScope.All)]
public class FullLoadCurveTest
{
- private const string CoachEngineFLD = @"TestData\Components\24t Coach.vfld";
+ private const string CoachEngineFLD = @"TestData/Components/24t Coach.vfld";
private const double Tolerance = 0.0001;
public static List<string> LogList = new List<string>();
@@ -272,7 +272,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
public void Test_FileRead_WrongFileFormat_InsufficientColumns()
{
AssertHelper.Exception<VectoException>(
- () => FullLoadCurveReader.ReadFromFile(@"TestData\Components\FullLoadCurve insufficient columns.vfld"),
+ () => FullLoadCurveReader.ReadFromFile(@"TestData/Components/FullLoadCurve insufficient columns.vfld"),
"ERROR while reading FullLoadCurve File: Engine FullLoadCurve Data File must consist of at least 3 columns.");
}
@@ -290,10 +290,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
target.Parameters.Add(new MethodCallParameter("${level}"));
target.Parameters.Add(new MethodCallParameter("${message}"));
SimpleConfigurator.ConfigureForTargetLogging(target, LogLevel.Warn);
- FullLoadCurveReader.ReadFromFile(@"TestData\Components\FullLoadCurve wrong header.vfld");
+ FullLoadCurveReader.ReadFromFile(@"TestData/Components/FullLoadCurve wrong header.vfld");
Assert.IsTrue(
LogList.Contains(
- "FullLoadCurve: Header Line is not valid. Expected: \'engine speed, full load torque, motoring torque\', Got: \'n, Mfull, Mdrag, PT1\'. Falling back to column index."),
+ "FullLoadCurve: Header Line is not valid. Expected: 'engine speed, full load torque, motoring torque', Got: 'n, Mfull, Mdrag, PT1'. Falling back to column index."),
string.Join("\n", LogList));
LogList.Clear();
}
@@ -309,7 +309,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestCase]
public void Test_FileRead_NoHeader()
{
- var curve = FullLoadCurveReader.ReadFromFile(@"TestData\Components\FullLoadCurve no header.vfld");
+ var curve = FullLoadCurveReader.ReadFromFile(@"TestData/Components/FullLoadCurve no header.vfld");
var result = curve.FullLoadStationaryTorque(1.SI<PerSecond>());
Assert.AreNotEqual(result.Value(), 0.0);
}
@@ -321,7 +321,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
public void Test_FileRead_InsufficientEntries()
{
AssertHelper.Exception<VectoException>(
- () => FullLoadCurveReader.ReadFromFile(@"TestData\Components\FullLoadCurve insufficient entries.vfld"),
+ () => FullLoadCurveReader.ReadFromFile(@"TestData/Components/FullLoadCurve insufficient entries.vfld"),
"ERROR while reading FullLoadCurve File: FullLoadCurve must consist of at least two lines with numeric values (below file header)");
}
@@ -331,22 +331,22 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var engineData = new CombustionEngineData {
FullLoadCurves =
new Dictionary<uint, EngineFullLoadCurve>() {
- { 0, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") },
- { 1, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") }
+ { 0, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") },
+ { 1, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") }
},
IdleSpeed = 560.RPMtoRad()
};
var gearboxData = new GearboxData();
gearboxData.Gears[1] = new GearData {
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/limited.vtlm", 1, "1"),
Ratio = 1
};
var axleGearData = new AxleGearData() {
AxleGear = new GearData {
Ratio = 1,
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/limited.vtlm", 1, "1"),
}
};
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
index 89c9b129aaa6dbd8895abaecb995cf49eb6b3388..05a86401823f478f7af34177c272f44826f0dedc 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
@@ -48,9 +48,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[Parallelizable(ParallelScope.All)]
public class GearboxDataTest
{
- protected const string GearboxFile = @"Testdata\Components\24t Coach.vgbx";
+ protected const string GearboxFile = @"TestData/Components/24t Coach.vgbx";
- protected const string EngineFile = @"TestData\Components\24t Coach.veng";
+ protected const string EngineFile = @"TestData/Components/24t Coach.veng";
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -81,15 +81,15 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
Assert.AreEqual(13.072, gbxData.Gears[1].LossMap[35].TorqueLoss.Value(), 0.0001);
}
- [TestCase("Test1", @"TestData\Components\24t Coach.vgbx", 520, 20.320, "A", 279698.4, 9401.44062)]
- [TestCase("Test2", @"TestData\Components\24t Coach.vgbx", 520, 0.5858335, "A", 17173.5, 409.773677587509)]
- [TestCase("Test3", @"TestData\Components\24t Coach.vgbx", 520, 0.3996113, "A", 292.5253, 118.282541632652)]
- [TestCase("Test4", @"TestData\Components\24t Coach.vgbx", 520, 5.327739, "A", 57431.12, 2222.78785705566)]
- [TestCase("Test5", @"TestData\Components\24t Coach.vgbx", 520, 5.661779, "A", 73563.93, 2553.00283432007)]
- [TestCase("Test6", @"TestData\Components\24t Coach.vgbx", 520, 14.15156, "A", 212829.5, 6822.16882705688)]
- [TestCase("Test7", @"TestData\Components\24t Coach.vgbx", 520, 14.55574, "A", 15225.52, 4308.41207504272)]
- [TestCase("Test8", @"TestData\Components\24t Coach.vgbx", 520, 4.601774, "A", -1240.225, 1362.09738254547)]
- [TestCase("Test9", @"TestData\Components\24t Coach.vgbx", 520, 3.934339, "A", -698.5989, 1164.5405292511)]
+ [TestCase("Test1", @"TestData/Components/24t Coach.vgbx", 520, 20.320, "A", 279698.4, 9401.44062)]
+ [TestCase("Test2", @"TestData/Components/24t Coach.vgbx", 520, 0.5858335, "A", 17173.5, 409.773677587509)]
+ [TestCase("Test3", @"TestData/Components/24t Coach.vgbx", 520, 0.3996113, "A", 292.5253, 118.282541632652)]
+ [TestCase("Test4", @"TestData/Components/24t Coach.vgbx", 520, 5.327739, "A", 57431.12, 2222.78785705566)]
+ [TestCase("Test5", @"TestData/Components/24t Coach.vgbx", 520, 5.661779, "A", 73563.93, 2553.00283432007)]
+ [TestCase("Test6", @"TestData/Components/24t Coach.vgbx", 520, 14.15156, "A", 212829.5, 6822.16882705688)]
+ [TestCase("Test7", @"TestData/Components/24t Coach.vgbx", 520, 14.55574, "A", 15225.52, 4308.41207504272)]
+ [TestCase("Test8", @"TestData/Components/24t Coach.vgbx", 520, 4.601774, "A", -1240.225, 1362.09738254547)]
+ [TestCase("Test9", @"TestData/Components/24t Coach.vgbx", 520, 3.934339, "A", -698.5989, 1164.5405292511)]
public void TestInterpolation(string testName, string gearboxDataFile, double rDyn, double v, string gear,
double powerGbxOut, double gbxPowerLoss)
{
@@ -345,7 +345,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestCase()]
public void TestLossMapExtension()
{
- var gbxFile = @"TestData\Components\Indirect Gear.vtlm";
+ var gbxFile = @"TestData/Components/Indirect Gear.vtlm";
var lossMapOrig = TransmissionLossMapReader.ReadFromFile(gbxFile, 1.0, "origLossMap");
var extendedMap = TransmissionLossMapReader.ReadFromFile(gbxFile, 1.0, "origLossMap", true);
@@ -373,7 +373,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestCase()]
public void TestAxlegearLossMapExtension()
{
- var lossMapFile = @"TestData\Components\Axle.vtlm";
+ var lossMapFile = @"TestData/Components/Axle.vtlm";
var origLossMap = TransmissionLossMapReader.ReadFromFile(lossMapFile, 3.240355, "AxleOrig");
var extendedLossMap = TransmissionLossMapReader.ReadFromFile(lossMapFile, 3.240355, "AxleExtended", true);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
index f2a89218f47531e03645eebdd7f5cb5d28f53e67..2fda34b83f718f938202d9fdd4e1422c0b486db9 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
@@ -18,7 +18,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[TestFixture]
public class GearshiftLinesVoithTest
{
- public const string File = @"TestData\Components\GearshiftLinesVoith.vgsv";
+ public const string File = @"TestData/Components/GearshiftLinesVoith.vgsv";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
index 2857d8a00c0d5542be77ea0d7d6a5a3fc90068e3..7f76cabcdf984083d4d0c3e327f984d40d81a562 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -242,22 +242,22 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var engineData = new CombustionEngineData {
FullLoadCurves =
new Dictionary<uint, EngineFullLoadCurve>() {
- { 0, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") },
- { 1, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") },
+ { 0, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") },
+ { 1, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") },
},
IdleSpeed = 560.RPMtoRad()
};
var gearboxData = new GearboxData();
gearboxData.Gears[1] = new GearData {
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\Direct Gear.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/Direct Gear.vtlm", 1, "1"),
Ratio = 1
};
var axleGearData = new AxleGearData {
AxleGear = new GearData {
Ratio = 1,
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/limited.vtlm", 1, "1"),
}
};
var vehicleData = new VehicleData {
@@ -320,21 +320,21 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
var engineData = new CombustionEngineData {
FullLoadCurves =
new Dictionary<uint, EngineFullLoadCurve>() {
- { 0, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") },
- { 1, FullLoadCurveReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vfld") }
+ { 0, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") },
+ { 1, FullLoadCurveReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vfld") }
},
IdleSpeed = 560.RPMtoRad()
};
var gearboxData = new GearboxData();
gearboxData.Gears[1] = new GearData {
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\Direct Gear.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/Direct Gear.vtlm", 1, "1"),
Ratio = 1,
};
var axleGearData = new AxleGearData {
AxleGear = new GearData {
- LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"),
+ LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData/Components/limited.vtlm", 1, "1"),
Ratio = 1,
}
};
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs
index f64062636195593244df4a00717ccda9190ae35c..f7042c88afdf60edf3fbe87b21210df915529381 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs
@@ -37,7 +37,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
[Parallelizable(ParallelScope.All)]
public class VehicleDataTest
{
- private const string VehicleDataFile = @"TestData\Components\24t Coach.vveh";
+ private const string VehicleDataFile = @"TestData/Components/24t Coach.vveh";
[TestCase]
public void ReadVehicleFileTest()
diff --git a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
index aab45e2209ee816bda70d84ff2a6a4a83c471c76..3b0347f35340cbc32247496752e708c8c4d0009c 100644
--- a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
@@ -23,11 +23,11 @@ namespace TUGraz.VectoCore.Tests.Models
[Parallelizable(ParallelScope.All)]
public class WHRMapTest
{
- public const string SingleFuelWHRVehicle = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeSingleFuel_WHR.xml";
+ public const string SingleFuelWHRVehicle = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml";
- public const string DualFuelWHRVehicle = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeDualFuel_WHR.xml";
+ public const string DualFuelWHRVehicle = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml";
- public const string EngineeringDualFuelWHRVehicle = @"TestData\XML\XMLReaderEngineering\engineering_job-sample_ref_DF_WHR.xml";
+ public const string EngineeringDualFuelWHRVehicle = @"TestData/XML/XMLReaderEngineering/engineering_job-sample_ref_DF_WHR.xml";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Reports/ActualModalSimulationDataTest.cs b/VectoCore/VectoCoreTest/Reports/ActualModalSimulationDataTest.cs
index 3213a68a56e4bb6e45f9104f907ba10728a1199e..62b11a6f7c1e408891bc324811871bcbde25abad 100644
--- a/VectoCore/VectoCoreTest/Reports/ActualModalSimulationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ActualModalSimulationDataTest.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.Tests.Reports
[TestCase]
public void TestWriteActualModData()
{
- const string jobFile = @"TestData\Integration\DeclarationMode\40t Truck\40t_Long_Haul_Truck.vecto";
+ const string jobFile = @"TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto";
var fileWriter = new FileOutputWriter(jobFile);
var sumData = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumData);
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index 28c966f34c055f2e50cd1c369d4b043bad60488b..24d2d07a1666971881a1ed2dca40f948330e5fd6 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -135,21 +135,21 @@ namespace TUGraz.VectoCore.Tests.Reports
}
[Category("LongRunning")]
- [TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto")]
+ [TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto")]
public void TestFullCycleModDataIntegrityDeclMT(string jobName)
{
RunSimulation(jobName, ExecutionMode.Declaration);
}
[Category("LongRunning")]
- [TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_DECL.vecto")]
+ [TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_DECL.vecto")]
public void TestFullCycleModDataIntegrityDeclESS(string jobName)
{
RunSimulation(jobName, ExecutionMode.Declaration);
}
[Category("LongRunning")]
- [TestCase(@"TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto")]
+ [TestCase(@"TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload.vecto")]
public void TestFullCycleModDataIntegrityDecl_P1ESS(string jobName)
{
RunSimulation(jobName, ExecutionMode.Engineering);
@@ -159,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Reports
[TestCase]
public void Test_P1_PCC_ESSOn_EssOff()
{
- var jobName = @"TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto";
+ var jobName = @"TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload.vecto";
var fileWriter = new FileOutputWriter(jobName);
var sumData = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumData);
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Tests.Reports
run.Run();
Assert.IsTrue(run.FinishedWithoutErrors);
- jobName = @"TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload_ESSoff.vecto";
+ jobName = @"TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload_ESSoff.vecto";
fileWriter = new FileOutputWriter(jobName);
inputData = JSONInputDataFactory.ReadJsonJob(jobName);
runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputData, fileWriter);
@@ -200,7 +200,7 @@ namespace TUGraz.VectoCore.Tests.Reports
- [TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto")]
+ [TestCase(@"TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto")]
public void TestVSUM_VMOD_FormatDecl(string jobName)
{
RunSimulation(jobName, ExecutionMode.Declaration);
@@ -212,16 +212,16 @@ namespace TUGraz.VectoCore.Tests.Reports
}
[Category("LongRunning")]
- [TestCase(@"TestData\Integration\EngineeringMode\Class2_RigidTruck_4x2\Class2_RigidTruck_ENG.vecto"),
- TestCase(@"TestData\Integration\EngineeringMode\Class5_Tractor_4x2\Class5_Tractor_ENG.vecto"),
- TestCase(@"TestData\Integration\EngineeringMode\Class9_RigidTruck_6x2_PTO\Class9_RigidTruck_ENG_PTO.vecto"),]
+ [TestCase(@"TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto"),]
public void TestFullCycleModDataIntegrityMT(string jobName)
{
RunSimulation(jobName, ExecutionMode.Engineering);
}
- [TestCase(@"TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml", 1, 1.0),
- TestCase(@"TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml", 7, 1.0)
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml", 1, 1.0),
+ TestCase(@"TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml", 7, 1.0)
]
public void TractionInterruptionTest(string filename, int idx, double expectedTractionInterruption)
{
@@ -302,7 +302,7 @@ namespace TUGraz.VectoCore.Tests.Reports
[Category("LongRunning")]
- [TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto")]
+ [TestCase(@"TestData/Integration/VTPMode/GenericVehicle/class_5_generic vehicle.vecto")]
public void TestVTPModeDataIntegrity(string jobName)
{
RunSimulation(jobName, ExecutionMode.Engineering);
@@ -395,7 +395,7 @@ namespace TUGraz.VectoCore.Tests.Reports
jobContainer.WaitFinished();
// mod files will be stored in e.g.
- // VectoCoreTest\bin\Debug\TestData\Integration\EngineeringMode\Class2_RigidTruck_4x2\Class2_RigidTruck_ENG.vecto_00.vmod
+ // VectoCoreTest/bin/Debug/TestData/Integration/EngineeringMode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto_00.vmod
//fileWriter.WriteModData(Path.GetFileName(jobName), "0", "0", modData[0].Item1);
//fileWriter.WriteModData(Path.GetFileName(jobName), "1", "1", modData[1].Item1);
@@ -846,8 +846,8 @@ namespace TUGraz.VectoCore.Tests.Reports
[Category("LongRunning")]
[
- TestCase(@"TestData\Integration\EngineeringMode\CityBus_AT\CityBus_AT_Ser.vecto"),
- TestCase(@"TestData\Integration\EngineeringMode\CityBus_AT\CityBus_AT_PS.vecto")]
+ TestCase(@"TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_Ser.vecto"),
+ TestCase(@"TestData/Integration/EngineeringMode/CityBus_AT/CityBus_AT_PS.vecto")]
public void TestFullCycleModDataIntegrityAT(string jobName)
{
var fileWriter = new FileOutputWriter(jobName);
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index 0a41b4ca68956e2402be373b191d70f267f6ead8..3879f19dbeedc5946b0cb8fe78ac5e54f4db8cb3 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.Tests.Reports
EngineData = new CombustionEngineData() {
Fuels = new[] {new CombustionEngineFuelData {
FuelData = FuelData.Diesel,
- ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vmap")
+ ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vmap")
}}.ToList(),
IdleSpeed = 600.RPMtoRad()
},
@@ -161,7 +161,7 @@ namespace TUGraz.VectoCore.Tests.Reports
EngineData = new CombustionEngineData() {
Fuels = new[] {new CombustionEngineFuelData {
FuelData = FuelData.Diesel,
- ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData\Components\12t Delivery Truck.vmap")
+ ConsumptionMap = FuelConsumptionMapReader.ReadFromFile(@"TestData/Components/12t Delivery Truck.vmap")
}}.ToList(),
IdleSpeed = 600.RPMtoRad()
},
@@ -225,7 +225,7 @@ namespace TUGraz.VectoCore.Tests.Reports
[TestCase]
public void TestSumDataMetaInformation()
{
- var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
+ var jobfile = @"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
@@ -285,7 +285,7 @@ namespace TUGraz.VectoCore.Tests.Reports
{
- var jobFile = @"TestData\Integration\DeclarationMode\Class5_Vocational\Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
+ var jobFile = @"TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
var modFilename = Path.Combine(Path.GetDirectoryName(jobFile), "VEH-Class5_ConstructionReferenceLoad_sim.vmod");
@@ -316,7 +316,7 @@ namespace TUGraz.VectoCore.Tests.Reports
{
- var jobFile = @"TestData\Integration\DeclarationMode\Class5_Vocational\Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
+ var jobFile = @"TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml";
var sumFilename = Path.Combine(Path.GetDirectoryName(jobFile), "Tractor_4x2_vehicle-class-5_EURO6_2018.vsum");
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/3speedEV.vgbx b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/3speedEV.vgbx
index 2899660e38bff86e3e841df4b2b7ad87aaaca0b0..4c334154d3c8f0bfa309ea5eb56cd14cfd16fb2e 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/3speedEV.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/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_2.vtlm",
+ "LossMap": "Transmission//Gear_2.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
},
{
"Ratio": 2.48,
- "LossMap": "Transmission\\Gear_3.vtlm",
+ "LossMap": "Transmission//Gear_3.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
index e2f6ed93a6696a8fa7aae1ebba919c150f420657..bfc46d48e4ee6c970fa4b965fe118f593ebf0ab1 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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": 3540.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
index ad0c66fd9de8f64feb647900fa7e0c9a56874fda..5176638b8bf7ba204ea70467e959d3a2797d3708 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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": 3540.0,
"BusAux": "PEV-BusAux.vaux",
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
index 04b69288e4334d0eab87a44a8ebf08d585b80282..359709316b33a9da556e97ee117c1a0317f2dd84 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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": 3540.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_A.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_A.vaux
index 451e0e22b4a2945027bdb31013dde1d705040f70..7969ff4ced65a7bc53aea6bfffbbb01fcf9ce1ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_A.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_A.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1.0
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_B.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_B.vaux
index 0133ea98fb7fdf9902d631ddc503e27cb63e714f..14ac55ae1d1d00c7d6165c4222f8a23c4bdd7b4b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_B.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_B.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C1.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C1.vaux
index f0a810ce842ec325c9a185c402c87553aa805aa4..44356ec144727ae6e32df3f8690c9d35ab373e30 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C1.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C1.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2a.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2a.vaux
index 1a8fcdbe522e39cadb2e2976b1315a35996f6d75..58c87b37872da90e0e6dd74e33a13d6d95e6843c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2a.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2a.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2b.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2b.vaux
index 48f2d8083ed02f4a903035f829c93be9a5ba05a3..01fa674b7729a73874aa95a1d9e42584514d0a85 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2b.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C2b.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3a.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3a.vaux
index ce126abede42e2dc45a192f3a7b8ec5e956ce9d0..af8cabca6742e823781fffb44463b5aa8d8d01fb 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3a.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3a.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3b.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3b.vaux
index 438fac1b730926133df8777fa450cf892d2160b1..787a93b1e52b6fbda7746bb44a4d49185195e841 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3b.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/BusAuxData_C3b.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C1.vecto
index c952f56090d9120379fca91c109d77cabd5b060d..b4d999fd94df72d66bc28aab806c321a9e495424 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C1.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "InterurbanBus_P1.vveh",
"EngineFile": "Engine_250kW_7.7l.veng",
"GearboxFile": "MT_6_Bus.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"BusAux": "BusAuxData_C1.vaux",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2a.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2a.vecto
index cc67cb6801fbd9305b7804bea921e6a8c6606ce9..de05ad0aade51de03e9210b415b20ede6349e32f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2a.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2a.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "InterurbanBus_P1.vveh",
"EngineFile": "Engine_250kW_7.7l.veng",
"GearboxFile": "MT_6_Bus.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"BusAux": "BusAuxData_C2a.vaux",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2b.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2b.vecto
index 0feb9fff260ac0997dbb690cb6166f206cf1849e..9dd18e1ff6934426dab3a053f76c81b84a5a8a2d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C2b.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "InterurbanBus_P1.vveh",
"EngineFile": "Engine_250kW_7.7l.veng",
"GearboxFile": "MT_6_Bus.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"BusAux": "BusAuxData_C2b.vaux",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3a.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3a.vecto
index d0841ef3f37948b4b0d06a93cde70044e369067a..d59228912b238d7eaa08227470dd25bb1b09bda2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3a.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3a.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "InterurbanBus_P1.vveh",
"EngineFile": "Engine_250kW_7.7l.veng",
"GearboxFile": "MT_6_Bus.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"BusAux": "BusAuxData_C3a.vaux",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3b.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3b.vecto
index 883bad6c738b576c8e764d3d26aa806c64b9f2bc..32ceafcc52affd2a5a363b6c7550280640855771 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_C3b.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "InterurbanBus_P1.vveh",
"EngineFile": "Engine_250kW_7.7l.veng",
"GearboxFile": "MT_6_Bus.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"BusAux": "BusAuxData_C3b.vaux",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vecto
index ee92960bc2d0fc10983c453c15a98d5d78573dbd..6acd558be645fba7d41df0ae3911262a929a3f4c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Citybus_P1-APT-P-220kW-7.7l/CityBus_AT-P.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "CityBus_AT-P.vveh",
"EngineFile": "GenericICE_220kW_7.7l.veng",
"GearboxFile": "GearboxAT-P.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.ATShiftStrategyOptimized",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"AuxiliaryAssembly": "Classic",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
index 252c083c7a8938574fe38a0fbeeec5076a68b979..b69c3d9bb8081f44e1396f78a6228f03ae868540 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/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/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5 2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5 2.vecto
index 724d53cd934ea939117cc0c0c5584d66d71283be..4e506675d55c49eecddae36c588270aa191b4fdc 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5 2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5 2.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV_2.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12_P2.5.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle//Group5_HEV_2.vveh",
+ "EngineFile": "VKM//Engine_325kW_12.7l.veng",
+ "GearboxFile": "Transmission//AMT_12_P2.5.vgbx",
+ "TCU": "Transmission//AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5.vecto
index adb36a678bc27b5d59f9a22b8effac29b7a2c727..41c706acfe217df3f513a6a99bdaa4c3e6dd8d7f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/P2.5 Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle//Group5_HEV.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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh
index f5f6ad4d1e032dbea0c0204d922939a54b198e8b..3ea87a2f5e5948ef32bbb181b3046bc21514de75 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/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",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2_5",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh
index 1f9520e3c33d5ba46ec0db3d0b58da6e184b80b8..ad05e066aef5b28fae31ec909d8ec393a3ae4833 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/Vehicle/Group5_HEV_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": 3.077,
"MechanicalEfficiency": 0.98,
"Position": "P2_5",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_30kW_50Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_30kW_50Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
index adb36a678bc27b5d59f9a22b8effac29b7a2c727..41c706acfe217df3f513a6a99bdaa4c3e6dd8d7f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Vehicle\\Group5_HEV.vveh",
- "EngineFile": "VKM\\Engine_325kW_12.7l.veng",
- "GearboxFile": "Transmission\\AMT_12.vgbx",
- "TCU": "Transmission\\AMT_12.vgbx",
+ "VehicleFile": "Vehicle//Group5_HEV.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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
index 42fdbf0103047a292213e1afae9a1eeaef025236..0392aed151de85ea7426a82bf8bec176788d1d05 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_WHR.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_WHR.vecto
index da386bfad4e31b71e758d1648f6d02015b0690c0..72369c8588a2a1de87b474e6bbf7c21878f1612e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_WHR.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_WHR.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
index 472aaad9c430241cbf28c43416269f415f07a87f..3b72b99f60b0affd610ba7d241defb86e51e726e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
index e8f271de2ae37eaecfdfecba2235992ede62a6c3..9de05eaf4de9ec3b80d5246aba3029a0fd0ef3ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimit.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
index 4fa9f54feca1c0802fd3b1dce46f496b2dd760c4..09e66c24f9c1c9ab5d1d25027b6f9027eed39bcd 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingAndGbxLimitTopTorque.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimit.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimit.vecto
index 190ef24265d5a5a04f0f18e06310088f53b5bbc7..ef7116945a762a27b32dab3d550f2ed35f1bf3ac 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimit.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
index 9c60f95e83d3d13655113410938ff9eb74b8e527..9ecf9ae680668a5596e08df6e35a974de9abca3c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_BoostingLimitTopTorque.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
index 37856609a0449cae5ff95580c3d0240a76d4f6b4..fb8861b06d6488f377ac84f1eb31f615df5b0d0f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
index f015c11d54033a451af596d94a9c32a2566db4f8..06297f23cda2bf42c1b6cd12dc94e83013777eac 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_GbxTqLimit.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_GbxTqLimit.vecto
index 2fed58464c3fc7ca09dae981ecc889c17f12bd60..664235fce20fbe9e39d8c4f35b3d598455225ad6 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_GbxTqLimit.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_GbxTqLimit.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
index 4be223cd7fb3699f858a72f1c610d56afde04a5b..59ec64279e4975324c84300d93b17cc7bbf8b6b1 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
index ce2bc81bc5e273d353e1720486c29accecc4208f..934950879c70df0cf91e02df078cf264c0882d0d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
index 169dbca4154c2b3411820c6f84dd2e9cac6d1808..7a5267f1a8ebf541d2293cbc82cd4a2fd25603fa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\Inputdaten P2 Group 5\\Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "ElectricMotor//Inputdaten P2 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": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
index 21f48b43a33171c7fde954f93f5a3df4360dde48..132a32e96280c3a5b558a838e8bb6f97c50e0560 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh
index 5c848bed496e129bbda7dd82d706f82ee0958f72..182313e0eea15b6855446cf281ac68a27545750f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
index 34fa21cb6c4bdb23d91f8142459826b5c88235b6..ddb34929eea616464bfa84667fbc5a34d74e75d2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
index 57a6896f41dd80db873fd2367e3d722300d9da58..6ac3a6f7e576fe3611544363fe97c322f490f5ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
index 9494e16c98bbec9263894c3d6ef5fa14d702782a..71fdf5fa92e121aa3daaa22ff04dffcd70fe5ee3 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_EMLossMap_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
index f7e5fa481027ebb6066e0091ddd8cddc09b900c1..4ced5a01966a4023c07288dbffb117b828d9d446 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitEMTorqueDrive.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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",
@@ -99,12 +99,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 1.0,
"Position": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 0055426ec2eb5ce31a937b850234aed08cab49ce..41aa5ff28cd2eb7c0742598da699bf27368d774a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
index 2f481ca5a99a17e79b152b2afe48c4ef5e885aef..438045c38dedaac1b71d2e1ea3e8a8b9ddff23d5 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
index 5903da3fb6ce7d9b99052aa9a97fff566eba7cff..81f5d22171501e22ff3e34a05ffe1e84edf4ffe0 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_LimitVehiclePropTq_TopTorque.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf69847557b9db61358c2229c71339b83..eb784a8113ff40006a136c5ec10d31b1029dc389 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto
index 53cee382a6e610f411ae4d65be4ca78e6d811022..ca7d27f901cde5393a806bdee24d656e8dd8f875 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\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/Hybrids/GenericVehicle_Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
index dff8331f0880637b08c0304f9b17d85e86fc46ce..05b706d9afefef443bfaff7ae6fbe910603e4d1d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/P3 Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\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/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh
index 963fff4dd0b55ce0dedcee406fb4ff92b935cf36..19650014545250c72f560d5f5f126d3e8d6b1091 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 7dcc15b80d9c741e62d5fd1ced4bba3f55143ce3..bfd8ad2cb669a324eae5f4748d6a497e63da7c22 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5.vecto
index 3d25e195c89c43127ce22cda6ab7c92348617711..7942393b21211c87f4b9d7f49abef136a2709246 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW.vecto
index 53b827d8390cf04b8a001ff81be9cde0181659bc..b38f1d893a6f390ab8cc3a551b44f88e946e40b2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
index 08a4bec555dbe607af3348ff2dd0265a703ddb45..1881fda6ec60400461ddc2a498ca28e9204fcc44 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_325kW_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
index 6a5c77bf2be5dc32fc8814bbccf675ace7d3cf7f..07bff5e6751b7453e4ce834ae2dd87829ec53125 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitEMTorqueDrive.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
index 6a0601cfe9048fa005cff8905e17341365356fd0..f66daf99c3409ec88baa2e2fd5990891f3597ae0 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_noESS.vecto
index b477924495765b9abcb4ed5e37310a8e7a3bc82a..4c278ea3e4002c0e32fc05bf218bbcbb0d2397ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/P3 APT Group 5_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh
index 963fff4dd0b55ce0dedcee406fb4ff92b935cf36..19650014545250c72f560d5f5f126d3e8d6b1091 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
index 28ec6d171fb51b1cd5611c80640e62c1ee141d99..49f499063a615f3383ff465da83d9be72c776b03 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 4b79088cb790d3ca4831324b1538f24e587e87d2..e2a30dbc83f7e24941accde9bc2aad4d411a1a7f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf69847557b9db61358c2229c71339b83..eb784a8113ff40006a136c5ec10d31b1029dc389 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5.vecto
index 53cee382a6e610f411ae4d65be4ca78e6d811022..ca7d27f901cde5393a806bdee24d656e8dd8f875 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\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/Hybrids/GenericVehicle_Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
index dff8331f0880637b08c0304f9b17d85e86fc46ce..05b706d9afefef443bfaff7ae6fbe910603e4d1d 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/P4 Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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\\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/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh
index 062b673831e995a8dcdf0e99b6f369ee0b8fc229..75d13001b7bb8a15c798de07bb09b8b9f7c72ab8 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
index 628f825994109762a7553daf77c82e66ba3d9d3b..e6d999001634b7177d9e69401fb83e3d73391425 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4/Vehicle/Group5_HEV_LimitVehiclePropTq.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_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\\Inputdaten P3 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5.vecto
index 3d25e195c89c43127ce22cda6ab7c92348617711..7942393b21211c87f4b9d7f49abef136a2709246 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW.vecto
index 53b827d8390cf04b8a001ff81be9cde0181659bc..b38f1d893a6f390ab8cc3a551b44f88e946e40b2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW_noESS.vecto
index 08a4bec555dbe607af3348ff2dd0265a703ddb45..1881fda6ec60400461ddc2a498ca28e9204fcc44 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_325kW_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
index 6a5c77bf2be5dc32fc8814bbccf675ace7d3cf7f..07bff5e6751b7453e4ce834ae2dd87829ec53125 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitEMTorqueDrive.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
index 6a0601cfe9048fa005cff8905e17341365356fd0..f66daf99c3409ec88baa2e2fd5990891f3597ae0 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_LimitVehiclePropTq.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_noESS.vecto
index b477924495765b9abcb4ed5e37310a8e7a3bc82a..4c278ea3e4002c0e32fc05bf218bbcbb0d2397ba 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/P4 APT Group 5_noESS.vecto
@@ -8,19 +8,19 @@
"Body": {
"SavedInDeclMode": false,
"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/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh
index 1f6a673ed5f296837f228328a3fe4050227f46ce..9bb9d4e425ea6c2f4694d0006338900f06e06d76 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_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 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh
index 28ec6d171fb51b1cd5611c80640e62c1ee141d99..49f499063a615f3383ff465da83d9be72c776b03 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_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 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
index 4b79088cb790d3ca4831324b1538f24e587e87d2..e2a30dbc83f7e24941accde9bc2aad4d411a1a7f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_325kW_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_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 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P3 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P3 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh
index b685e31cf69847557b9db61358c2229c71339b83..eb784a8113ff40006a136c5ec10d31b1029dc389 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P4_APT/Vehicle/Group5_HEV_noESS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_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": "P2",
- "MotorFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericEMotor_140kW_936Nm.vem"
+ "MotorFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericEMotor_140kW_936Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "..\\ElectricMotor\\Inputdaten P2 Group 5\\Electric components\\GenericBattery_10kWh_658V.vbat"
+ "BatteryFile": "..//ElectricMotor//Inputdaten P2 Group 5//Electric components//GenericBattery_10kWh_658V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
index da298c61453badf19327e05225f977e4095ae6d6..7b135920e6094f821fcbef3d571c1b3ff75ecf07 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "CityBus_AT_PS.vveh",
"EngineFile": "Engine_175kW_6.8l.veng",
"GearboxFile": "GearboxPowerSplit.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"AuxiliaryAssembly": "Classic",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
index 622c3ac43e7fefc01a4bc542febc2a54e3d88942..5bb38d4aa69cd06070cdc861941850e5608f80fc 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "CityBus_AT_Ser.vveh",
"EngineFile": "Engine_175kW_6.8l.veng",
"GearboxFile": "GearboxSerial.vgbx",
- "TCU": "ShiftPArameters.vtcu",
+ "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"HybridStrategyParams": "HybridStrategyParams.vhctl",
"AuxiliaryAssembly": "Classic",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/3speedEV.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/3speedEV.vgbx
index 2899660e38bff86e3e841df4b2b7ad87aaaca0b0..4c334154d3c8f0bfa309ea5eb56cd14cfd16fb2e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/3speedEV.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/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_2.vtlm",
+ "LossMap": "Transmission//Gear_2.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
},
{
"Ratio": 2.48,
- "LossMap": "Transmission\\Gear_3.vtlm",
+ "LossMap": "Transmission//Gear_3.vtlm",
"ShiftPolygon": "",
"MaxTorque": "",
"MaxSpeed": ""
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
index e2f6ed93a6696a8fa7aae1ebba919c150f420657..bfc46d48e4ee6c970fa4b965fe118f593ebf0ab1 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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": 3540.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vecto
index d7242d7e178c9a7379b5ca3f90d8cc614d643fbf..bb307ba9160bd86ec49aaac668fb840bea46fae2 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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.veng",
"HybridStrategyParams": "Hybrid_Parameters.vhctl",
"Padd_electric": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_WHR.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_WHR.vecto
index 2c635724b1359856a424222478c104d0630df138..5bfcb09cc63d66fbb3b5590ac649733ec57a1b2e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_WHR.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_WHR.vecto
@@ -9,8 +9,8 @@
"SavedInDeclMode": false,
"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/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
index 76541515b31af5b12d51ee02053bcf7fb07c9da1..ec54ecb03fbb21261ec3213938f5fcb7ff018d3c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
"ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
- "HybridStrategyParams": "Electric components\\Hybrid_Parameters.vhctl",
+ "HybridStrategyParams": "Electric components//Hybrid_Parameters.vhctl",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_HEV_P2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_HEV_P2.vveh
index 4aa2db17884fcda0f26eb780b92d34f9f9ccd90a..ffa701b4c48c264f954097cdb3937c920bc96c68 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_HEV_P2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_HEV_P2.vveh
@@ -79,12 +79,12 @@
"Ratio": 1.0,
"MechanicalEfficiency": 0.98,
"Position": "P2",
- "MotorFile": "Electric components\\GenericEMotor_150kW_998Nm.vem"
+ "MotorFile": "Electric components//GenericEMotor_150kW_998Nm.vem"
}
],
"Battery": {
"NumPacks": 1,
- "BatteryFile": "Electric components\\GenericBattery_10kWh_600V.vbat"
+ "BatteryFile": "Electric components//GenericBattery_10kWh_600V.vbat"
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor_ENG.vecto
index a025dc169adbe68d0942e7efe4cb8d26c74f67ff..c1afe38f6f65a114f74d0e9efca46c6e7b52c752 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5EcoRollEng/Class5_Tractor_ENG.vecto
@@ -42,16 +42,16 @@
"OverSpeed": 2.5
},
"Cycles": [
- "DriveDHSl1.1.vdri",
- "DriveDHSl1.1_Uh0.1.vdri",
- "DriveDHSl1.3.vdri",
+ "DriveDhSl1.1.vdri",
+ "DriveDhSl1.1_Uh0.1.vdri",
+ "DriveDhSl1.3.vdri",
"DriveDhSl0.8.vdri",
"DriveDhSl1.5.vdri",
- "DriveDHSl1.1_Stop.vdri",
- "DriveDHSl1.1_TS--.vdri",
- "DriveDHSl1.1_TS-.vdri",
- "DriveDHSl1.1_TS+.vdri",
- "DriveDHSl1.1_TS++.vdri"
+ "DriveDhSl1.1_Stop.vdri",
+ "DriveDhSl1.1_TS--.vdri",
+ "DriveDhSl1.1_TS-.vdri",
+ "DriveDhSl1.1_TS+.vdri",
+ "DriveDhSl1.1_TS++.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
index 2445ad02f59daea4485e9098af8d3aaa1cf1bd28..5cabe4c372a9df1d0278167a6963acfdae04d4e8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class5_Class-5_5t0">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
index a37b6e8eb9600dc990a1307139b784d8cebf0245..526705e10b9fabaa822b3c22b4a971eebecb8af6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRollEngineStop.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRollEngineStop.xml
index 55b52a8b8103612a17ee5206a78b826e9d88de71..db583fdc100b53d490d56ab5b2fae4171a131f71 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRollEngineStop.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRollEngineStop.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRollEngineStop">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EngineStopStart.xml
index eccb769b78f587994ce7c52a1a733d2eb2cadea8..96c59e1bd0ded37c500b6fd84ffb716889b4318c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EngineStopStart.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
index eb02d9921c9daa5dbb3d911e703fe2fd14524693..11982b5a5567f9c18d9a734d2d4db56cb3499b59 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class9_AT_EcoRoll" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
index 1dce2edb9831019936c1d68df1201c89b369f691..6304ef80a0bdb92f7ee9fb13333b68d2fe0be3a7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EcoRoll">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EngineStopStart.xml
index 2e489740785e0ec68309517d0e6b9a0a7c94a922..58ff4c13d6dd1413e08aa5e0364de8d0ed0e2094 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EngineStopStart.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EngineStopStart">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_PCCEcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_PCCEcoRoll.xml
index bdfd833130ebaff44991bc322607ea2ddae29686..7c009dc61292f851180338c8b3f59143394aa6ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_PCCEcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_PCCEcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_Class-9_9t0_PCCEcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
index 95df3eed8582bdcbbb3a084fc862c754de4bca2a..e41d5b37985e3e91ee7d49e828a74a33021edf41 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
@@ -39,17 +39,17 @@
"UnderSpeed": 5.0
},
"Cycles": [
- "DriveDHSl1.8.vdri",
- "DriveDHSl1.8_Uh0.1.vdri",
- "DriveDHSl1.9.vdri",
+ "DriveDhSl1.8.vdri",
+ "DriveDhSl1.8_Uh0.1.vdri",
+ "DriveDhSl1.9.vdri",
"DriveDhSl1.2.vdri",
"DriveDhSl2.5.vdri",
- "DriveDHSl1.9_Stop.vdri",
- "DriveDHSl1.9_TS--.vdri",
- "DriveDHSl1.9_TS-.vdri",
- "DriveDHSl1.9_TS+.vdri",
- "DriveDHSl1.9_TS++.vdri",
- "DriveDHSl1.2.vdri"
+ "DriveDhSl1.9_Stop.vdri",
+ "DriveDhSl1.9_TS--.vdri",
+ "DriveDhSl1.9_TS-.vdri",
+ "DriveDhSl1.9_TS+.vdri",
+ "DriveDhSl1.9_TS++.vdri",
+ "DriveDhSl1.2.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
index 1964d3e3932669f341369c8eba7894ce7c0ca220..a04bc4cd3e072abe05d5daab4f9b26e8118f2ef8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
@@ -39,16 +39,16 @@
"UnderSpeed": 5.0
},
"Cycles": [
- "DriveDHSl1.8.vdri",
- "DriveDHSl1.8_Uh0.1.vdri",
- "DriveDHSl1.9.vdri",
+ "DriveDhSl1.8.vdri",
+ "DriveDhSl1.8_Uh0.1.vdri",
+ "DriveDhSl1.9.vdri",
"DriveDhSl1.2.vdri",
"DriveDhSl2.5.vdri",
- "DriveDHSl1.9_Stop.vdri",
- "DriveDHSl1.9_TS--.vdri",
- "DriveDHSl1.9_TS-.vdri",
- "DriveDHSl1.9_TS+.vdri",
- "DriveDHSl1.9_TS++.vdri"
+ "DriveDhSl1.9_Stop.vdri",
+ "DriveDhSl1.9_TS--.vdri",
+ "DriveDhSl1.9_TS-.vdri",
+ "DriveDhSl1.9_TS+.vdri",
+ "DriveDhSl1.9_TS++.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
index 9fefa74b7795324aa80223f1cf0ea07078ba1672..c7a3ab74abe9f3a8af9e513464f35643c6ba2609 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
@@ -48,16 +48,16 @@
"OverSpeed": 2.5
},
"Cycles": [
- "DriveDHSl1.1.vdri",
- "DriveDHSl1.1_Uh0.1.vdri",
- "DriveDHSl1.4.vdri",
+ "DriveDhSl1.1.vdri",
+ "DriveDhSl1.1_Uh0.1.vdri",
+ "DriveDhSl1.4.vdri",
"DriveDhSl0.8.vdri",
"DriveDhSl1.7.vdri",
- "DriveDHSl1.1_Stop.vdri",
- "DriveDHSl1.1_TS--.vdri",
- "DriveDHSl1.1_TS-.vdri",
- "DriveDHSl1.1_TS+.vdri",
- "DriveDHSl1.1_TS++.vdri"
+ "DriveDhSl1.1_Stop.vdri",
+ "DriveDhSl1.1_TS--.vdri",
+ "DriveDhSl1.1_TS-.vdri",
+ "DriveDhSl1.1_TS+.vdri",
+ "DriveDhSl1.1_TS++.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
index 95df3eed8582bdcbbb3a084fc862c754de4bca2a..e41d5b37985e3e91ee7d49e828a74a33021edf41 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
@@ -39,17 +39,17 @@
"UnderSpeed": 5.0
},
"Cycles": [
- "DriveDHSl1.8.vdri",
- "DriveDHSl1.8_Uh0.1.vdri",
- "DriveDHSl1.9.vdri",
+ "DriveDhSl1.8.vdri",
+ "DriveDhSl1.8_Uh0.1.vdri",
+ "DriveDhSl1.9.vdri",
"DriveDhSl1.2.vdri",
"DriveDhSl2.5.vdri",
- "DriveDHSl1.9_Stop.vdri",
- "DriveDHSl1.9_TS--.vdri",
- "DriveDHSl1.9_TS-.vdri",
- "DriveDHSl1.9_TS+.vdri",
- "DriveDHSl1.9_TS++.vdri",
- "DriveDHSl1.2.vdri"
+ "DriveDhSl1.9_Stop.vdri",
+ "DriveDhSl1.9_TS--.vdri",
+ "DriveDhSl1.9_TS-.vdri",
+ "DriveDhSl1.9_TS+.vdri",
+ "DriveDhSl1.9_TS++.vdri",
+ "DriveDhSl1.2.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
index 1964d3e3932669f341369c8eba7894ce7c0ca220..a04bc4cd3e072abe05d5daab4f9b26e8118f2ef8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
@@ -39,16 +39,16 @@
"UnderSpeed": 5.0
},
"Cycles": [
- "DriveDHSl1.8.vdri",
- "DriveDHSl1.8_Uh0.1.vdri",
- "DriveDHSl1.9.vdri",
+ "DriveDhSl1.8.vdri",
+ "DriveDhSl1.8_Uh0.1.vdri",
+ "DriveDhSl1.9.vdri",
"DriveDhSl1.2.vdri",
"DriveDhSl2.5.vdri",
- "DriveDHSl1.9_Stop.vdri",
- "DriveDHSl1.9_TS--.vdri",
- "DriveDHSl1.9_TS-.vdri",
- "DriveDHSl1.9_TS+.vdri",
- "DriveDHSl1.9_TS++.vdri"
+ "DriveDhSl1.9_Stop.vdri",
+ "DriveDhSl1.9_TS--.vdri",
+ "DriveDhSl1.9_TS-.vdri",
+ "DriveDhSl1.9_TS+.vdri",
+ "DriveDhSl1.9_TS++.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
index a37b6e8eb9600dc990a1307139b784d8cebf0245..526705e10b9fabaa822b3c22b4a971eebecb8af6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
index 55b52a8b8103612a17ee5206a78b826e9d88de71..db583fdc100b53d490d56ab5b2fae4171a131f71 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRollEngineStop">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
index eccb769b78f587994ce7c52a1a733d2eb2cadea8..96c59e1bd0ded37c500b6fd84ffb716889b4318c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
index eb02d9921c9daa5dbb3d911e703fe2fd14524693..11982b5a5567f9c18d9a734d2d4db56cb3499b59 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class9_AT_EcoRoll" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
index 1dce2edb9831019936c1d68df1201c89b369f691..6304ef80a0bdb92f7ee9fb13333b68d2fe0be3a7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EcoRoll">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
index 2e489740785e0ec68309517d0e6b9a0a7c94a922..58ff4c13d6dd1413e08aa5e0364de8d0ed0e2094 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EngineStopStart">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
index bdfd833130ebaff44991bc322607ea2ddae29686..7c009dc61292f851180338c8b3f59143394aa6ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_Class-9_9t0_PCCEcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData.vaux b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData.vaux
index 451e0e22b4a2945027bdb31013dde1d705040f70..7969ff4ced65a7bc53aea6bfffbbb01fcf9ce1ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1.0
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES-SmartPS.vaux b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES-SmartPS.vaux
index 60ef858454419a9b04ebd773b95011a2b59a82e8..2244b3e28fb3b860ff02cda96f87c20ce00f8fab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES-SmartPS.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES-SmartPS.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": true,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES.vaux b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES.vaux
index 0133ea98fb7fdf9902d631ddc503e27cb63e714f..14ac55ae1d1d00c7d6165c4222f8a23c4bdd7b4b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartES.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": false,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartPS.vaux b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartPS.vaux
index 3f1f112b1a8d3d3bbebb7691c796f2cfa0a2789b..01c88f3b6573bf48ef284ccba783d349881b242a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartPS.vaux
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/EngineeringMode/BusAuxData_SmartPS.vaux
@@ -7,7 +7,7 @@
},
"Body": {
"PneumaticSystem": {
- "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp",
+ "CompressorMap": "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP",
"AverageAirDemand": 0.7663,
"SmartAirCompression": true,
"GearRatio": 1
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 2abcc0a6799026518aea6383501a518c7a206a5a..c4aee40620c41c80030de941e35c54dfbe5b36a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index dbdda181ffeb2f7b0cecb5b5bbd23ae5c7cd8288..78e2fde21cf992004b77cc370ea0aad77c1d94b6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
@@ -5,7 +5,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index 65e0097fe1b5ddf4cc66a9dba38794c2838219c9..f20ae6c1206068404d5b5995ca48628b385c0012 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-04fd187f166a4d89aa84">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index e7407b8a112453950acd3890e4045eb8806f3f07..a3aa3fc4a423e87f48ff1850f7aee30f9f430a64 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index d8f8622df505c2bed7a448fed7c8ebdaea3fe3ff..ec35d984492bbe7a086587a2bd387197a517009b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart_ATP" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 7b67c6a129caa3df120c394dc5ac61f15802c808..4e0d11be6425c413f414927a2de45ba6fdb70454 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
index fc6870eeb4a3b3fa80d8cfa5a5c2ddb12c3bfce1..5da1734711ae7df12ec1d720c5b9b8661929b997 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index a9a4902688f813ba97783b3c106a952db4368010..3c40cd058f7454d9891d1af5ee79db77f5228640 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -7,7 +7,7 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 724fe6f64c5b126bc619ec1a111a92621787ed86..6f95c38018d0700db61389cf7fa09228e4a1c8cc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -7,7 +7,7 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
index 78d6c1900901f39ca64b7c68d7f4f441de3bccf9..75e623c536426fc63193ebf874a3f7b595e543ec 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
@@ -7,7 +7,7 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index 5a8bd1363abb59bbf5579a8efcb16eef1d33cbd3..38b6b17945c3a22789bc4f4a3262190ba3ca6519 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-65de7efe65ee4b4cac4c">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
index a56564aadaad6b4096a5a1e31066227d88d5306a..fca1e24b883d07ed26a28a9f88480cc1e685dda1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
@@ -7,7 +7,7 @@ xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 3d43dac8ac1bf13788951f14e453fb4a2cc21085..44653adf7d8ec9bec5a6bd2d38abe70cc8db5e32 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index d18dc30e4433fb844d44703d1305bbc2612a8168..cbbf466b5c5ba898150f715829e44d1db1e440fe 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -7,7 +7,7 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
index 4a79f5dd6cf648cca400afd9a80d20418a5472e3..76732acfe9c4d7d6294bcdd34bf102b94c17d709 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index 14918b95d64e8a1399cd58f5a3c7dd1556f7a7fe..96328352dbcc31bbcd887754a897b22a4183ab93 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartES" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index dfd0274077b3ebc215d6bc4b7c817796761c3122..79aef3e7e591760ef730205cb59290644e3c2a7a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index 5fc3a0bf24ed07b25bb11f8f4cde32c838aecadb..f8eacdbe6412c8cdf321e3060f464d4f615421d5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index f2c545c2de513e60e85dbeee53663366d35e0b19..96bad171249b9975232789457782a4d30908912f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index 04e7190fe5e9d936d005ab55ff0aa81a5ef47553..aa1a16314021c9c49c29501b451ffcb2c19c1f33 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.pdf b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.pdf
index 137df9a6bd76b9bcf78a2b09c2fe7d35d8695a0a..c14d167bc661baa74d489a0aed20d098fdee06bd 100644
Binary files a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.pdf and b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.pdf differ
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf
index d8ba31ef15756505a59cafefa22115e6d4efa8f6..3cc2b452bdd82c1b8d80f2eef4125a0019acd41a 100644
Binary files a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf and b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf differ
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index cf0d205bc88442fd72cb35ddb57f1ff400184cfd..866c195ee22009bd76eb12adaae0f4577bea4c0e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class4">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index a9b91e68d024882d9c0664d1e43c3fec5471ef08..1295f1161249cc6e0ae94ae8c61bd1245938ae03 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index fdc6212002c1235cce9f8314761e4d109e186339..0a1115708ff31c2dd8666df204fa2caf8e655960 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index 1aaecc0106f27ba7a7842675fa42d7f8711f4e5e..21c0b175e1cc3bba0b6d43cf42a0a166037b042c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
index 9a63044e731537f08d8596a8b5e3a844844c577b..f396f358ca18fb2905e64830b7054c98e1eccb7b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
index 52ddc4c8423faca882a93f1e200e1188c4204114..09490c5dc6b5578445db01a0719a0b6af78d3a88 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_nonHEV.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_nonHEV.xml
index 338f9704deac2f054dac1b5334dd8e1540e2ec55..3a7fd5e8b198c89edc2d60aca81c0b12acb21d7b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_nonHEV.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_nonHEV.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2.xml
index def38ae021aaba90db259ca6c93f9d16808c6791..a1430c38cdeb1bccc83a30fd18e352866eda7491 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2.xml
@@ -5,8 +5,8 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.1.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
index 1bdb49d5bce6f211251e633c61340538dbe4429b..6226e1a3ae5216613c900bf08f163a62bb0bf68a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
@@ -5,8 +5,8 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.1.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto
index 74111c500f6dc943040a9add6d0cfebef86db9c4..7ce13da27649e1f1f487c4cccfd428d27e1b8225 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto
@@ -11,70 +11,70 @@
"EngineFile": "40t_Long_Haul_Truck.veng",
"GearboxFile": "40t_Long_Haul_Truck.vgbx",
"Cycles": [
- "..\\..\\Cycles\\Cycle_AccelerateAtBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_AccelerateBeforeBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_AccelerateWhileBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_20_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_10.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_2.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_22_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_5.vdri", "..\\..\\Cycles\\Cycle_Accelerate_stop_0_85_level.vdri",
- "..\\..\\Cycles\\Cycle_DecelerateWhileBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_22_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_3.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_level.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_20_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_level.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_stop_85_stop_85_level.vdri"
+ "..//..//Cycles//Cycle_AccelerateAtBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_AccelerateBeforeBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_AccelerateWhileBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_20_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_10.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_2.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_22_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_5.vdri", "..//..//Cycles//Cycle_Accelerate_stop_0_85_level.vdri",
+ "..//..//Cycles//Cycle_DecelerateWhileBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_22_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_3.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_10_level.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_20_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_30_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_80_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_level.vdri",
+ "..//..//Cycles//Cycle_Drive_80_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_80_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_stop_85_stop_85_level.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto
index 3ef8eece57b47add2b903c769d9440c8c4fed256..0857ec3c5631579667ea74bedff37bdf563e7538 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto
@@ -11,8 +11,8 @@
"EngineFile": "40t_Long_Haul_Truck.veng",
"GearboxFile": "40t_Long_Haul_Truck.vgbx",
"Cycles": [
- "C:\\Workspaces\\VisualStudio\\VECTO_quam\\VectoCoreTest\\TestData\\Integration\\DriverStrategy\\Cycles\\Cycle_Drive_80_level.vdri",
- "C:\\Workspaces\\VisualStudio\\VECTO_quam\\VectoCoreTest\\TestData\\Integration\\DriverStrategy\\Cycles\\Cycle_Drive_10_level.vdri"
+ "C://Workspaces//VisualStudio//VECTO_quam//VectoCoreTest//TestData//Integration//DriverStrategy//Cycles//Cycle_Drive_80_level.vdri",
+ "C://Workspaces//VisualStudio//VECTO_quam//VectoCoreTest//TestData//Integration//DriverStrategy//Cycles//Cycle_Drive_10_level.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto
index c1376af912493899c877af0a651ff064b7ec555c..b2b4ddaa63ac5f32975a8192bbe446572424b449 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto
@@ -11,7 +11,7 @@
"EngineFile": "40t_Long_Haul_Truck.veng",
"GearboxFile": "40t_Long_Haul_Truck_EngineIdle.vgbx",
"Cycles": [
- "C:\\Workspaces\\VisualStudio\\VECTO_quam\\VectoCoreTest\\TestData\\Integration\\DriverStrategy\\Cycles\\Cycle_Accelerate_0_85_level_5kWAux.vdri"
+ "C://Workspaces//VisualStudio//VECTO_quam//VectoCoreTest//TestData//Integration//DriverStrategy//Cycles//Cycle_Accelerate_0_85_level_5kWAux.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto
index 446045d8df32156a645bdf96ba4bc8d352b426dc..1cadb94f753f0555f1c157899dff625f0db662ff 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto
@@ -11,15 +11,15 @@
"EngineFile": "40t_Long_Haul_Truck.veng",
"GearboxFile": "40t_Long_Haul_Truck.vgbx",
"Cycles": [
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_5.vdri"
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_5.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto
index ccc3b93afe1db63c442ff25c090bbf12c7fbe1c6..674c19520e6ed988a8171ab7ffad578192c8bfbf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto
@@ -11,71 +11,71 @@
"EngineFile": "24t Coach.veng",
"GearboxFile": "24t Coach.vgbx",
"Cycles": [
- "..\\..\\Cycles\\Cycle_AccelerateAtBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_AccelerateBeforeBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_AccelerateWhileBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_20_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_10.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_2.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_22_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_level.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_20_60_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_stop_0_85_level.vdri",
- "..\\..\\Cycles\\Cycle_DecelerateWhileBrake_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_22_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_45_0_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_60_20_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_level.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_3.vdri",
- "..\\..\\Cycles\\Cycle_Decelerate_80_0_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_25.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_level.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_25.vdri",
- "..\\..\\Cycles\\Cycle_Drive_10_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_20_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_30_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_50_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Decreasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Dec_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_downhill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_Increasing_Slope.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_level.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_uphill_15.vdri",
- "..\\..\\Cycles\\Cycle_Drive_80_uphill_5.vdri",
- "..\\..\\Cycles\\Cycle_Drive_stop_85_stop_85_level.vdri"
+ "..//..//Cycles//Cycle_AccelerateAtBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_AccelerateBeforeBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_AccelerateWhileBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_20_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_10.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_2.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_22_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_level.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Accelerate_20_60_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_stop_0_85_level.vdri",
+ "..//..//Cycles//Cycle_DecelerateWhileBrake_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_22_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_45_0_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_60_20_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_level.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_3.vdri",
+ "..//..//Cycles//Cycle_Decelerate_80_0_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_25.vdri",
+ "..//..//Cycles//Cycle_Drive_10_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_10_level.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_25.vdri",
+ "..//..//Cycles//Cycle_Drive_10_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_20_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_30_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_30_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_50_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_50_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Decreasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Dec_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_downhill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_80_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_80_Increasing_Slope.vdri",
+ "..//..//Cycles//Cycle_Drive_80_level.vdri",
+ "..//..//Cycles//Cycle_Drive_80_uphill_15.vdri",
+ "..//..//Cycles//Cycle_Drive_80_uphill_5.vdri",
+ "..//..//Cycles//Cycle_Drive_stop_85_stop_85_level.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto
index e64791f7ef90a55ca57c14e8b6c921f077bf7aa0..e80655cd6f97817ed2cce4b36ff7d47559c9e343 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto
@@ -11,15 +11,15 @@
"EngineFile": "24t Coach.veng",
"GearboxFile": "24t Coach.vgbx",
"Cycles": [
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_85_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_60_downhill_5.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_1.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_3.vdri",
- "..\\..\\Cycles\\Cycle_Accelerate_0_40_downhill_5.vdri"
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_85_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_60_downhill_5.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_1.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_3.vdri",
+ "..//..//Cycles//Cycle_Accelerate_0_40_downhill_5.vdri"
],
"VACC": "Truck.vacc",
"EngineOnlyMode": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
index 78c480615b82dac301914a14747ddf3270bb2dfc..704f4040d247916498cd40d377e5ad4f6680c792 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0_van" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
index a5c83dc8a0877b8922ba70fa9cd86e0c08850c37..9f076bb6904c2a66a8256daa460dbd02be808082 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
@@ -8,7 +8,7 @@ xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
index 6025e2969b4e4e853effb1b9079855a1e5664235..dd9ce32b34d17dbcbf5bf2eb3fa0b381cb82fd27 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-stage_input_full-sample-final-noADAS.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-primary_heavyBus-sample.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-stage_input_full-sample-final-noADAS.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
index ea14bcf1913a98eae7327493a4b600d41d4963ca..509567711cc5df03a8a5c16063f60f7259b4f998 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-stage_input_full-sample-final.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-primary_heavyBus-sample.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-stage_input_full-sample-final.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
index a4cb37573f22ab2c77b8479775159010da5a6137..ff35b7143aa86b0f9298ef1a004bb39f5a382477 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_completewithoutTMPLM.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//exempted_primary_heavyBus.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-exempted_input_completewithoutTMPLM.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
index 9decd02ecd28e387f35df396ab55297fa60a322e..d764c7e541f1b37afa0a6771efa3bc619d5cf5de 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_full-sample.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//exempted_primary_heavyBus.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-exempted_input_full-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
index 815d40babfe59c35a0b26bbb1c6a3af3eb55163c..011ea57632bc58aa0023de9f5712685242a601d6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_interim-sample.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//exempted_primary_heavyBus.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-exempted_input_interim-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
index 8c711483841600928f41c4c07854380b23e2dfb7..79ec10fad6459e92267a36b2949213746f615469 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
@@ -6,8 +6,8 @@
"FileVersion": 10
},
"Body": {
- "PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-stage_input_full-sample.xml",
+ "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-primary_heavyBus-sample.xml",
+ "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-stage_input_full-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vecto
index 3bb5f689e36fd4b9d2622ad544a350e5145eecb8..c46756edfebc9c18792e7a0d9cb2ab58bcb48e4d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_PS.vecto
@@ -43,7 +43,7 @@
"RegionalDelivery.vdri",
"UrbanDelivery.vdri",
"Urban.vdri",
- "InterUrban.vdri"
+ "Interurban.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vecto
index a32d853b570d351ade0f31e8b2203a6153371081..c2137999bf4440329572380849ca6916b1fb1323 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/CityBus_AT_Ser.vecto
@@ -43,7 +43,7 @@
"RegionalDelivery.vdri",
"UrbanDelivery.vdri",
"Urban.vdri",
- "InterUrban.vdri"
+ "Interurban.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
index 08516efcb9bdea147b75aac22b5e18429a23aefb..523ae5502c2e779557ad2bee83200e5614e91030 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class1">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
index 71f5d5eea4261e40ce0b73e850962c076fca8cec..717414b6cf1cc07085c3b41fd0a35840fa7294c5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class2">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index 5729902664647c1ccf0cc3aa6942ced9c57ebb0d..594816fa3f82dfd8f070b4adc4122562eb32c5f3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class3">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index 11e07063064de6cdbb98f349fa537a37192df741..a42f0b5408937827c4fc5437554ec6415f4f1989 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class4">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
index 9d630d62d28632f31ccb7d147b7ec1ddf709b18a..dbbc66c418bc6c1c8753011905589a7bc30d6410 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
index 6d45545365fe2b2c8a54493b96b1eb7c5634c91a..dabbaf84cc254aeec8065f90504767f4725d5114 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class11">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
index 50e38f4e9702d8540aaa7aa07fc13a8f9b866045..0adde1a378243a196d5b27fdba0e32160ea86dc4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class16">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index a85ffd7f4da7545d885ffabca0ab9436ec57c1f2..a6ccab0a19677f3e44200e675a231d8d8e3902b2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
index 4f9f8bb12e2493dab7c20ca86f5262c5205a3262..fb4c29679ca491cea2f35a403def6133fbaa54a2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_FlatFC">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
index 531879faa23dba94ff9841584f72690a67c57d70..f0709064c433a1383c513db733fc1c87d6b952ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_IncreasingFC">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
index 72b83fea9baa88c2f263c0d03002173e4693c44b..7329b815e0dd99cc361757ac45eedf78a56ee470 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class10">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
index 4b3f5b27d281dc56d41d6ed2e48fc236aad8c651..e4ebbd15a65cc96abfbc34cf97253bc5c094bbba 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class12">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
index 4ab9769d46d00487fe31ffaa65f332ea9a301677..d76ce4970e9976c3c9e5d5c6bc4c599f67ba1394 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
index af0a1c5512290cfca00ee7156aea2404546cdcbe..0fe90f9d179b58fd4ebb9063669c12df8ba0c9de 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-N.A.">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
index 00902b6089bae44c9e5dc4a1664a30d3db4d0323..46acc391864846e89d1f26ab49f9b2a95d45436a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-N.A.">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
index 90369ac624447a9a88271a4b9f06a5846c0a083c..245e49e568084444eb5acad1d50ce09d1b528398 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox>
<Data id="GBX-12gear_Hugo">
<Manufacturer>N.A.</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
index b7154d1528d62ea4c2ab0c461d47dfff4300e2b5..9eb603e32eb695c22f443938b5653bb2cdb5804f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine>
<Data id="ENG-gooZah3D">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index 89cf35e03b89e4bc9b4d2e9f933d31c49f02d34e..6ce3489dced19c5bf06877f5987de2d2485d5901 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class3">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 9d9f7873207d2aa643c239ccbb9674f107568d82..7873c1ffc432dfba4f57b80a25eb3e7107a56688 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -3,7 +3,7 @@
xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Tabelle1_Class-5_Genericvehicle">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 97b96ff1e4d648aabac1230375bf90118d8796ab..47810617fdcc43190dbb4c1a26a2c3fc8d4c193a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Tabelle1_Class-5_Genericvehicle">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
index d169e6717c4e8ed842b63ef452318ad7628d0831..690551e5b57775f50ed100aab33dda483e8b89fd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
@@ -6,7 +6,7 @@ xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput v:\VectoCore\VectoCore\Resources\XSD/VectoOutputManufacturer.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput v:/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd">
<mrf:Data xsi:type="VectoOutputDataType" id="RESULT-b2d5a208fb6d49b09083">
<Vehicle xsi:type="VehicleCompletedBusType">
<PrimaryVehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
index 092a0cc84611f75c11d85ebbed4ed80dce7dbd36..419bcf3c78bd13fd3862fce2f13a7f3c972e5761 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
index 32537dc27aa0ba0fd418c2f4520dee7ef9294c44..6e794520c8eebdb0796a26dccab0b1a95256b432 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
index acbe550b87fcf45ced4f64655b27e83e56472ada..09b640981dde1c35dc98afa7f61fe29a01f24414 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
@@ -9,7 +9,7 @@ xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/VTPModeWithDistanceCycle.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/VTPModeWithDistanceCycle.vecto
index 94574d4f1750abb2b983da488edf9dc633ff15b4..1c1c05093ccf471badc6eaa3e57e0fda25efb0bd 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/VTPModeWithDistanceCycle.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/VTPModeWithDistanceCycle.vecto
@@ -15,7 +15,7 @@
],
"FanDiameter": 0.225,
"Cycles": [
- "..\\Cycles\\Coach.vdri"
+ "..//Cycles//Coach.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx
index 74b9ce01c404b42c1e5f9c1c3cc8b9e9cb7cf232..4f0ea831d2e64b9a84e4b7be664ae2d9af0fb0e1 100644
Binary files a/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx and b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx differ
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx
index 5753a6df859dd41a002275dd71964376f6fc3af6..60518e6436ed486806180d183eec5e9550b5477b 100644
Binary files a/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx and b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx differ
diff --git a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO-SideLoader.vecto b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO-SideLoader.vecto
index 6296453d9264a3e6c856c4026f1ceb4f14e2fc6f..7427ed5d8cff01b4d61086f3f8eac0a961fb6112 100644
--- a/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO-SideLoader.vecto
+++ b/VectoCore/VectoCoreTest/TestData/RoadSweepers/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO-SideLoader.vecto
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Class9_RigidTruck_Sideloader.vveh",
+ "VehicleFile": "Class9_RigidTruck_SideLoader.vveh",
"EngineFile": "Engine_324kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"AuxiliaryAssembly": "Classic",
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
index a574cae24b0855563abb2c928af77ac808ef02a9..7e5297c768876fe653d7e37fdc3fe9313ea62fef 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd">
<Vehicle id="VEH-class5_Class-5_5t0">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index 680b0a9729964208a2d248788de94df695442a7c..57fcbc30834599050d1ab27ca6a35f7e0bad5847 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<vif0.1:PrimaryVehicle>
<vif0.1:Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
<vif0.1:Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_engine-sample.xml
index d9f3ecbe4d843967ff0db9181436fe8e8f742586..ca088b50c4c2cd81ed2ac6a6a3658a600413a510 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_engine-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoComponent.1.0.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoComponent.1.0.xsd">
<tns:Engine>
<Data id="ENG-gooZah3D">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-exempted-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-exempted-sample.xml
index da4f602514a28ae678eee02ea81b0f9ae9bc0db7..ab0209f2837a5d5385f983388245086769fc1f4b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-exempted-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-exempted-sample.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-new_parameters-sample.xml
index 40cfe75c397c04f7a4c2a1ee0d8e95d412ef6a47..d4446e41bd832ffe4a7724f2d471741273f1aa69 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-new_parameters-sample.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-sample_LNG.xml
index f026a276cd7ba7deb5adcc116f26ba4a70e3db65..0fafc5b9de743ab9f701e4af84ffc1b5f5e26cc0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-sample_LNG.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
index 1ffa0726cc1cd17e5eebd2075445836fd263bbb6..55c56cb08e3a3e5568aac20790398645e34b5c57 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -3,7 +3,7 @@
xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_engine-sample.xml
index fe02d327a5cdbf75054f855effd4072e707c94ad..6370f57ac40c615992290dfe4200efbf4b37e274 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_engine-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine>
<Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_tyre-sample.xml
index c14ba06f3c2a0270a57ae8f91fe746e8ffce0fe6..e136b0b1ebedf2f1cc906e92532ef8d1cc7e8659 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_tyre-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Tyre>
<Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml
index 297781894a7770fe748490850ce1d06aa40783fc..debf052ff7393965a3be4a80a13bcdefdae2ab02 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:/QUAM/Workspace/VECTO_DEV_Buses/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
index e2d2a56901f1797330a0c9dca73f2cf5dc9f2003..7e6e8aaf43103004708cfadaeb0a951bdc1fd912 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
index 021d870ad6e8e2ebf6f362dc6f47727887e71c47..593cbcb93e6cbee520b659388673027eb9af3aac 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
index bdc38e09cf334455140ec0d03e2e0516491aa326..a950e0c5ff5204e47679c712a482573dd93f8c94 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -5,7 +5,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<v2.1:Manufacturer>Generic Vendor</v2.1:Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_engine-sample.xml
index a21fb499c76da395478a7cc06543582d5a4760e1..26540f172e027469ab1ef9cf3839f29deaf0540a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_engine-sample.xml
@@ -6,7 +6,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_tyre-sample.xml
index c14ba06f3c2a0270a57ae8f91fe746e8ffce0fe6..e136b0b1ebedf2f1cc906e92532ef8d1cc7e8659 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_tyre-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Tyre>
<Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
index d98cf661d79d23b02662b90ab2ea44b511086942..12bdb8564a28504819ea61a87837dcd3bbe3a548 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
index 5ce75cc5bf30c9ca98e8f167c605f28b4fb8b288..41bfddb190419751d7ed9e21e70b4cd2cb98e2be 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
index 59651be7fa628bb521d5a52976b01568b7a6d015..c43e0ea373bac14877d021effbbafb19067943ca 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
index 044bc2534e0fcc692b227fa93b469010f5a58023..1b252ef317b905595261e8cefa583b92594e82d3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
index ec54dae802f148eb32044bff96afcab88ddb5693..b8a5ea206a06e37b6f96a838c9d0b0041ce600fb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
@@ -5,7 +5,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
index 5feddcb6e48889e35e27a8355a6b33a97da87118..2783ce975b7e5df1fc625ae9843f7009489cc3f3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
@@ -6,7 +6,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
index f506066a9138d7e010eac99cda6c9be8dc4ff4e4..1be970105c0212609612317d0cfcc2926f1cc61d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -6,7 +6,7 @@
xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
index 34224c3650d6ca54871fce7dafd3f931aabdfedf..736352b8d09fc4991cb607353ef0e1e83575b458 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
@@ -6,7 +6,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd"
>
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
index fc4ba7740408e65cdf5e9ab36ea0a49979e3b2e3..820f4f73bb0de8f16c8253545ec4ebdf4fcf6f56 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
@@ -7,7 +7,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Tyre xsi:type="v2.0:TyreComponentDeclarationType">
<v2.0:Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2">
<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-exempted-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-exempted-sample.xml
index b81a3b75e06710d4d48ba74729d893af1ccc24b7..90b5d641468d046a2e174a6f20edb53ad88eceeb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-exempted-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-exempted-sample.xml
@@ -4,8 +4,8 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.1.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
index 342fa98219be33f596eeffee4cdf9450e5dc64b0..ca005a33aab701c44a2ed2fa1c00250d0077a336 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
index 2e03b8c4a2e5c85e10aa1cd858199b6112bff278..3a02f0d700046ec2709ff7a76793eb22a94e791b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
@@ -5,7 +5,7 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
index 3671aa6cfd3930e53a5a24bba9f7505dcb0a1410..5dfb8461d5fb80c983866e9c761cc1fd27690b05 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
@@ -5,7 +5,7 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
index e0a79b6e6b71a16c891309925ee677b34319dc6c..2f5303071e2019b6b6894987523ff1b637f06c3a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
@@ -5,7 +5,7 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
index 97123e239b5f52fc40b3db4cf1344a9ae0653c45..20a20cea801706ac57bd02e5a723616a3dcb90f1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Tyre xsi:type="v2.0:TyreComponentDeclarationType">
<v2.0:Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
<Model>Generic Tyre Model</Model>
<CertificationNumber>e12*0815/8051*2017/05T0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>DemoTyreApp 1.0</AppVersion>
<Dimension>235/60 R17C</Dimension><!--- New tyre dimension added in version 2.2 -->
<TyreClass>C1</TyreClass>
<FuelEfficiencyClass>A</FuelEfficiencyClass>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33500</FzISO>
</v2.0:Data>
<Signature>
<di:Reference URI="#TYR-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
</di:Reference>
</Signature>
</tns:Tyre>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Tyre xsi:type="v2.0:TyreComponentDeclarationType">
<v2.0:Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
<Model>Generic Tyre Model</Model>
<CertificationNumber>e12*0815/8051*2017/05T0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>DemoTyreApp 1.0</AppVersion>
<Dimension>235/60 R17C</Dimension><!--- New tyre dimension added in version 2.2 -->
<TyreClass>C1</TyreClass>
<FuelEfficiencyClass>A</FuelEfficiencyClass>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33500</FzISO>
</v2.0:Data>
<Signature>
<di:Reference URI="#TYR-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
</di:Reference>
</Signature>
</tns:Tyre>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
index eece28613dbeaa210d1387700b9d5e2907cf2180..da84161a5881db78ce79832236d40775152aac23 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
@@ -8,7 +8,7 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:/QUAM/Workspace/VECTO_DEV_Buses/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
index fd3b4c1196956fefb415ce88c905c17c2a74d31e..36943daaba6ecb9172b103e14241b59db0ae2b4c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
@@ -8,7 +8,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
index 0685cc32c77b8b91a545871d184da8cd46532581..efefa3349d542896564a50123e92cffe99747af2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
index 7ecbc3d47e8d706e16ecd4a1b3908da3af0dccba..c57e40815cec10c4ee0f1fdac848e26f101a48af 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
index 6154ca5146d70720a8b55b8bf7b74624ade3698d..d9489dca938740b913875549066d38ee538241de 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
index f20c7112d75d1b873531a114851167094450160a..f5fc7bb113091f895369f189e3f23c8b4378445a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
@@ -8,7 +8,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd"
>
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
index 469016a09d20af3962140f4534995c68d6920011..f8cf7748fb76ec3357729ec59d6d7f7d24707892 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
index 0a35e5eda63337ee20bfeb38454f6571a6addb3e..7204a1f101700981f4101f3f0821f8b23db9b2c4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
index 656f9a00486293d4c31ed3b81afccb29791cd277..a392cc279802d5a0784d27cb5497b2a5eee4a993 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
index b6a025e1925bcf5cf7aa8e3e7c504837e0d9866e..854d945115881a67d6fa915d64756bf8d498f557 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ADC.xml
index 8db155c74245fb4b3fa9d30758d4b03a159f80ca..f74720076b553ecb27a1e3fa0dedb51b710c6d1b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ADC.xml
@@ -2,7 +2,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:ADC xsi:type="v2.3:ADCComponentDeclarationType" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/BatterySystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/BatterySystem_1.xml
index ae83302aa19c991308e7786522f9de58fc3c0984..fb9cf7206560c325aa27a3ee6bb0d3c65efdc3ad 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/BatterySystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/BatterySystem_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:BatterySystem xsi:type="v2.3:BatteryComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_1.xml
index 0e11a0ecfca4f5c275dbf292e05f23b00b7fa41c..25bd5ed6680dc4aad94c94f783669e3360e81388 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_1.xml
@@ -2,7 +2,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:CapacitorSystem xsi:type="CapacitorSystemComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="CapacitorSystemDataType" id="CAP-asdf">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
index 3bda4f34ec817645c286343a2026d70e2a930c6e..952b2dff7a7120e7e452322f537000669fcb0216 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:ElectricMachineSystem xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
index e58954177634d38bd199cb204be5bf8a5f07d415..79f0695745959e3058e8606aabe8ac60a2ce467b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:ElectricMachineSystem xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
index bdce5bf6b70e349efa0d849543033eac3149ce77..0ea76284b8b7c559818c977c6a45260f16a1e8b2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:ElectricMachineSystem xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_APT-N.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_APT-N.xml
index 3ed2d166073ad612ee35dbe1ccc712724135d17a..2b780796b2d168b2fe9d59f95adeb67eb3866df8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_APT-N.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_APT-N.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="v2.3:GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_FWD.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_FWD.xml
index c0bd576086d086d433c2a3b692dc94c8d760da0b..15ba28e427656e1523011437039ef0c24d0bc4e3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_FWD.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_FWD.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="v2.3:GearboxFWDDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_IHPC.xml
index 05cb9e558e36c4ff8177c81d7f733bb3ca0d9cbc..5d98c72f96f5d1f2a1b051b12a2fb12ba9cdea25 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Gearbox_IHPC.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="v2.3:GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
index c2fb24c4787d8fb6e55d84a518c5685c0fd8361a..fb204a2bd5b64967289f09239c492f710dbad3d4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:IEPC xsi:type="v2.3:IEPCComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
index 82e2b4c3f3a1500c06f73d719ffb0ba61591bb7b..f18ac5b8582a04428a6b1cf24bf212be29e92fa9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:IEPC xsi:type="v2.3:IEPCComponentDeclarationType">
<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
<Manufacturer>a</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml
index 0cc588f3e7c9d08f1aa4dd5ede6e32e46584773c..4f401ec7e9e4e225451b34900c6a33a9572e17a7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml
@@ -2,7 +2,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd">
<tns:Tyre xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<v2.0:Data xsi:type="TyreDataDeclarationType" id="TYR-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
index 8eb42199cd430aa44c81e0ba23a9b0d6e8ec871a..09a45e6807f5a951c828ab5484d15aad593b58f8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
index 3731a2593bfd5943be3efd5d8fd1b16f8343b709..92f8f183255b2646a7d6546d2b7337b2ea5e2f64 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
index 39e90cfb8fc7029e82cfed8e7cf1bceebfff5da0..914cdb441f1ab54552045c228eb3d092806a969a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
@@ -6,7 +6,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_HeavyLorryDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
index bb45b98a60c7ea3c94f98dd6a1981afbf2519177..eda1cf8c2622f22591cf15744570db4ddf2b9900 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
@@ -6,7 +6,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_MediumLorryDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml
index f0b2a3c6343050478b5113e5986e2cff9c285592..4882c6104ad62174d78988fe0c9e3dd0bcdc6410 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml
@@ -6,7 +6,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
index c579af2f43a2be426a364feab266ff4c4068f5fb..3639fa2c16008e41005dc732c809b3ba12d335fb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
index 33edc8ed8a3b4ac332a6363a4bb9a88cc29b4f01..3688e11d4ddb337aa3bb632c7bea8f54a30711e9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
index ef79b03d4a22337d4ab1ac36731ba1e5d80c58b2..e095d0936da4899d28216ac536dc5fb6b291eb7c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
index f0a5c5083ef91ea4ae1078f37464eec9df95853b..49dde97ef373b3a516c0b74236a1c1428540cf5b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
index 515e3df774d8d908ed1473578e69a0d554219aad..2c604d92db07dc86c734071688415affecc40c03 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
index af0f9cdf8127e38bc84862452f10e3f2ca6473dd..3e040c03a251411ae04576bef130cbf23d9902b3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
index 77032b8f223533fd4e4ad8d4078d6f10819afbbe..ea8e4fd72a12c2e9fc7ee7589c34fae9eedd0f0f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<!-- optional -->
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<!-- optional -->
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
index 73af50778ddf93519f09c6f6933bb5d22155332a..7621d244df60a255462dd11eeaeffeb4e80a91c6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
index 93bb15cdca5894fba624da2b62b095c63c66be8d..43049970859baaeb8712b22f6cc28607cda78ed0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
index cff68f15e5a3ab495be11f006a7ab4b10a210dec..1a6498d0c5f516ad6add231eee6d4fd6f30fe565 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
index b3566c5c59e551720df5bde51b5b0afa1917a3a7..e06bd0fbd127b5e4c8c0b10ca5ca548dc371878e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
index eb9a1d82ef34c1eb661da00d4186aabaeac98bbe..ad880fe4063c53208530001ffd8d66fe317a815f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
index 0ca172ef2351737e0a124d2c8ffb5ef06403a3fb..51f031d85f9602ceb16af90ecf4058c56473a72f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
index f4058fbb03111959f14b3cae9794c77ed5efe268..4d0c5ba4acffdbf1609d2ac3648facd71183dc8c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
index 4504a67075fda6615cc32dcf615848e4d8dd9192..8cd92ebfb5be20a6221b9c8544d293464e46230b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
index 12ee94be010eddce289e9ed04e3fc24af6a76534..4958373dd8e21b27d3019a31a8e111a1820a1e96 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
index ae591fb32125332566374638ee9e4d797ad3e3cd..55d5b56eac25ebbd46a38fdb830b08d264dbcb15 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
index db595628401d4799835188071cf075d3d6290f53..c42522a092f8328cceba5045b80cf348ce8955d4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
index 9056cf29a1d9255d5f7b0d268ffc78ca625cbaf9..61a3fb4212c5c615e0a18aea0f3935fb44291c12 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
index e27ad1fbdd5d8dcdeb7dd80dc9b2f6f8fd8a82df..ca8a444fe75c91304ec33ad0a88fe1101a5fe826 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
index 9b045f03fed05f29c0a9415a4ebb282378e992da..6e02dca9e6f486b4590ba7aa763f17f129f26f67 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
index 20881f25f147cf915e48bb211e4981d64f9a94ea..232ade5c42c09be4aa6e0aaff33234aca58d06e9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
index 40e01c6255f0dbafaf9dc14510ee2d6568e3495d..dbef01aa9f39b84c1ecbfdb03f9360049b8dc04e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
index 8ab9994cb1ee0e82bf4fb1bf10110994f8290a36..797032e23bd711c760859cd15d4ef9567eab4826 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
index 64f51ed65001f607931005d43ad75bedf8379fbd..4bc902d0ad27c478f7ef83572705f63f2b91628e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
index 996d8d106993107cc5681e210ed6af802248279b..f7e2f6feaa6c4aeea824335a21af9ad39df3524c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
index 7133b50d2b3c2f4345acabe1dc8d3e57460275d8..01cc97f976dfd3845422bea729c3e532b2905870 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
index bc8398274bd22621c71c30d2b792a4cb1b116855..bc221ef259026226f133a287c7be84d2d25b3a15 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
index 738bb5514fb7bbd1c445bb526e34c1428aa69813..4f3441e7eeb50a1f93f8847131c1f8d55356a1b2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
index 04e901f18537ec805fb493a17fd0012b038b1f7f..a01dd467b8acb3d3b232d4313b4066fc10a26a91 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
index 505f21f52e0e7ee126503dc69d4a486c0025b729..9e881b16f3d488404f65edc837eceed428373b8c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
index c98f9a0346a0deab31cf4dc0a490cd24b7777959..5766f16a1b916aff7cfc03335ba752c96f665c45 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
index 5080b4738feac15547954578d2aabdc6908a75c2..f2d119de3bf46d9cc354391d95980f7c1e720918 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
index 732be3806ec94193d41516f2213cf7bda6b8f350..8fdafd01e5453d19c04e3cfc1f216bbbff0f0639 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
index 3c74a0f74e59e34a68aba279f2b5532cad63ccb4..31ef0fc7421f6da77395b5e922f3dd1fd3dfe766 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
index 317875ab41ae9f1a05faedad8892f2edfa35513a..7ab7f783cf0638e6ade65ee7b1547a4c1d021fd1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
index ea3dda3e1caa9c6d96f77d7325f50d00b547d0ed..efa78b530d26cb6612af11f29ee3255f8eba802b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
index fd240eddf72eb2d548dcc1cd78bb13a0c1b8f4f3..ee159a85ef02bf317d9257a9e04b11892796f360 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
index 55e4213577488313159eee9f6e16ddaffbc21be5..9dcefa820e465a993f114f0bf91210740e3a90d5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
index 615c385e6ca20dd62eb39d25cedf1ab7d66930ef..3be2f0a111b5cbb2b7b11c2e4087be0b02590795 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
index 984c847dfb4b2904808b7ac3bea5839c301b570f..4cd857a4526d4d249c95f95e4cedd38b04b033bd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
index 404d1791f790583353225415b95bf6d5a9834eb8..684143557bdc861f6007ccbee981d6084d7c136c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
index 2172cd84cc98f4140f33467b9175c4e297ace98a..32aedb48079058d22ddb8d171f37013bb46426e1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
index 84849e92792e8e8c014754d6d1d0745df9b3ff66..37103736332bcc0787acaa764c49cb252f0187dd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
index 3655abed882ed2d5fb654b8fdaed29e822a04232..8318eb35d971f35cb5c89caf5f5a83f4c6c0941d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
index 01bdc223301d9b76f4648a4266793f5131ce4a8f..16ef06a19e63d3d10fe31503b9ea33330be9f425 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
index 166a929a4e7dbb624bfb320b605f87190411a360..be069921f055e2162c69b7e7770cf608a86600c5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
index 97b4f3895bb56b4dd86cfb2eaf23784c7fa8e38b..4b5f9b221c6c857490e9c090925d5b45fad51518 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
index 8e2a63396255527bfe1902416f0e17e8a0608721..595ee9f345dea00122b59e1cda695a63bd164b43 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
index 5e6fd226e7a8f427307cb49d4d20683203521775..f5640695dfa1351fe31db50253dfc7c6d9e4fcc9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
index 38d89ce490086bfd5b2ba0e38072dd986d1c687f..17756fda652b9eed35d70de20c5d8e467d949df7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
index 733c8d8ca876a7e7d0106de5155f9522f7a7b57a..5b230601560d4657af11bdf2dcd050d6b6fb8b94 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<VocationalVehicle>true</VocationalVehicle>
<SleeperCab>true</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2.5</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="asf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="bsf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<VocationalVehicle>true</VocationalVehicle>
<SleeperCab>true</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2.5</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="asf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="bsf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
index 68ba28d5ebcec8b75db415dcfcd749d509a4a176..ec84005d8865724c535d428074702fd19c405ca5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
index ced7dfb8fbfba31f46148dcf8f966f6158104f24..feefdbe62922c7a9d2b906f3e527f6ee3d436ed3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
index bd8d18634fd9b7ca451fbfac33843b56f4f77641..736345ce5288832f11dde92f4c8d4d0be2204696 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
index 8e668fe88df09311314a0cd3542d12e3945c7351..7d1761d7656abc56b28a010979d73167b6af3de0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
index d74b5bbcd386cfbdb1dba5f6bd35bd03427c3239..cfc33364b3d8f7dfbf0369c7e7b009899e91a07a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_IEPC_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
index 9faf3142103ec3a886468987f295643c9e57864a..c6a0f757bca252818badb5cdb590026044c8b70a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
index e55067566a7eb5923821fcdae20df3edd822e484..60178a3d196084d2b6fe1a13c6f75f3bf862fe7c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
index 5c9988dfddfb27cb9631dfaee5eee3f708b9771d..8c8e9706fb21a5e250ed17f5380312531c6a6fa5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
index 5a5b30ef66a385aae1f80580e481ca6f8cb677bf..89d32f06320742e2bdd9f99ec58601b6469a613d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
index 79173c8f65be96d7962850377b5d02d18d580f1a..4f2e37787e6b7259bb80eebe904c3b8f41b9266c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
index 9bd1d71faa2817a7fe65617ab64701965d8915d2..29e363b70f0f1625e74602de1f41d8e328eadf3e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
index e9fa92d0e202c2561f84dd1cc25ae08a35a9601f..27b319bf962d07da49e662f609cc3d254bee264e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
index 3b1ce96b31290cecbda13d26fa32e38bd64a291b..f37ee86bcf76636643ce94fb0aec3ee4c3989dcc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
index c30eba3db3eb2a79bcfa98098cc51025079e1d9f..fe13dc36da8b506077659ddd354eef3a37e415e4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
index 13dab62ca8a07af7e6e930c9f16cecb9fdf6d3a6..f8c1ee3c46901997e3e341d915bc1a1c3cd08224 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
index bd887885c2f607420a45e82e4996f674703fe3eb..a6c30bcfe6f5ca58a0027f69fc599f3173c9a547 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/exempted_primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/exempted_primary_heavyBus.xml
index f008453a2833af925f272d9770d186c87cbb846f..aaf8dc2b7bc124806d4b66f68a27077039e9714f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/exempted_primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/exempted_primary_heavyBus.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-completed_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-completed_heavyBus-sample.xml
index e63e1aced275fa3a37232f386ed5e493d54bb421..f78319a14573d0f805e32acc920d200ef5209f21 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-completed_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-completed_heavyBus-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType"><!--xsi:type="CompletedVehicleDeclarationType">-->
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_completewithoutTMPLM.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_completewithoutTMPLM.xml
index f0f255367524c21646c0e74d74881c76f9391935..911aa78ac8b191ece9814154a615c9b3aa605b14 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_completewithoutTMPLM.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_completewithoutTMPLM.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_full-sample.xml
index 5d5bf009ef84d4ffc2169fa169cb26335b53fbe7..9e9486032e3bb3eefe0bc5d366bd3fa708d667e3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_full-sample.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_interim-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_interim-sample.xml
index 1bd7958f0947b0065a34e9d462e653a6b0ab6dda..bd9d0127e789db67d2cbc71e781673e3a725b305 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_interim-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_interim-sample.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index a73d2d6efeda96d46e067fe9d41b8020a77d900d..296260e71c69d47c49f56711ebb4e032e69484f3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 3c09c5deb2dae952af2771b076192909e3d4fe67..c5e036401693d22c720ea8a772f8997c8768786a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 385695e0a7ed39d67b6d31ee7a5b4f036807e7bc..d21b8c8ec70c663fbfd775ec4ed1c804283854f7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-medium_lorry-sample.xml
index 5f9cd4691ac528fbab9f3d6c0713a74b87ecc915..6a7b96e3117d4420401fdc4dfbdb748c8b965d41 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-medium_lorry-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml
index ce2029db18fd2a714bc20753e8066936a6ca9f20..c15b3e8e531c0ac3c9b15567f0758c0ab2a4843e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES-sample.xml
index 74636ec5ddbc8f35c1068e61d803383505594fd0..bd00d0da4c45574ef8391a100fd813c4412245b9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
index bce70ae884b21f1b2f295b04d43470083498ea27..801585f7e2694a7e77b50da7b959ea18bc7f24fd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final-noADAS.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
index a738b55da32f818c2529816d840a5be48afe34d0..bd654444e5d1e634b2c5aace6f5cac19f527f61a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
- schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final.xml
index 52ef6c378f87490b1c836b07ab3ac9f63e6710c0..04265f9a6c863ab61bcb5403c53cf46c5473f4a3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample-final.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample.xml
index c94c07d8adacebcc4771ce30c9ce54f6c4075c99..562e74da407f22cd974f36ef90973f3c28f56fb7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample_group41.xml
index 249636ca171439c2db1f9e25328154fa6bbdb3da..1610e123b0bb68b653b97797d22a170d661c9289 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_full-sample_group41.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index 2b8dad4ddb4b86dd3e4fad8e9d95414e6b972bd6..e5ad50bb2d5f452494ebcf3d3c25ea1598e9c34e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index df7f099924f2a906fedeeb4a9ae0c581cd314968..18152de455b482767bafd410841898d6976036d1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<ClassBus>II+III</ClassBus>
<NgTankSystem>Compressed</NgTankSystem>
<NumberPassengerSeatsLowerDeck>5</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>15</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>6</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<AirDrag>
<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<ClassBus>II+III</ClassBus>
<NgTankSystem>Compressed</NgTankSystem>
<NumberPassengerSeatsLowerDeck>5</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>15</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>6</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<AirDrag>
<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_component_nullable_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_component_nullable_entries.xml
index 19733726558e66485a4480ef0f815f6fe5476a56..776a457bd03f88fe4633c6dd0cdec3873aca96a4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_component_nullable_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_component_nullable_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 4</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
<VIN>VEH-1234567894</VIN>
<Date>2022-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 4</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
<VIN>VEH-1234567894</VIN>
<Date>2022-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_entries.xml
index 93899b203b36cae6e4e53f533f440727a26d5cd5..8c5f67a143f8c39337b40a54b631bd4d0c935daf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>final</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>final</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
index 737deac2ac26cebda86318eb69f42b163e701681..113e4d793233d6c9446314f3b4cce8f018ac1cba 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V://VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_vif_input.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_vif_input.xml
index 53d349600d5092e1fcd74b8d9738b3bb17a15a84..acaac777627486b0efdc147b21a3b25dcb5d26ab 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_vif_input.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-stage_vif_input.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>B</ClassBus>
<NgTankSystem>Liquefied</NgTankSystem>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>B</ClassBus>
<NgTankSystem>Liquefied</NgTankSystem>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
index ac99245ae39617d7a7b4a484fb46ca6005a85cdd..ec346bfe3f4b706739c3233640cfd4433d34ef75 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<vif0.1:VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<vif0.1:VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-4cb168560c0d4b3d886d" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehicleExemptedPrimaryBusType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
index a1dfe0305c17985906b8e3e908c524cd595ac0ce..61fb4d1c18c7ba15148b9474f678a233ca80bca7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
@@ -6,7 +6,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-4cb168560c0d4b3d886d" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehicleExemptedPrimaryBusType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index c05751b10f15f84dea6532b141d717b2ff5ff9cf..2d6bf0b2ee7d74087c126a895903ad87e850d11a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 8c6780476508c0f76b89a2e62393c83ef4de4dd5..e046982275ce9d57aa7748858c20a9d7e82e486f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index 558a14bba8d743e37f34a892a94fdda477847069..4eb92780fc190e3ab2e91c88436629e809ba7584 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index d2173a5bc555e4de2827baa3faf7846cb2124cdc..af0aebe87fbf504d737202b82d038efeb2b6cde9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 3cd8d425981460fc1397bc5ecb452f45ba95ce34..35ed396b166d5a7d425ffa513708d65c8773761e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index cc86208f242838f8e4feb89f6cb8528cd9f2a2f1..ffd4cfe2d4383de3fc6b6e9638e7b54630ebbf4f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index bc03e50212bc45a042ed350c8635eca6d5660368..8e5fff2ac5741a0c89d745fe18b2e8665ef7269d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index a0f342417a135fab931debfea70a34f36f004f4b..aac8e48ed1324b183b220470929d47c483ce5af4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index 841720ef6ac519c3a045f5b27c454b876cf682a4..2f82a47cb894a57ac87e2b6192be871868d11b18 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -5,7 +5,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-622a60d3b3cf4340a362" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 7aa3d38fbe6ce4acce962eb218d79a371baa8214..8029bccef36757ea465f6e2a916a9f2be1f69241 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 22f99e3cd63fed7b699ae186af47573cc3bca2cf..ae4c71b1d9446ec61739c91ddb105d7e53857383 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -7,7 +7,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 53e56e8b8f3823973131160dd4869fb092641255..e7ec35a03935c3272887cf34b3a483c0236c3a5d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 586c608eb4d46140fe6ad025fb6556f327cc33fb..c067725592fa62bdd26e5df8e906d74512a35701 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 092cda1172d7539b1006774b00db7c48380b08d5..8c0ece1cb5e5e8ac8ca5d29fc5579deec110bf34 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted-sample.xml
index 23461b99f9bab9395382207993ae87b805b046c2..c9f6fb6caae197e4a036e4f47fa97139d03fa56a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted-sample.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
index bf28163e91325e459734a5da6fd098c3ce3917c2..5b590a46fb9d00679941e61bbab57b0118bca568 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index eec7c3edbf78e18be6b5545b9361440fca8684cb..f5c46dd38550e6fd9800de77279f390b05152049 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 5d41d4bdc57357c2a19d556f9ea81b94ebe7c456..3db378d4b78f2d114bedc58d047a7b29dc1987d7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 3731a2593bfd5943be3efd5d8fd1b16f8343b709..92f8f183255b2646a7d6546d2b7337b2ea5e2f64 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
index 498242e718fd984e6e2cbcd924410fdb87114d67..74446ca4b5fe12f029d8fb49b0a73eced2019756 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
index 48c6242e17c1335e61b94448eeeeb201946ae644..355f7c3c61b19c4b0625674e92d2ace4fc6dcaad 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
index 4423fe5d7865b0eb6afd370b27c8e519b3313ebf..7eb81d4175d18ee0766fbd95464cac4805d391c2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
index af6e9783f8b62d60ce628cc2be1b293fb5fdf101..b105b0286e3d6bf9f66dc78f96a4163ae92b2b2c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
index 32bd949e65eb41251297ec6f1365c0de211c53fe..bb62e507e70643526230fba55a5ae3902151424c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
index f4e5327fe4c834aa67a232849d473dc3b0407a75..cee5e00969a78ba93ecccc5ca3e6bd419f7998f0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:/VectoCore/VectoCore/Resources/XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
index dd906dd093f9f3443e5ee1ad9a81227f47c75574..8b9a0086c4e8e73407a39c20ed167c420e157ca2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
@@ -5,7 +5,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index ac8313e475767fdbd08e7080345679deefe4a63d..861fce274bd5c9ecdbd38bc51f71676b5e968b8c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -5,7 +5,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index 266e2e08b4556b88b61a374ba33c8c51d59b2fbd..b05f542a0a41d7913e1b8575ea4aace6c1233e1f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
index 7bca53ff3c6799c523a6f6c3276053350ed8cc3c..773b3c30aab494e314348b5b8227c81fef97a577 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref.xml
index 05992371ec16150d087470d5abf97d8e30d89de4..7d3108a0aeb5728869bb68337576305f2267cb21 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<Engine>
<Data id="ENG-gooZah3D">
<Manufacturer>Generic Engine Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref_DF_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref_DF_WHR.xml
index 54870fbd55fc127a79555d33d4e40376e6b64005..a9c572df85a0cbf1bb3537bd1c921b8b66e9753c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref_DF_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_engine-sample_ref_DF_WHR.xml
@@ -7,7 +7,7 @@
xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:vecomp="urn:tugraz:ivt:VectoAPI:EngineeringComponent"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringComponent E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoEngineeringComponent.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringComponent E:/QUAM/Workspace/VECTO_DEV_ADAS/VectoCore/VectoCore/Resources/XSD/VectoEngineeringComponent.xsd"
xsi:type="VectoComponentEngineeringType">
<Engine>
<ve1.0:Data id="ENG-gooZah3D" xsi:type="ve1.1:EngineDataEngineeringType" xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v1.1">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml
index 00972f9b30e2d34b754428be42dab080c0328003..ac03a1cf17a9404d0930a0b7314a0179839e35c7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<Gearbox>
<Data id="gbx-vi2Oak2N">
<Manufacturer>Generic Gearbox Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample.xml
index 66893d0bbeb9ed8077530b6e98261722a96f5537..61f71f2cddc3defb036b0c41f9b1725e44237350 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoInputEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<EngineOnlyMode>false</EngineOnlyMode>
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml
index ce03ee72fb8833be1ce36812d8c2b829875ba06a..e7b5f6aaeb66636e0d5b607031012b4c6054b7de 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v1.0"
xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoEngineeringJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput E:/QUAM/Workspace/VECTO_DEV_ADAS/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd">
<EngineOnlyMode>false</EngineOnlyMode>
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_ref.xml
index 7961eceb303a045187a0da0e6a0f887d5edd39cd..d8dcbc39f0de2fdf001047a0559c94c2a54c3f5f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_ref.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_ref.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoInputEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<EngineOnlyMode>false</EngineOnlyMode>
<Vehicle>
<Resource type="xml" file="engineering_vehicle_ref.xml"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
index a061b4141e654384d302ed6fd593db0f68ea9edb..882e7e2573cfac8e41099c546013cfa009e53678 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<TorqueConverter>
<Data>
<Manufacturer>Generic Torqueconverter Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_vehicle_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_vehicle_ref.xml
index cb13f2281fcc8f4c9a2626a75a7715f1397ca7ff..b77aa73df37dc8a29c6dbdce22479ce073b0d491 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_vehicle_ref.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_vehicle_ref.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.0.7.xsd">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<Model>Generic LongHaul Truck</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/job.vecto b/VectoCore/VectoCoreTest/TestData/job.vecto
index 6558c323fd705ea7b508c3e66591e03173ec3cab..2e140bbec84082f31a852cbc2d36831dd0c80761 100644
--- a/VectoCore/VectoCoreTest/TestData/job.vecto
+++ b/VectoCore/VectoCoreTest/TestData/job.vecto
@@ -7,14 +7,14 @@
},
"Body": {
"SavedInDeclMode": false,
- "VehicleFile": "Components\\24t Coach.vveh",
- "EngineFile": "Components\\24t Coach.veng",
- "GearboxFile": "Components\\24t Coach.vgbx",
+ "VehicleFile": "Components//24t Coach.vveh",
+ "EngineFile": "Components//24t Coach.veng",
+ "GearboxFile": "Components//24t Coach.vgbx",
"Cycles": [
- "Cycles\\1-Gear-Test-dist.vdri"
+ "Cycles//1-Gear-Test-dist.vdri"
],
"Aux": [],
- "VACC": "Components\\Coach.vacc",
+ "VACC": "Components//Coach.vacc",
"EngineOnlyMode": false,
"StartStop": {
"Enabled": false,
diff --git a/VectoCore/VectoCoreTest/Utils/PathHelperTest.cs b/VectoCore/VectoCoreTest/Utils/PathHelperTest.cs
index b7195dc91739d73ba5084d92614a95099736066e..ea0564baa6b14382fe901233ebe9b52536f4e31b 100644
--- a/VectoCore/VectoCoreTest/Utils/PathHelperTest.cs
+++ b/VectoCore/VectoCoreTest/Utils/PathHelperTest.cs
@@ -12,11 +12,13 @@ namespace TUGraz.VectoCore.Tests.Utils
[Test]
public void RelativePathTest1()
{
- var path =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\PrimaryAndStageInput\\";
- var relativeTo =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\";
+ var path = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\PrimaryAndStageInput"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/VectoCoreTest/TestData/Integration/Buses/PrimaryAndStageInput";
+ var relativeTo = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/VectoCoreTest/TestData/Integration/Buses/";
var result = PathHelper.GetRelativePath(relativeTo, path);
@@ -24,41 +26,51 @@ namespace TUGraz.VectoCore.Tests.Utils
Assert.AreEqual("PrimaryAndStageInput", result );
Assert.AreEqual(path, PathHelper.GetAbsolutePath(relativeTo, result));
-
}
[Test]
public void RelativePathTest2()
{
- var path =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\PrimaryAndStageInput\\file1.file";
- var relativeTo =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\file3.file";
-
+ var path = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\PrimaryAndStageInput\\file1.file"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/VectoCoreTest/TestData/Integration/Buses/PrimaryAndStageInput/file1.file";
+
+ var relativeTo = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\file3.file"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/VectoCoreTest/TestData/Integration/Buses/file3.file";
var result = PathHelper.GetRelativePath(relativeTo, path);
- Assert.AreEqual("PrimaryAndStageInput\\file1.file", result);
+ var compareTo = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "PrimaryAndStageInput\\file1.file"
+ : "PrimaryAndStageInput/file1.file";
- Assert.AreEqual(path, PathHelper.GetAbsolutePath(relativeTo, result));
+ Assert.AreEqual(compareTo, result);
+ Assert.AreEqual(path, PathHelper.GetAbsolutePath(relativeTo, result));
}
+
[Test]
public void RelativePathTest3()
{
- var path =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\file.file";
- var relativeTo =
- "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\file3.file";
-
+ var path = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\file.file"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/file.file";
+
+ var relativeTo = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Integration\\Buses\\file3.file"
+ : "/Users/Harry/source/repos/vecto-dev/VectoCore/VectoCoreTest/TestData/Integration/Buses/file3.file";
var result = PathHelper.GetRelativePath(relativeTo, path);
- Assert.AreEqual("..\\..\\..\\..\\file.file", result);
- Assert.AreEqual(path, PathHelper.GetAbsolutePath(relativeTo, result));
+ var compareTo = (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ ? "..\\..\\..\\..\\file.file"
+ : "../../../../file.file";
+ Assert.AreEqual(compareTo, result);
+ Assert.AreEqual(path, PathHelper.GetAbsolutePath(relativeTo, result));
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index 2bbb611ebd9468ba3e53bcb90db23813c14a014e..733b750042cfabe8070d464ba410b141a9a57c33 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -1092,7 +1092,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
}
- [TestCase(@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_vehicle-fullElectricSP.xml")]
+ [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml")]
public void TestReadingNewSteeringPumpTechnologies(string file)
{
var reader = XmlReader.Create(file);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 956dc98ce00eeb9e7bdf2a91b23972511551adb0..4b696c3803e568435142982a36a801f08f5c81db 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -28,60 +28,60 @@ namespace TUGraz.VectoCore.Tests.XML
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- private const string BASE_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\";
-
-
- [TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
- TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2.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_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_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"),
+ private const string BASE_DIR = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/";
+
+
+ [TestCase(@"HeavyLorry/Conventional_heavyLorry_AMT.xml"),
+ TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2.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_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_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)
{
ReadDeclarationJob(jobFile);
}
- [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(@"CompletedBus/Conventional_completedBus_1.xml"),
+ TestCase(@"CompletedBus/HEV_completedBus_1.xml"),
+ TestCase(@"CompletedBus/IEPC_completedBus_1.xml"),
+ TestCase(@"CompletedBus/PEV_completedBus_1.xml"),
]
public void TestReadingCompletedBus_V24(string jobfile)
{
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
index c209074e66391df9f42de882021fbba7410dc076..b37d1ca0f47958a4a1735c4bdc73fef8c893c8b4 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
@@ -34,62 +34,62 @@ namespace TUGraz.VectoCore.Tests.XML
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- private const string BASE_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\";
- private const string ADDITONAL_TESTS_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\";
- private const string Optional_TESTS_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\WithoutOptionalEntries";
-
-
- [TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
- TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2.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_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_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"),
+ private const string BASE_DIR = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/";
+ private const string ADDITONAL_TESTS_DIR = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/";
+ private const string Optional_TESTS_DIR = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries";
+
+
+ [TestCase(@"HeavyLorry/Conventional_heavyLorry_AMT.xml"),
+ TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2.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_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_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)
{
ReadDeclarationJob(jobFile);
}
- [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(@"CompletedBus/Conventional_completedBus_1.xml"),
+ TestCase(@"CompletedBus/HEV_completedBus_1.xml"),
+ TestCase(@"CompletedBus/IEPC_completedBus_1.xml"),
+ TestCase(@"CompletedBus/PEV_completedBus_1.xml"),
]
public void TestReadingCompletedBus_V24(string jobfile)
{
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.XML
return runs;
}
- [TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/Conventional_heavyLorry_AMT.xml", BASE_DIR)]
[TestCase(@"Conventional_heavyLorry_AMT_n_opt.xml", Optional_TESTS_DIR)]
public void TestConventionalHeavyLorry(string jobfile, string testDir)
{
@@ -194,7 +194,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("None", pto.PTOTransmissionType);
}
- [TestCase(@"MediumLorry\Conventional_mediumLorry_AMT.xml", BASE_DIR) ]
+ [TestCase(@"MediumLorry/Conventional_mediumLorry_AMT.xml", BASE_DIR) ]
[TestCase(@"Conventional_mediumLorry_AMT_n_opt.xml", Optional_TESTS_DIR)]
public void TestConventionalMediumLorry(string jobfile, string testDir)
{
@@ -244,7 +244,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
- [TestCase(@"PrimaryBus\Conventional_primaryBus_AMT.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/Conventional_primaryBus_AMT.xml", BASE_DIR)]
[TestCase(@"Conventional_primaryBus_AMT_n_opt.xml", Optional_TESTS_DIR)]
public void TestConventionalPrimaryHeavyBus(string jobfile, string testDir)
{
@@ -289,7 +289,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
- [TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV_heavyLorry_AMT_Px.xml", BASE_DIR)]
[TestCase(@"HEV_heavyLorry_AMT_Px_Capacitor.xml", ADDITONAL_TESTS_DIR)]
[TestCase(@"HEV_heavyLorry_AMT_Px_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVHeavyLorryPx(string jobfile, string testDir)
@@ -669,7 +669,7 @@ namespace TUGraz.VectoCore.Tests.XML
#endregion
- [TestCase(@"MediumLorry\HEV_mediumLorry_AMT_Px.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/HEV_mediumLorry_AMT_Px.xml", BASE_DIR)]
[TestCase(@"HEV_mediumLorry_AMT_Px_n_opt.xml", Optional_TESTS_DIR )]
public void TestHEVMediumLorry(string jobfile, string testDir)
{
@@ -724,7 +724,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"PrimaryBus\HEV_primaryBus_AMT_Px.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/HEV_primaryBus_AMT_Px.xml", BASE_DIR)]
[TestCase(@"HEV_primaryBus_AMT_Px_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVPrimaryBusAMTPx(string jobfile, string testDir)
{
@@ -774,7 +774,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml", BASE_DIR)]
[TestCase(@"HEV-S_heavyLorry_AMT_S2_ADC.xml", ADDITONAL_TESTS_DIR)]
[TestCase(@"HEV-S_heavyLorry_AMT_S2_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVHeavyLorryAMTS2(string jobfile, string testDir)
@@ -881,7 +881,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"HeavyLorry\HEV-S_heavyLorry_S3.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV-S_heavyLorry_S3.xml", BASE_DIR)]
[TestCase(@"HEV-S_heavyLorry_S3_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVHeavyLorryS3(string jobfile, string testDir)
{
@@ -931,7 +931,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"HeavyLorry\HEV-S_heavyLorry_S4.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV-S_heavyLorry_S4.xml", BASE_DIR)]
[TestCase(@"HEV-S_heavyLorry_S4_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVHeavyLorryS4(string jobfile, string testDir)
{
@@ -979,7 +979,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"MediumLorry\HEV-S_mediumLorry_AMT_S2.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/HEV-S_mediumLorry_AMT_S2.xml", BASE_DIR)]
[TestCase(@"HEV-S_mediumLorry_AMT_S2_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVMediumLorryS2(string jobfile, string testDir)
{
@@ -1030,7 +1030,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"MediumLorry\HEV-S_mediumLorry_S3.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/HEV-S_mediumLorry_S3.xml", BASE_DIR)]
[TestCase(@"HEV-S_mediumLorry_S3_n_opt.xml", Optional_TESTS_DIR)]
public void TestHevMediumLorryS3(string jobfile, string testDir)
{
@@ -1081,7 +1081,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"MediumLorry\HEV-S_mediumLorry_S4.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/HEV-S_mediumLorry_S4.xml", BASE_DIR)]
[TestCase(@"HEV-S_mediumLorry_S4_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVMediumLorryS4(string jobfile, string testDir)
{
@@ -1130,7 +1130,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/HEV-S_primaryBus_AMT_S2.xml", BASE_DIR)]
[TestCase(@"HEV-S_primaryBus_AMT_S2_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVPrimaryBusS2(string jobfile, string testDir)
{
@@ -1177,7 +1177,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\HEV-S_primaryBus_S3.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/HEV-S_primaryBus_S3.xml", BASE_DIR)]
[TestCase(@"HEV-S_primaryBus_S3_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVPrimaryBusS3(string jobfile, string testDir)
{
@@ -1222,7 +1222,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\HEV-S_primaryBus_S4.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/HEV-S_primaryBus_S4.xml", BASE_DIR)]
[TestCase(@"HEV-S_primaryBus_S4_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVPrimaryBusS4(string jobfile, string testDir)
{
@@ -1268,7 +1268,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml", BASE_DIR)]
[TestCase(@"HEV-S_heavyLorry_IEPC-S_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVIEPCHeavyLorry(string jobfile, string testDir)
{
@@ -1368,7 +1368,7 @@ namespace TUGraz.VectoCore.Tests.XML
#endregion
- [TestCase(@"MediumLorry\HEV-S_mediumLorry_IEPC-S.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/HEV-S_mediumLorry_IEPC-S.xml", BASE_DIR)]
[TestCase(@"HEV-S_mediumLorry_IEPC-S_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVIEPCSMediumLorry(string jobfile, string testDir)
{
@@ -1418,7 +1418,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/HEV-S_primaryBus_IEPC-S.xml", BASE_DIR)]
[TestCase(@"HEV-S_primaryBus_IEPC-S_n_opt.xml", Optional_TESTS_DIR)]
public void TestHEVIEPCSPrimaryBus(string jobfile, string testDir)
{
@@ -1461,9 +1461,9 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/PEV_heavyLorry_AMT_E2.xml", BASE_DIR)]
[TestCase(@"PEV_heavyLorry_AMT_E2_n_opt.xml", Optional_TESTS_DIR)]
- [TestCase(@"HeavyLorry\PEV_heavyLorry_APT-N_E2.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/PEV_heavyLorry_APT-N_E2.xml", BASE_DIR)]
[TestCase(@"PEV_heavyLorry_APT-N_E2_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE2HeavyLorry(string jobfile, string testDir)
{
@@ -1510,7 +1510,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"HeavyLorry\PEV_heavyLorry_E3.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/PEV_heavyLorry_E3.xml", BASE_DIR)]
[TestCase(@"PEV_heavyLorry_E3_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE3HeavyLorry(string jobfile, string testDir)
{
@@ -1556,7 +1556,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"HeavyLorry\PEV_heavyLorry_E4.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/PEV_heavyLorry_E4.xml", BASE_DIR)]
[TestCase(@"PEV_heavyLorry_E4_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE4HeavyLorry(string jobfile, string testDir)
{
@@ -1602,9 +1602,9 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"MediumLorry\PEV_mediumLorry_AMT_E2.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/PEV_mediumLorry_AMT_E2.xml", BASE_DIR)]
[TestCase(@"PEV_mediumLorry_AMT_E2_n_opt.xml", Optional_TESTS_DIR)]
- [TestCase(@"MediumLorry\PEV_mediumLorry_APT-N_E2.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/PEV_mediumLorry_APT-N_E2.xml", BASE_DIR)]
[TestCase(@"PEV_mediumLorry_APT-N_E2_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE2MediumLorry(string jobfile, string testDir)
{
@@ -1657,7 +1657,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"MediumLorry\PEV_mediumLorry_E3.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/PEV_mediumLorry_E3.xml", BASE_DIR)]
[TestCase(@"PEV_mediumLorry_E3_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE3MediumLorry(string jobfile, string testDir)
{
@@ -1703,7 +1703,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"MediumLorry\PEV_mediumLorry_E4.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/PEV_mediumLorry_E4.xml", BASE_DIR)]
[TestCase(@"PEV_mediumLorry_E4_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVE4MediumLorry(string jobfile, string testDir)
{
@@ -1749,7 +1749,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"PrimaryBus\PEV_primaryBus_AMT_E2.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/PEV_primaryBus_AMT_E2.xml", BASE_DIR)]
[TestCase(@"PEV_primaryBus_AMT_E2_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVPrimaryBusE2(string jobfile, string testDir)
{
@@ -1794,7 +1794,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\PEV_primaryBus_E3.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/PEV_primaryBus_E3.xml", BASE_DIR)]
[TestCase(@"PEV_primaryBus_E3_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVPrimaryBusE3(string jobfile, string testDir)
{
@@ -1837,7 +1837,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"PrimaryBus\PEV_primaryBus_E4.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/PEV_primaryBus_E4.xml", BASE_DIR)]
[TestCase(@"PEV_primaryBus_E4_n_opt.xml", Optional_TESTS_DIR)]
public void TestPEVPrimaryBusE4(string jobfile, string testDir)
{
@@ -1879,7 +1879,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"HeavyLorry\IEPC_heavyLorry.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/IEPC_heavyLorry.xml", BASE_DIR)]
[TestCase(@"IEPC_heavyLorry_n_opt.xml", Optional_TESTS_DIR)]
public void TestIEPCHeayLorry(string jobfile, string testDir)
{
@@ -1922,7 +1922,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"MediumLorry\IEPC_mediumLorry.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/IEPC_mediumLorry.xml", BASE_DIR)]
[TestCase(@"IEPC_mediumLorry_n_opt.xml", Optional_TESTS_DIR)]
public void TestIEPCMediumLorry(string jobfile, string testDir)
{
@@ -1966,7 +1966,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"PrimaryBus\IEPC_primaryBus.xml", BASE_DIR)]
+ [TestCase(@"PrimaryBus/IEPC_primaryBus.xml", BASE_DIR)]
[TestCase(@"IEPC_primaryBus_n_opt.xml", Optional_TESTS_DIR)]
public void TestIEPCPrimaryBus(string jobfile, string testDir)
{
@@ -2006,7 +2006,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- //[TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S_IEPC_Std.xml", BASE_DIR)]
+ //[TestCase(@"PrimaryBus/HEV-S_primaryBus_IEPC-S_IEPC_Std.xml", BASE_DIR)]
//public void TestHEVSPrimaryBusIEPCStd(string jobfile, string testDir)
//{
// var filename = Path.Combine(testDir, jobfile);
@@ -2039,7 +2039,7 @@ namespace TUGraz.VectoCore.Tests.XML
- [TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml", BASE_DIR)]
+ [TestCase(@"HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml", BASE_DIR)]
public void TestHEVHeavyLorryAMTPxIHPC(string jobfile, string testDir)
{
var filename = Path.Combine(testDir, jobfile);
@@ -2076,7 +2076,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase(@"MediumLorry\PEV_mediumLorry_AMT_E2_EM_Std.xml", BASE_DIR)]
+ [TestCase(@"MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml", BASE_DIR)]
public void TestPEVMediumLorryAMTE2EMStd(string jobfile, string testDir)
{
var filename = Path.Combine(testDir, jobfile);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24VehicleDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24VehicleDataTest.cs
index aab9e7969973c29d5d454875ba1976a8c9a492d0..db89327cfe9d655908e001343cb291197c714114 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24VehicleDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24VehicleDataTest.cs
@@ -18,7 +18,7 @@ namespace TUGraz.VectoCore.Tests.XML
private const string Optional_TESTS_DIR =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\WithoutOptionalEntries";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries";
[OneTimeSetUp]
public void RunBeforeAnyTests()
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 6f5665683b985cb88d7b54ce15e9f0d39148ceef..ee236d7d622670ab32ec7fea850df037d2ba7539 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -60,50 +60,50 @@ namespace TUGraz.VectoCore.Tests.XML
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
- [TestCase(@"SchemaVersion1.0\Tractor_4x2_vehicle-class-5_5_t_0.xml")]
+ [TestCase(@"SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml")]
public void TestReadingJobVersion_V10(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.0\Tractor_4x2_vehicle-class-5_5_t_0.xml")]
+ [TestCase(@"SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml")]
public void TestReadingJobVersion_V20(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.0\vecto_vehicle-components_1.0.xml")]
+ [TestCase(@"SchemaVersion2.0/vecto_vehicle-components_1.0.xml")]
public void TestReadingJobVersion_V20_ComponentsV10(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.1\Tractor_4x2_vehicle-class-5_5_t_0.xml")]
+ [TestCase(@"SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml")]
public void TestReadingJobVersion_V21(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.1\vecto_vehicle-exempted-sample.xml")]
+ [TestCase(@"SchemaVersion2.1/vecto_vehicle-exempted-sample.xml")]
public void TestReadingJobVersion_V21_Exempted(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.1\vecto_vehicle-components_1.0.xml")]
+ [TestCase(@"SchemaVersion2.1/vecto_vehicle-components_1.0.xml")]
public void TestReadingJobVersion_V21_ComponentsV10(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.1\vecto_vehicle-components_2.0.xml")]
+ [TestCase(@"SchemaVersion2.1/vecto_vehicle-components_2.0.xml")]
public void TestReadingJobVersion_V21_ComponentsV20(string jobFile)
{
ReadDeclarationJob(jobFile);
}
- [TestCase(@"SchemaVersion2.2\Tractor_4x2_vehicle-class-5_5_t_0.xml")]
+ [TestCase(@"SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml")]
public void TestReadingJobVersion_V22(string jobFile)
{
// does not work as the new tire dimension is not allowed in VECTO at the moment
@@ -111,20 +111,20 @@ namespace TUGraz.VectoCore.Tests.XML
//Assert.AreEqual("235/60 R17 C", runs[0].GetContainer().RunData.VehicleData.AxleData[1].WheelsDimension);
- var filename = Path.Combine(@"TestData\XML\XMLReaderDeclaration", jobFile);
+ var filename = Path.Combine(@"TestData/XML/XMLReaderDeclaration", jobFile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
Assert.AreEqual("235/60 R17C", dataProvider.JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration[1].Tyre.Dimension);
}
- [TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry-Van.xml", TestName = "Medium Lorry Van"),
- TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry.xml", TestName = "Medium Lorry"),
- //TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorryFWD.xml", TestName = "Medium Lorry FWD"), // FWD no longer supported / required
+ [TestCase(@"TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml", TestName = "Medium Lorry Van"),
+ TestCase(@"TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml", TestName = "Medium Lorry"),
+ //TestCase(@"TestData/Integration/MediumLorries/vecto_vehicle-medium_lorryFWD.xml", TestName = "Medium Lorry FWD"), // FWD no longer supported / required
]
public void CreateRunDataMediumLorry(string jobFile)
{
- //var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry-sample.xml";
+ //var jobFile = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml";
var writer = new FileOutputWriter(jobFile);
var inputData = xmlInputReader.CreateDeclaration(jobFile);
@@ -154,7 +154,7 @@ namespace TUGraz.VectoCore.Tests.XML
public IVectoRun[] ReadDeclarationJob(string jobfile)
{
- var filename = Path.Combine(@"TestData\XML\XMLReaderDeclaration", jobfile);
+ var filename = Path.Combine(@"TestData/XML/XMLReaderDeclaration", jobfile);
var fileWriter = new FileOutputWriter(filename);
//var sumWriter = new SummaryDataContainer(fileWriter);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index e0c0068ab735dfe618f1eb956f8fb43a9f20696d..e81a1e5a2517e33115540644f5e9df8ce7c221eb 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.Tests.XML
protected IXMLInputDataReader _xmlInputReader;
private IKernel _kernel;
- const string _dirPath = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\";
+ const string _dirPath = @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/";
const string _consolidatedInputData = _dirPath + "vecto_multistage_consolidated_multiple_stages.xml";
const string _primaryOnlyInputData = _dirPath + "vecto_multistage_primary_vehicle_only.xml";
const string _oneStageInputData = _dirPath + "vecto_multistage_consolidated_one_stage.xml";
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index e6f64bb85b0d4ca7add6630ec87f1193ace9140e..0e225f64a02d62980d860f48caac20902b85d11c 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -22,10 +22,10 @@ namespace TUGraz.VectoCore.Tests.XML
private IKernel _kernel;
const string VIF01 =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_3.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml";
const string VIF02 =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml";
+ @"TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 90a227960f4e70163149109ea08212641513e28a..feb9ca646550e45cc1a225a64a2c42a15061d48c 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -18,14 +18,14 @@ namespace TUGraz.VectoCore.Tests.XML
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
- const string DirPath = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\";
+ const string DirPath = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/";
const string VehicleInterimStageInput = DirPath + "vecto_vehicle-stage_input_full-sample.xml";
const string VehicleExemptedInterimStageInput = DirPath + "vecto_vehicle-exempted_input_full-sample.xml";
const string VehicleExemptedMandatoryOnly = DirPath + "vecto_vehicle-exempted_input_only_mandatory_entries.xml";
const string VehicleComponentsEntriesNullable = DirPath + "vecto_vehicle-stage_input_only_component_nullable_entries.xml";
const string VehicleAirdragStandardValue = DirPath + "vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml";
- const string ValdiationDirPath = @"TestData\XML\XMLReaderDeclaration\";
+ const string ValdiationDirPath = @"TestData/XML/XMLReaderDeclaration/";
const string ExemptedInputFullSample = ValdiationDirPath + "vecto_vehicle-exempted_input_full-sample.xml";
const string ExemptedOnlyCertainEntries01 = ValdiationDirPath + "vecto_vehicle-exempted_input_only_certain_entries01-sample.xml";
const string ExemptedOnlyCertainEntries02 = ValdiationDirPath + "vecto_vehicle-exempted_input_only_certain_entries02-sample.xml";
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
index 23d2e8d374537c5ca7fb085b3c35e77bcebb4ab9..3227f144b8335070caca4651206799563f9b9e92 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.Tests.XML
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
- const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-primary_heavyBus-sample.xml";
+ const string SampleVehicleDecl = @"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml";
[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
index e5ba6ea7cfe7aeb1aa654a47819740b4fe25b594..a7e22e9909951b5330aa8e99eabedc6f0d5e8440 100644
--- a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
@@ -45,16 +45,16 @@ namespace TUGraz.VectoCore.Tests.XML
//[Parallelizable(ParallelScope.All)]
public class XMLWritingTests
{
- const string EngineOnlyJob = @"TestData\XML\EngineOnlyJob\EngineOnly.vecto";
- const string EngineeringJob = @"TestData\XML\EngineeringJob\Class5_Tractor_4x2\Class5_Tractor_ENG.vecto";
+ const string EngineOnlyJob = @"TestData/XML/EngineOnlyJob/EngineOnly.vecto";
+ const string EngineeringJob = @"TestData/XML/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto";
const string EngineeringJobFull =
- @"TestData\XML\XMLWriter\EngineeringJob\Class5_Tractor_4x2\Class5_Tractor_ENG-FULL.vecto";
+ @"TestData/XML/XMLWriter/EngineeringJob/Class5_Tractor_4x2/Class5_Tractor_ENG-FULL.vecto";
- const string DeclarationJob = @"TestData\XML\XMLWriter\DeclarationJob\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto";
+ const string DeclarationJob = @"TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto";
const string DeclarationJobFull =
- @"TestData\XML\XMLWriter\DeclarationJob\Class5_Tractor_4x2\Class5_Tractor_DECL-FULL.vecto";
+ @"TestData/XML/XMLWriter/DeclarationJob/Class5_Tractor_4x2/Class5_Tractor_DECL-FULL.vecto";
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;