diff --git a/VECTO.sln b/VECTO.sln
index c4947b69e19bff263239f0f5c3a3197fc68f725b..f44663eebd0fc2145b1fdd993c9fafb559ad8801 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -101,12 +101,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VECTOMultistage", "Tools\VE
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoMockup", "VectoMockup", "{927F1B17-8075-4185-A324-92971D2FB020}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockup", "VectoMockup\VectoMockup\VectoMockup.csproj", "{8E8F5C65-501E-4AAC-97DE-10DD283883D2}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockupTest", "VectoMockup\VectoMockupTest\VectoMockupTest.csproj", "{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}"
- ProjectSection(ProjectDependencies) = postProject
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {8E8F5C65-501E-4AAC-97DE-10DD283883D2}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -390,16 +385,6 @@ Global
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.Build.0 = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.Build.0 = Release|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
@@ -430,7 +415,6 @@ Global
{083F6B3C-9529-448F-AF1D-D0889852B918} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {927F1B17-8075-4185-A324-92971D2FB020}
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88} = {927F1B17-8075-4185-A324-92971D2FB020}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 120a0e87d210edcd38587585a417b33628ebae4c..70f23977bb633ce73905cc7037fc73430a0527a9 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -70,17 +70,17 @@
</PackageReference>
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
<ItemGroup>
<ProjectReference Include="..\HashingTool\HashingTool.csproj" />
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index e00fc8b960e6c5a6e16f81c6a2d6678964e856e4..1c31f8ef61b82310512be01b2f137fc49f9c33da 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -43,13 +43,13 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
</When>
- </Choose>
+ </Choose>-->
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index a19f94b3c403240caebc053d7c7977e2f4a9d348..2f32ef46cdbff66566ac1c0772eae50404e60508 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -42,15 +42,15 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index 8d676b57acfd81b05ba7c7c114a35b37231d9a1f..d85764e460f07fcf2d6dfca1e0ce5a5c4a946705 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -658,8 +658,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
//public override IRetarderInputData RetarderInputData =>
// ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
- #endregion
- }
+ #endregion
+ }
// ---------------------------------------------------------------------------------------
@@ -801,11 +801,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliariesDeclarationInputData ??
(_busAuxiliariesDeclarationInputData = ComponentReader.BusAuxiliariesInputData);
- //public override IAngledriveInputData AngledriveInputData =>
- // ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+ //public override IAngledriveInputData AngledriveInputData =>
+ // ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
- //public override IRetarderInputData RetarderInputData =>
- // ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
+ //public override IRetarderInputData RetarderInputData =>
+ // ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
index d5ee832559a916d169e0fc9471528e5b705b95ac..109bd6d0f9ed5bb3ad58f4aa902d76f4aa589ecc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
@@ -350,20 +350,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- if (AnyMissingGear(currentGears)) {
+ if (DragCurves.Count > 1 && AnyMissingGear(currentGears))
throw new ArgumentException("The DragCurve contains a gear which was not specified under gears");
}
}
- private bool AnyMissingGear(Dictionary<int, bool> foundedGears)
+ private bool AnyMissingGear(Dictionary<int, bool> foundGears)
{
- var keys = foundedGears.Keys.ToList();
+ var keys = foundGears.Keys.ToList();
foreach (var key in keys) {
- if (!foundedGears[key]) {
+ if(!foundGears[key])
return true;
- }
+ foundGears[key] = false;
- foundedGears[key] = false;
}
return false;
diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoCore/VectoCore/Mockup/MockupModalDataContainer.cs
similarity index 100%
rename from VectoMockup/VectoMockup/MockupModalDataContainer.cs
rename to VectoCore/VectoCore/Mockup/MockupModalDataContainer.cs
diff --git a/VectoMockup/VectoMockup/MockupResultReader.cs b/VectoCore/VectoCore/Mockup/MockupResultReader.cs
similarity index 99%
rename from VectoMockup/VectoMockup/MockupResultReader.cs
rename to VectoCore/VectoCore/Mockup/MockupResultReader.cs
index 4d235350a16ece3472c173742ea53a6fb6ecbd78..a627fca60f03d15b3e30078e41fc9bd615a0fd9c 100644
--- a/VectoMockup/VectoMockup/MockupResultReader.cs
+++ b/VectoCore/VectoCore/Mockup/MockupResultReader.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoMockup
private static class MockupResultHelper
{
private static string _convArch = "Conv";
- private const string mockupResourcePrefix = "TUGraz.VectoMockup.MockupResults";
+ private const string mockupResourcePrefix = "TUGraz.VectoCore.Mockup.MockupResults";
private static HashSet<string> conventional = new HashSet<string>() {
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs b/VectoCore/VectoCore/Mockup/MockupXMLInputDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs
rename to VectoCore/VectoCore/Mockup/MockupXMLInputDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/CIFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/CIFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/MRFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/MRFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/MockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
similarity index 84%
rename from VectoMockup/VectoMockup/Ninject/MockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
index cbc57cb97423faeaf92992ae5b6d106e4bd71cc1..993f9b86a244647771a1f4178153c0f05628f73f 100644
--- a/VectoMockup/VectoMockup/Ninject/MockupModule.cs
+++ b/VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
@@ -19,6 +19,11 @@ namespace TUGraz.VectoMockup.Ninject
public override void Load()
{
+ LoadModule<CIFMockupModule>();
+ LoadModule<MRFMockupModule>();
+ LoadModule<SimulatorFactoryModule>();
+ LoadModule<VIFMockupModule>();
+
Rebind<IVectoRunDataFactoryFactory>().To<VectoMockUpRunDataFactoryFactory>();
Rebind<IXMLDeclarationReportFactory>().To<MockupReportFactory>();
Rebind<IXMLInputDataReader>().To<MockupXMLInputDataFactory>();
diff --git a/VectoMockup/VectoMockup/Ninject/SimulatorFactoryModule.cs b/VectoCore/VectoCore/Mockup/Ninject/SimulatorFactoryModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/SimulatorFactoryModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/SimulatorFactoryModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/VIFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/VIFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Reports/IXMLMockupReport.cs b/VectoCore/VectoCore/Mockup/Reports/IXMLMockupReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/IXMLMockupReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/IXMLMockupReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupCustomerReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupCustomerReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupManufacturerReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupManufacturerReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs b/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupVIFReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupVIFReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupVIFReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupVIFReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs b/VectoCore/VectoCore/Mockup/Reports/MockupVehicleInformationFile.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupVehicleInformationFile.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupPrimaryReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupPrimaryReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
diff --git a/VectoMockup/VectoMockup/Simulation/MockupExemptedRun.cs b/VectoCore/VectoCore/Mockup/Simulation/MockupExemptedRun.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/MockupExemptedRun.cs
rename to VectoCore/VectoCore/Mockup/Simulation/MockupExemptedRun.cs
diff --git a/VectoMockup/VectoMockup/Simulation/MockupRun.cs b/VectoCore/VectoCore/Mockup/Simulation/MockupRun.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/MockupRun.cs
rename to VectoCore/VectoCore/Mockup/Simulation/MockupRun.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs b/VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
rename to VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
rename to VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
diff --git a/VectoMockup/VectoMockup/VectoMockup.cs b/VectoCore/VectoCore/Mockup/VectoMockup.cs
similarity index 100%
rename from VectoMockup/VectoMockup/VectoMockup.cs
rename to VectoCore/VectoCore/Mockup/VectoMockup.cs
diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
index b2480b363581ce2bd07c44eacf0baefe6963c24e..89806dbb6b7352c94b9b9f744eb7ace7074ed0bc 100644
--- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
@@ -47,6 +47,8 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.
using TUGraz.VectoCore.OutputData.XML.Engineering;
using TUGraz.VectoCore.OutputData.XML.GroupWriter;
+using TUGraz.VectoMockup.Ninject;
+
namespace TUGraz.VectoCore
{
public abstract class AbstractNinjectModule : NinjectModule
@@ -107,27 +109,12 @@ namespace TUGraz.VectoCore
LoadModule<CIFResultsNinjectModule>();
LoadModule<VIFNinjectModule>();
-
- LoadModule<VIFResultsNinjectModule>();
-
-
-#if (MOCKUP)
- var compiledModuleLoaderPlugin = new CompiledModuleLoaderPlugin(Kernel, new AssemblyNameRetriever());
- var assembly = Assembly.LoadFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"VectoMockup.dll"));
- //var assembly = Assembly.LoadFile("VectoMockup.dll");
- Kernel.Load(new Assembly[]{assembly});
-#endif
-
-
-
-
+ LoadModule<VIFResultsNinjectModule>();
+ #if (MOCKUP) //TODO: add second constant for release
+ LoadModule<MockupModule>();
+ #endif
}
-
-
-
#endregion
-
-
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
index 4e86596f22f93cbafea250ec77eaa72788b5cf84..c5d9e69386df4fecf97abfe3580fc63a8a28dd74 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
iepcXElement.Add(
new XElement(_mrf + "NrOfGears", iepcData.Gears.Count),
new XElement(_mrf + "LowestTotalTransmissionRatio", (iepcData.Gears.OrderByDescending(g => g.GearNumber).First().Ratio
- * inputData.JobInputData.Vehicle.Components.AxleGearInputData?.Ratio ?? 1.0d).ToXMLFormat(3)),
+ * (inputData.JobInputData.Vehicle.Components.AxleGearInputData?.Ratio ?? 1)).ToXMLFormat(3)),
new XElement(_mrf + XMLNames.IEPC_DifferentialIncluded, iepcData.DifferentialIncluded),
new XElement(_mrf + XMLNames.IEPC_DesignTypeWheelMotor, iepcData.DesignTypeWheelMotor),
new XElement(_mrf + XMLNames.Component_CertificationMethod, iepcData.CertificationMethod)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
index d39ddf2bc91db1fbefb9183385e7ba63a818e0e0..d47e814470b873178f976f2df39fbff5f72d31ac 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData;
- if (angelDrive?.Type == AngledriveType.None || angelDrive == null) {
+ if (angelDrive == null || angelDrive.Type != AngledriveType.SeparateAngledrive)
return null;
}
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 528f68e9d04b5e95bb51747f800dc3de33f4eb8b..505c1cf268a4ef8733a8e8e88729d5c4a1bdebbe 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -29,29 +29,50 @@
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net45|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net48|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net6.0|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>VectoMockup</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
<ItemGroup>
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Error.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" />
<None Remove="Resources\Declaration\Buses\DefaultActuationsMap.apac" />
<None Remove="Resources\Declaration\Buses\HeatingDistribution.csv" />
<None Remove="Resources\Declaration\Buses\HeatingDistributionCases.csv" />
@@ -130,6 +151,33 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <!--<EmbeddedResource Include="Mockup\MockupResults">
+ <LogicalName>TUGraz.VectoMockup.MockupResults</LogicalName>
+ </EmbeddedResource>-->
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Error.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" />
+ </ItemGroup>
+
<ItemGroup>
<Compile Update="JSONKeys.Designer.cs">
<DesignTime>True</DesignTime>
@@ -142,6 +190,10 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Conidition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')" Include="Mockup\" />
+ </ItemGroup>
+
</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_template.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_template.xml
new file mode 100644
index 0000000000000000000000000000000000000000..603dce6b2a00ca4a58c44afb0080b3069f66f929
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/CapacitorSystem_template.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration
+schemaVersion="2.0"
+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#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ <tns:CapacitorSystem xsi:type="CapacitorSystemComponentDeclarationType">
+ <Data xsi:type="CapacitorSystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2021-11-18T14:14:06.0791626Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <Capacitance>1.00</Capacitance>
+ <InternalResistance>23.45</InternalResistance>
+ <MinVoltage>3.55</MinVoltage>
+ <MaxVoltage>30.45</MaxVoltage>
+ <MaxChargingCurrent>100.00</MaxChargingCurrent>
+ <MaxDischargingCurrent>99.45</MaxDischargingCurrent>
+ <TestingTemperature>30</TestingTemperature>
+ </Data>
+ </tns:CapacitorSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoAirdrag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..79002d79bdf60d8bc71ede52eff1ea7c2506ea7a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoAirdrag.xml
@@ -0,0 +1,238 @@
+<?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_Conventional_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>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_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>
+ <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>
+ <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_Conventional_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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d0ee1468380100c8d1992536a2447a66f678cee
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_NoRetarder.xml
@@ -0,0 +1,285 @@
+<?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_Conventional_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>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_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>
+ <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>
+ <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_Conventional_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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_AMT_S2_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_AMT_S2_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..76590508b4c30c5d0c1bee87a52cc17927697c12
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_AMT_S2_NoRetarder.xml
@@ -0,0 +1,530 @@
+<?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-Sx_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>S2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType">
+ <!-- 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>
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</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>
+ <Components xsi:type="Components_HEV-S2_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>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</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>50000</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>
+ </ElectricMachineGEN>
+ <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>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 xsi:type="BatterySystemDataType" id="BAT-asdf" 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>
+ <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>
+ <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>50000</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>
+ <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>
+ <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-S_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoAirdrag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7c461ac36408db1fb78eedef3238c6cca75cfe4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoAirdrag.xml
@@ -0,0 +1,426 @@
+<?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>50000</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>
+ <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>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aacde25ff696afcafb7e5da3762f3f23197b45d1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_AMT_Px_NoRetarder.xml
@@ -0,0 +1,475 @@
+<?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>50000</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>
+ <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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoAirdrag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f619092893fb10bb4d5fbbfb80057d50ae7449d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoAirdrag.xml
@@ -0,0 +1,368 @@
+<?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_PEV_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="v2.4: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>
+ <Components xsi:type="Components_PEV-E2_LorryType">
+ <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>50000</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-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</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>
+ <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_PEV_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60977bf8e82b8246e0bec3d010fcd281f3807103
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_AMT_E2_NoRetarder.xml
@@ -0,0 +1,391 @@
+<?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_PEV_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="v2.4: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>
+ <Components xsi:type="Components_PEV-E2_LorryType">
+ <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>50000</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-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</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>
+ <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_PEV_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a1fc15f3709539aa3880f37f1d1022d38c2d555d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1.xml
@@ -0,0 +1,321 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Axl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Axl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d5ba9e3b240174c060f5dd3c02ef162c4aa60eff
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Axl.xml
@@ -0,0 +1,291 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Whl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Whl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59b26e7ee2a73ebbb6e2ebdff2a97a2203bda4a4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx1Whl.xml
@@ -0,0 +1,292 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <NrOfDesignTypeWheelMotorMeasured>1</NrOfDesignTypeWheelMotorMeasured>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3.xml
new file mode 100644
index 0000000000000000000000000000000000000000..02544798ad5df072f680682f7e3693c92edad4b4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3.xml
@@ -0,0 +1,334 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f63d37f4f83d605b52f29d4af4620c1242877c43
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl.xml
@@ -0,0 +1,304 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl_drag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl_drag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75ea912c5e0124062c1acba1036f956db84c503a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Axl_drag.xml
@@ -0,0 +1,308 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Whl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Whl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..871dd6a2176fcc5e9b85f96f50e62ffc17697ca5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3Whl.xml
@@ -0,0 +1,305 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <NrOfDesignTypeWheelMotorMeasured>1</NrOfDesignTypeWheelMotorMeasured>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3_drag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3_drag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4d505700f8c7b1d178572a25490acf30d26885fe
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/PEV_heavyLorry_IEPC_Gbx3_drag.xml
@@ -0,0 +1,338 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf1" 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-asdf1">
+ <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>rMNU7I17SCZSC0o8+zVwZ5I1dpSvJK8uuZQ8SmduVak=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf2" 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-asdf2">
+ <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>oa0mdxJCVb7SnL4wavYaEjqdmrHntwVj9Poo6taL9u4=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <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_IEPC_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94e40aea89250bd4a5064944b2fa9136f343bd88
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_NoRetarder.xml
@@ -0,0 +1,294 @@
+<?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">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
+ <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>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="6" maxTorque="1800"/>
+ <v2.0:Entry gear="1" maxTorque="2500"/>
+ <v2.0:Entry gear="12" maxTorque="1900"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <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>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <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>APT-S</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>
+ <Gear number="3">
+ <Ratio>9.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>
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.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="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</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>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="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>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_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>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>false</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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC_NoRetarder.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC_NoRetarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dc3667ec41a8e2066b2aa18a60a9e2512e0e8030
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC_NoRetarder.xml
@@ -0,0 +1,460 @@
+<?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>None</RetarderType>
+ <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="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>50000</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="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 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="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="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <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>IHPC Type 1</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <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>
+ </v2.3: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>
+ <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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78b340fe5e3be440b5685a069e812e851cd1c274
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1.xml
@@ -0,0 +1,316 @@
+<?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_IEPC_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>
+ <RetarderType>Axlegear Input Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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>
+ <!-- optional -->
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Axl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Axl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1668812af24e2d2c8d0aad1e586197800aa6d7d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Axl.xml
@@ -0,0 +1,260 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Whl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Whl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0999901ef72b2e9f29722f3d8f3068bf8ac0e259
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx1Whl.xml
@@ -0,0 +1,261 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <NrOfDesignTypeWheelMotorMeasured>1</NrOfDesignTypeWheelMotorMeasured>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+
+ </Gears>
+ <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>
+
+ </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>
+
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e66e4624caebe7e0efaec26145600d937748c413
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2.xml
@@ -0,0 +1,329 @@
+<?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_IEPC_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>
+ <RetarderType>Axlegear Input Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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>
+ <!-- optional -->
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69ae65e572d84f7b8ca12adaa0dbaa3e62a0c181
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl.xml
@@ -0,0 +1,273 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl_drag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl_drag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7266037d79372ef268781e43df3a61cdd88231b0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Axl_drag.xml
@@ -0,0 +1,333 @@
+<?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_IEPC_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>
+ <RetarderType>Axlegear Input Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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>
+ <!-- optional -->
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Whl.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Whl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2fa7499f037196fb597c86394d40c3f562510b24
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2Whl.xml
@@ -0,0 +1,274 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <NrOfDesignTypeWheelMotorMeasured>1</NrOfDesignTypeWheelMotorMeasured>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2_drag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2_drag.xml
new file mode 100644
index 0000000000000000000000000000000000000000..767fadc70ca3c1ba9dea743dded25d73c3f39cd9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/IEPC_primaryBus_Gbx2_drag.xml
@@ -0,0 +1,277 @@
+<?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_IEPC_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>
+ <RetarderType>None</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_PrimaryBusType">
+ <IEPC>
+ <v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured for complete component</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DifferentialIncluded>true</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <Ratio>3.000</Ratio>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <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="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.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="500.00" electricPower="1500.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve gear="1">
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <DragCurve gear="2">
+ <Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+ <Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#IEPC-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>/+OkpqMJNrSUR2r8zwuvw+IJOEP3c9lDM+Buo32YxO0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </IEPC>
+ <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>
+ <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_IEPC_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index d0ed8fbcbd388ec75446bc8e8c1d25fa50e4fa5e..fe69433882f0a99568c90457f376dc84ee173446 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -82,15 +82,15 @@
<ItemGroup>
<Folder Include="TestData\XML\XMLVIFBusReport\" />
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
</Project>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
index 418d947c222d4df12cfa4eb9da060e783fc2d11c..98478b8102cf4cbd0bf3082de8b49ee548d3af95 100644
--- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
+++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
@@ -48,23 +48,40 @@ namespace VectoMockupTest
protected const string ConventionalHeavyLorry = BasePath + @"HeavyLorry\Conventional_heavyLorry_AMT.xml";
protected const string ConventionalHeavyLorry_DifferentTyres = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AMT_DifferentTyres.xml";
protected const string ConventionalHeavyLorry_AT_Angledrive = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AT_Angledrive.xml";
+ protected const string ConventionalHeavyLorry_NoRetarder = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AMT_NoRetarder.xml";
+ protected const string ConventionalHeavyLorry_NoAirdrag = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AMT_NoAirdrag.xml";
protected const string ConventionalHeavyLorry_Vocational =
BasePath + @"HeavyLorry\Conventional_heavyLorry_AMT_Vocational.xml";
protected const string HEV_Px_HeavyLorry = BasePath + @"HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
protected const string HEV_S2_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
+ protected const string HEV_S2_HeavyLorry_NoRetarder = BasePathMockup + @"HeavyLorry\HEV-S_heavyLorry_AMT_S2_NoRetarder.xml";
protected const string HEV_S3_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S3.xml";
protected const string HEV_S3_HeavyLorry_ovc = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S3_ovc.xml";
protected const string HEV_S4_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S4.xml";
protected const string HEV_IEPC_S_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
protected const string PEV_E2_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
+ protected const string PEV_E2_HeavyLorry_NoRetarder = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_AMT_E2_NoRetarder.xml";
+ protected const string PEV_E2_HeavyLorry_NoAirdrag = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_AMT_E2_NoAirdrag.xml";
protected const string PEV_E2_HeavyLorry_Vocational = BasePath + @"HeavyLorry\PEV_heavyLorry_AMT_E2_Vocational.xml";
protected const string PEV_E3_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_E3.xml";
protected const string PEV_E4_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_E4.xml";
protected const string PEV_IEPC_HeavyLorry = BasePath + @"HeavyLorry\IEPC_heavyLorry.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx1 = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx1.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx1Axl = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx1Axl.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx1Whl = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx1Axl.xml";
+
+ protected const string PEV_IEPC_HeavyLorry_Gbx2 = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx3.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx2_drag = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx3_drag.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx2Axl = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx3Axl.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx2Axl_drag = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx3Axl_drag.xml";
+ protected const string PEV_IEPC_HeavyLorry_Gbx2Whl = BasePathMockup + @"HeavyLorry\PEV_heavyLorry_IEPC_Gbx3Axl.xml";
+
protected const string HEV_IHPC_HeavyLorry = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_IHPC.xml";
+ protected const string HEV_Px_HeavyLorry_NoRetarder = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_AMT_Px_NoRetarder.xml";
+ protected const string HEV_Px_HeavyLorry_NoAirDrag = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_AMT_Px_NoAirdrag.xml";
protected const string HEV_Px_HeavyLorry_ADC = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_Px_ADC.xml";
protected const string HEV_S3_HeavyLorry_ADC = BasePathMockup + @"HeavyLorry\HEV-S_heavyLorry_S3_ADC_GenSetADC.xml";
protected const string HEV_Px_HeavyLorry_SuperCap = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_Px_SuperCap.xml";
@@ -97,9 +114,11 @@ namespace VectoMockupTest
protected const string Conventional_PrimaryBus = BasePath + @"PrimaryBus\Conventional_primaryBus_AMT.xml";
protected const string Conventional_PrimaryBus_AT_Angledrive = BasePathMockup + @"PrimaryBus\Conventional_primaryBus_AT_Angledrive.xml";
+ protected const string Conventional_PrimaryBus_NoRetarder = BasePathMockup + @"PrimaryBus\Conventional_primaryBus_AT_NoRetarder.xml";
protected const string Conventional_PrimaryBus_Tyres = BasePath + @"PrimaryBus\Conventional_primaryBus_AMT_DifferentTyres.xml";
protected const string HEV_Px_PrimaryBus = BasePath + @"PrimaryBus\HEV_primaryBus_AMT_Px.xml";
protected const string HEV_IHPC_PrimaryBus = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_IHPC.xml";
+ protected const string HEV_IHPC_PrimaryBus_NoRetarder = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_IHPC_NoRetarder.xml";
protected const string HEV_Px_PrimaryBus_SuperCap = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_Px_SuperCap.xml";
protected const string HEV_S2_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
protected const string HEV_S2_PrimaryBus_GenSetADC = BasePathMockup + @"PrimaryBus\HEV-S_primaryBus_AMT_S2_GenSetADC.xml";
@@ -111,6 +130,15 @@ namespace VectoMockupTest
protected const string PEV_E3_PrimaryBus = BasePath + @"PrimaryBus\PEV_primaryBus_E3.xml";
protected const string PEV_E4_PrimaryBus = BasePath + @"PrimaryBus\PEV_primaryBus_E4.xml";
protected const string PEV_IEPC_PrimaryBus = BasePath + @"PrimaryBus\IEPC_primaryBus.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx1 = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx1.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx1Axl = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx1Axl.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx1Whl = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx1Whl.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx2 = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx2.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx2_drag = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx2_drag.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx2Axl = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx2Axl.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx2Axl_drag = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx2Axl_drag.xml";
+ protected const string PEV_IEPC_PrimaryBus_Gbx2Whl = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_Gbx2Whl.xml";
+
protected const string PEV_IEPC_std_PrimaryBus = BasePathMockup + @"PrimaryBus\IEPC_primaryBus_StdValues.xml";
protected const string PEV_E2_PrimaryBus_StdEM = BasePathMockup + @"PrimaryBus\PEV_primaryBus_AMT_E2_EMStd.xml";
@@ -248,24 +276,40 @@ namespace VectoMockupTest
[TestCase(ConventionalHeavyLorry, TestName = "ConventionalHeavyLorry")]
+ [TestCase(ConventionalHeavyLorry_NoRetarder, TestName = "ConventionalHeavyLorry_NoRetarder")]
+ [TestCase(ConventionalHeavyLorry_NoAirdrag, TestName = "ConventionalHeavyLorry_NoAirdrag")]
[TestCase(ConventionalHeavyLorry_DifferentTyres, TestName = "ConventionalHeavyLorry_DifferentTyres")]
[TestCase(ConventionalHeavyLorry_AT_Angledrive, TestName = "ConventionalHeavyLorry_AT_Angledrive")]
[TestCase(ConventionalHeavyLorry_Vocational, TestName = "ConventionalHeavyLorry_Vocational")]
//[TestCase(ConventionalHeavyLorry, false, TestName = "ConventionalHeavyLorryNoMockup")]
[TestCase(HEV_S2_HeavyLorry, TestName = "HEV_S2_HeavyLorry")]
+ [TestCase(HEV_S2_HeavyLorry_NoRetarder, TestName = "HEV_S2_HeavyLorry_NoRetarder")]
[TestCase(HEV_S3_HeavyLorry, TestName = "HEV_S3_HeavyLorry")]
[TestCase(HEV_S3_HeavyLorry_ovc, TestName = "HEV_S3_HeavyLorry_ovc")]
[TestCase(HEV_S4_HeavyLorry, TestName = "HEV_S4_HeavyLorry")]
[TestCase(HEV_Px_HeavyLorry, TestName = "HEV_Px_HeavyLorry")]
[TestCase(PEV_E2_HeavyLorry, TestName = "PEV_E2_HeavyLorry")]
+ [TestCase(PEV_E2_HeavyLorry_NoRetarder, TestName = "PEV_E2_HeavyLorry_NoRetarder")]
+ [TestCase(PEV_E2_HeavyLorry_NoAirdrag, TestName = "PEV_E2_HeavyLorry_NoAirdrag")]
[TestCase(PEV_E2_HeavyLorry_Vocational, TestName = "PEV_E2_HeavyLorry_Vocational")]
//[TestCase(PEV_E2_HeavyLorry, false, TestName = "PEV_E2_HeavyLorryNoMockup")]
[TestCase(PEV_E3_HeavyLorry, TestName = "PEV_E3_HeavyLorry")]
[TestCase(PEV_E4_HeavyLorry, TestName = "PEV_E4_HeavyLorry")]
[TestCase(PEV_IEPC_HeavyLorry, TestName = "PEV_IEPC_HeavyLorry")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx1, TestName = "PEV_IEPC_HeavyLorry_Gbx1")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx1Axl, TestName = "PEV_IEPC_HeavyLorry_Gbx1Axl")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx1Whl, TestName = "PEV_IEPC_HeavyLorry_Gbx1Whl")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx2, TestName = "PEV_IEPC_HeavyLorry_Gbx2")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx2_drag, TestName = "PEV_IEPC_HeavyLorry_Gbx2_drag")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx2Axl, TestName = "PEV_IEPC_HeavyLorry_Gbx2Axl")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx2Axl_drag, TestName = "PEV_IEPC_HeavyLorry_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_HeavyLorry_Gbx2Whl, TestName = "PEV_IEPC_HeavyLorry_Gbx2Whl")]
+
[TestCase(HEV_IEPC_S_HeavyLorry, TestName = "HEV_IEPC_S_HeavyLorry")]
[TestCase(HEV_IHPC_HeavyLorry, TestName = "HEV_IHPC_HeavyLorry")]
[TestCase(HEV_Px_HeavyLorry_ADC, TestName = "HEV_Px_HeavyLorry_ADC")]
+ [TestCase(HEV_Px_HeavyLorry_NoRetarder, TestName = "HEV_Px_HeavyLorry_NoRetarder")]
+ [TestCase(HEV_Px_HeavyLorry_NoAirDrag, TestName = "HEV_Px_HeavyLorry_NoAirDrag")]
[TestCase(HEV_S3_HeavyLorry_ADC, TestName = "HEV_S3_HeavyLorry_ADC")]
[TestCase(HEV_Px_HeavyLorry_SuperCap, TestName = "HEV_Px_HeavyLorry_SuperCap")]
@@ -321,11 +365,13 @@ namespace VectoMockupTest
[TestCase(Conventional_PrimaryBus, TestName = "ConventionalPrimaryBus")]
+ [TestCase(Conventional_PrimaryBus_NoRetarder, TestName = "ConventionalPrimaryBus_NoRetarder")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, TestName = "ConventionalPrimaryBus_AT_Angledrive")]
[TestCase(Conventional_PrimaryBus_Tyres, TestName = "ConventionalPrimaryBus Tyres")]
[TestCase(HEV_IEPC_S_PrimaryBus, TestName="HEV_IEPC_S_PrimaryBus")]
[TestCase(HEV_Px_PrimaryBus, TestName="HEV_Px_PrimaryBus")]
[TestCase(HEV_IHPC_PrimaryBus, TestName = "HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus_NoRetarder, TestName = "HEV_IHPC_PrimaryBus_NoRetarder")]
[TestCase(HEV_Px_PrimaryBus_SuperCap, TestName = "HEV_Px_PrimaryBus_SuperCap")]
[TestCase(HEV_S2_PrimaryBus, TestName="HEV_S2_PrimaryBus")]
[TestCase(HEV_S2_PrimaryBus_GenSetADC, TestName = "HEV_S2_PrimaryBus_GenSetADC")]
@@ -336,6 +382,14 @@ namespace VectoMockupTest
[TestCase(PEV_E3_PrimaryBus, TestName = "PEV_E3_PrimaryBus")]
[TestCase(PEV_E4_PrimaryBus, TestName = "PEV_E4_PrimaryBus")]
[TestCase(PEV_IEPC_PrimaryBus, TestName="PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1, TestName = "PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Axl, TestName = "PEV_IEPC_PrimaryBus_Gbx1Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Whl, TestName = "PEV_IEPC_PrimaryBus_Gbx1Whl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2, TestName = "PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2_drag, TestName = "PEV_IEPC_PrimaryBus_Gbx2_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl, TestName = "PEV_IEPC_PrimaryBus_Gbx2Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl_drag, TestName = "PEV_IEPC_PrimaryBus_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Whl, TestName = "PEV_IEPC_PrimaryBus_Gbx2Whl")]
[TestCase(PEV_IEPC_std_PrimaryBus, TestName = "PEV_IEPC-std_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus_StdEM, TestName = "PEV_E2_PrimaryBus_EM-Std")]
[TestCase(PEV_E2_PrimaryBus_StdBat, TestName = "PEV_E2_PrimaryBus_Battery-Std")]
@@ -363,6 +417,7 @@ namespace VectoMockupTest
[TestCase(Conventional_PrimaryBus_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_DifferentTyres")]
+ [TestCase(Conventional_PrimaryBus_NoRetarder, Conventional_InterimBusInput, "Conventional", TestName = "Interim_ConventionalPrimaryBus_NoRetarder")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_AT_Angledrive")]
[TestCase(Conventional_PrimaryBus, Conventional_InterimBusInput_AirdragV10, "Conventional", TestName = "InterimConventionalBusAirdrag_v1_0")]
[TestCase(Conventional_PrimaryBus, Conventional_InterimBusInput_AirdragV20, "Conventional", TestName = "InterimConventionalBusAirdrag_v2_0")]
@@ -370,6 +425,7 @@ namespace VectoMockupTest
[TestCase(HEV_IEPC_S_PrimaryBus, HEV_InterimBusInput, "IEPC-S", "HEV", TestName = "Interim HEV_IEPC_S_Bus")]
[TestCase(HEV_Px_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "Interim HEV_Px_Bus")]
[TestCase(HEV_IHPC_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "Interim HEV_IHPC_Bus")]
+ [TestCase(HEV_IHPC_PrimaryBus_NoRetarder, HEV_InterimBusInput, "Px", "HEV", TestName = "Interim HEV_IHPC_Bus_NoRetarder")]
[TestCase(HEV_S2_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S2_Bus")]
[TestCase(HEV_S3_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S3_Bus")]
[TestCase(HEV_S4_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S4_Bus")]
@@ -377,6 +433,15 @@ namespace VectoMockupTest
[TestCase(PEV_E3_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E3_Bus")]
[TestCase(PEV_E4_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E4_Bus")]
[TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_Bus")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Axl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx1Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Whl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx1Whl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2_drag, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl_drag, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Whl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_PrimaryBus_Gbx2Whl")]
+
[TestCase(PEV_IEPC_std_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC-std_Bus")]
[TestCase(PEV_E2_PrimaryBus_StdEM, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E2_Bus_EM-Std")]
public void InterimTest(string primaryBusInput, string interimBusInput, params string[] expectedType)
@@ -432,11 +497,13 @@ namespace VectoMockupTest
}
[TestCase(Conventional_PrimaryBus_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim Conventional Bus Different Tyres")]
+ [TestCase(Conventional_PrimaryBus_NoRetarder, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim_ConventionalPrimaryBus_NoRetarder")]
[TestCase(Conventional_PrimaryBus_DF, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim ConventionalPrimaryBus_DualFuel")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim ConventionalPrimaryBus_AT_Angledrive")]
[TestCase(HEV_IEPC_S_PrimaryBus, HEV_InterimBusInput, "IEPC-S", "HEV", TestName = "PrimaryAndInterim HEV_IEPC_S_PrimaryBus")]
[TestCase(HEV_Px_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "PrimaryAndInterim HEV_Px_PrimaryBus")]
[TestCase(HEV_IHPC_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "PrimaryAndInterim HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus_NoRetarder, HEV_InterimBusInput, "Px", "HEV", TestName = "PrimaryAndInterim HEV_IHPC_PrimaryBus_NoRetarder")]
[TestCase(HEV_S2_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S2_PrimaryBus")]
[TestCase(HEV_S3_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S3_PrimaryBus")]
[TestCase(HEV_S4_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S4_PrimaryBus")]
@@ -444,6 +511,14 @@ namespace VectoMockupTest
[TestCase(PEV_E3_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E3_PrimaryBus")]
[TestCase(PEV_E4_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E4_PrimaryBus")]
[TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterim PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx1")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Axl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx1Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Whl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx1Whl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2_drag, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx2_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx2Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl_drag, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Whl, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterimPEV_IEPC_PrimaryBus_Gbx2Whl")]
[TestCase(PEV_IEPC_std_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterim PEV_IEPC-std_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus_StdEM, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E2_PrimaryBus_EM-Std")]
public void PrimaryWithInterimTest(string primaryBusInput, string interimInput, params string[] expectedType)
@@ -478,12 +553,14 @@ namespace VectoMockupTest
[TestCase(Conventional_PrimaryBus_Tyres, Conventional_CompletedBusInput, "Conventional", TestName = "Complete Conventional Bus Different Tyres")]
+ [TestCase(Conventional_PrimaryBus_NoRetarder, Conventional_CompletedBusInput, "Conventional", TestName = "Complete_ConventionalPrimaryBus_NoRetarder")]
[TestCase(Conventional_PrimaryBus_DF, Conventional_CompletedBusInput, "Conventional", TestName = "Complete ConventionalPrimaryBus_DualFuel")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_CompletedBusInput, "Conventional", TestName = "Complete ConventionalPrimaryBus_AT_Angledrive")]
[TestCase(Conventional_PrimaryBus, Conventional_CompletedBusInput_TypeApproval, "Conventional", TestName = "Complete Conventional Bus Type Approval")]
[TestCase(HEV_IEPC_S_PrimaryBus, HEV_CompletedBusInput, "IEPC-S", "HEV", TestName = "Complete HEV_IEPC_S_PrimaryBus")]
[TestCase(HEV_Px_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Complete HEV_Px_PrimaryBus")]
[TestCase(HEV_IHPC_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Complete HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus_NoRetarder, HEV_CompletedBusInput, "Px", "HEV", TestName = "Complete HEV_IHPC_PrimaryBus_NoRetarder")]
[TestCase(HEV_S2_PrimaryBus, HEV_CompletedBusInput, "S2", "HEV", TestName = "Complete HEV_S2_PrimaryBus")]
[TestCase(HEV_S3_PrimaryBus, HEV_CompletedBusInput, "S3", "HEV", TestName = "Complete HEV_S3_PrimaryBus")]
[TestCase(HEV_S4_PrimaryBus, HEV_CompletedBusInput, "S4", "HEV", TestName = "Complete HEV_S4_PrimaryBus")]
@@ -491,6 +568,14 @@ namespace VectoMockupTest
[TestCase(PEV_E3_PrimaryBus, PEV_CompletedBusInput, "E3", "PEV", TestName = "Complete PEV_E3_PrimaryBus")]
[TestCase(PEV_E4_PrimaryBus, PEV_CompletedBusInput, "E4", "PEV", TestName = "Complete PEV_E4_PrimaryBus")]
[TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Axl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx1Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Whl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx1Whl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2_drag, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl_drag, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Whl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus_Gbx2Whl")]
[TestCase(PEV_IEPC_std_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC-std_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus_StdEM, PEV_CompletedBusInput, "E2", "PEV", TestName = "Complete PEV_E2_PrimaryBus_EM-Std")]
public void CompleteTest(string primaryBusInput, string completeBusInput, params string[] expectedType)
@@ -538,6 +623,7 @@ namespace VectoMockupTest
[TestCase(HEV_IEPC_S_PrimaryBus, HEV_CompletedBusInput, "IEPC-S", "HEV", TestName = "Completed HEV_IEPC_S_PrimaryBus")]
[TestCase(HEV_Px_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Completed HEV_Px_PrimaryBus")]
[TestCase(HEV_IHPC_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Completed HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus_NoRetarder, HEV_CompletedBusInput, "Px", "HEV", TestName = "Completed HEV_IHPC_PrimaryBus_NoRetarder")]
[TestCase(HEV_S2_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S2_PrimaryBus")]
[TestCase(HEV_S3_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S3_PrimaryBus")]
[TestCase(HEV_S4_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S4_PrimaryBus")]
@@ -545,6 +631,14 @@ namespace VectoMockupTest
[TestCase(PEV_E3_PrimaryBus, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E3_PrimaryBus")]
[TestCase(PEV_E4_PrimaryBus, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E4_PrimaryBus")]
[TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Axl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx1Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx1Whl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx1Whl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2_drag, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2Axl")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Axl_drag, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2Axl_drag")]
+ [TestCase(PEV_IEPC_PrimaryBus_Gbx2Whl, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus_Gbx2Whl")]
[TestCase(PEV_IEPC_std_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC-std_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus_StdEM, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E2_PrimaryBus_EM-Std")]
public void CompletedTest(string primaryBusInput, string completeBusInput, params string[] expectedType)
diff --git a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
index 63a43fb3a2f8a5c2632eb177dd12a2addf312aee..5a089db20b7e61c84936b8360fb61da7e877240c 100644
--- a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
+++ b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
@@ -55,7 +55,6 @@
<ItemGroup>
<ProjectReference Include="..\..\VectoCore\VectoCoreTest\VectoCoreTest.csproj" />
<ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" />
- <ProjectReference Include="..\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
</Project>