From d3d9b3ec800740b83ea07dbb1e9cc801b12c0e2e Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 6 Aug 2021 10:41:46 +0200
Subject: [PATCH] corrections in schema: allow only specific powertain
architectures, depending on xEV configuration, bugfixes, more sample XML
files
---
...ationDefinitions.2.10.1_xEV_Components.xsd | 53 ++
...arationDefinitions.2.10.2_JobInputData.xsd | 256 ++++++--
.../VectoDeclarationDefinitions.2.6_Buses.xsd | 173 ------
...Px.xml => Conventional_heavyLorry_AMT.xml} | 0
.../Conventional_mediumLorry_AMT.xml | 323 ++++++++++
.../SchemaVersion2.10/Gearbox_APT-N.xml | 71 +++
.../SchemaVersion2.10/Gearbox_IHPC.xml | 207 +++++++
.../HEV-S_heavyLorry_IEPC-S.xml | 2 +-
.../SchemaVersion2.10/HEV-S_heavyLorry_S3.xml | 2 +-
.../SchemaVersion2.10/HEV-S_heavyLorry_S4.xml | 2 +-
.../HEV-S_mediumLorry_AMT_S2.xml | 567 ++++++++++++++++++
.../HEV-S_mediumLorry_IEPC-S.xml | 453 ++++++++++++++
.../HEV-S_mediumLorry_S3.xml | 468 +++++++++++++++
.../HEV-S_mediumLorry_S4.xml | 438 ++++++++++++++
.../HEV_mediumLorry_AMT_Px.xml | 488 +++++++++++++++
.../SchemaVersion2.10/IEPC_heavyLorry.xml | 4 +-
.../SchemaVersion2.10/IEPC_mediumLorry.xml | 327 ++++++++++
.../PEV_heavyLorry_AMT_E2.xml | 2 +-
.../PEV_heavyLorry_APT-N_E2.xml | 473 +++++++++++++++
.../SchemaVersion2.10/PEV_heavyLorry_E3.xml | 2 +-
.../SchemaVersion2.10/PEV_heavyLorry_E4.xml | 2 +-
.../PEV_mediumLorry_AMT_E2.xml | 446 ++++++++++++++
.../PEV_mediumLorry_APT-N_E2.xml | 465 ++++++++++++++
.../SchemaVersion2.10/PEV_mediumLorry_E3.xml | 347 +++++++++++
.../SchemaVersion2.10/PEV_mediumLorry_E4.xml | 317 ++++++++++
VectoCore/VectoXML.spp | 19 +-
26 files changed, 5686 insertions(+), 221 deletions(-)
rename VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/{Conventional_heavyLorry_AMT_Px.xml => Conventional_heavyLorry_AMT.xml} (100%)
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_mediumLorry_AMT.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_APT-N.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_IHPC.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_AMT_S2.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_IEPC-S.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S3.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S4.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_mediumLorry_AMT_Px.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_mediumLorry.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_APT-N_E2.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_AMT_E2.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_APT-N_E2.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E3.xml
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E4.xml
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
index ce07c0eecc..3cd035ea70 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
@@ -710,6 +710,59 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="GearboxFWDDataDeclarationType">
+ <xs:annotation>
+ <xs:documentation>Gearbox Component</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="v1.0:AbstractTransmissionDataDeclarationType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P205</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P206</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P262</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P208</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P209</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType">
+ <xs:annotation>
+ <xs:documentation>P076 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P254 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DifferentialIncluded" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Pxxx - [bool[</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AxlegearRatio" type="v1.0:Double3"/>
+ <xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="GearboxDataDeclarationType">
<xs:annotation>
<xs:documentation>Gearbox Component</xs:documentation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
index 5c7b692043..bc55158d5b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -211,7 +211,7 @@
</xs:complexType>
<xs:complexType name="Components_HEV-S2_LorryType">
<xs:complexContent>
- <xs:extension base="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType">
+ <xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
@@ -245,7 +245,7 @@
</xs:complexType>
<xs:complexType name="Components_HEV-S3_LorryType">
<xs:complexContent>
- <xs:extension base="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType">
+ <xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
@@ -273,7 +273,7 @@
</xs:complexType>
<xs:complexType name="Components_HEV-S4_LorryType">
<xs:complexContent>
- <xs:extension base="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType">
+ <xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
@@ -553,6 +553,11 @@
<xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationHeavyLorryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P037 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:group ref="v2.10.2:Vehicle_ChassisLorryParametersSequenceGroup"/>
<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
@@ -579,11 +584,24 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="Vehicle_Conventional_MediumLorryType">
+ <xs:complexContent>
+ <xs:extension base="v2.0:AbstractVehicleDeclarationType">
+ <xs:sequence>
+ <xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
+ <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="Components" type="v2.10.2:AbstractConventionalLorryVehicleComponentsDeclarationType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -599,6 +617,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -614,6 +633,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -629,6 +649,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -644,6 +665,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -659,6 +681,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -674,11 +697,12 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0" maxOccurs="2"/>
- <xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+ <xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -688,11 +712,12 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0" maxOccurs="2"/>
- <xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+ <xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -702,6 +727,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -716,8 +742,9 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
- <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
+ <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -728,6 +755,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_LorryDeclarationType"/>
@@ -740,6 +768,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_PrimaryBusDeclarationType"/>
@@ -752,6 +781,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -766,8 +796,9 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
- <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+ <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_LorryDeclarationType"/>
@@ -780,6 +811,7 @@
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type"/>
<xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
@@ -789,34 +821,132 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="ArchitectureID_HEVType">
+ <xs:simpleType name="ArchitectureID">
+ <xs:union memberTypes="v2.10.2:ArchitectureID_HEV_Type v2.10.2:ArchitectureID_IEPC_Type v2.10.2:ArchitectureID_PEV_Type"/>
+ </xs:simpleType>
+ <xs:simpleType name="ArchitectureID_HEV-Px_Type">
<xs:restriction base="xs:string">
<xs:enumeration value="P1"/>
<xs:enumeration value="P2"/>
<xs:enumeration value="P2.5"/>
<xs:enumeration value="P3"/>
<xs:enumeration value="P4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="ArchitectureID_HEV-Sx_Type">
+ <xs:restriction base="xs:string">
<xs:enumeration value="S2"/>
<xs:enumeration value="S3"/>
<xs:enumeration value="S4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="ArchitectureID_HEV-IEPC-S_Type">
+ <xs:restriction base="xs:string">
<xs:enumeration value="S-IEPC"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="ArchitectureID_IEPCType">
+ <xs:simpleType name="ArchitectureID_IEPC_Type">
<xs:restriction base="xs:string">
<xs:enumeration value="E-IEPC"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="ArchitectureID_PEVType">
+ <xs:simpleType name="ArchitectureID_PEV_Type">
<xs:restriction base="xs:string">
<xs:enumeration value="E2"/>
<xs:enumeration value="E3"/>
<xs:enumeration value="E4"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="PowertrainPositionGENType">
+ <xs:simpleType name="AxleConfigurationHeavyLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P037</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="v1.0:VehicleAxleConfigurationType">
+ <xs:enumeration value="4x2"/>
+ <xs:enumeration value="6x2"/>
+ <xs:enumeration value="6x4"/>
+ <xs:enumeration value="8x4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="AxleConfigurationMediumLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P037</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="v1.0:VehicleAxleConfigurationType">
+ <xs:enumeration value="4x2"/>
+ <xs:enumeration value="6x2"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="AxleConfigurationPrimaryBusLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">037</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P037</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="v1.0:VehicleAxleConfigurationType">
+ <xs:enumeration value="4x2"/>
+ <xs:enumeration value="6x2"/>
+ <xs:enumeration value="6x4"/>
+ <xs:enumeration value="8x4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LegislativeCategoryHeavyLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">251</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P251 - enum</xs:documentation>
+ </xs:annotation>
<xs:restriction base="xs:string">
- <xs:enumeration value="GEN"/>
+ <xs:enumeration value="N2"/>
+ <xs:enumeration value="N3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LegislativeCategoryMediumLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">251</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P251 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="N2"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="LegislativeCategoryPrimaryBusDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">251</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P251 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="M3"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PowertrainPositionDriveType">
@@ -828,9 +958,59 @@
<xs:enumeration value="4"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="PowertrainPositionGENType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="GEN"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="PowertrainPositionType">
<xs:union memberTypes="v2.10.2:PowertrainPositionDriveType v2.10.2:PowertrainPositionGENType"/>
</xs:simpleType>
+ <xs:simpleType name="VehicleCategoryHeavyLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P036 - enum (Declaration)</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Tractor"/>
+ <xs:enumeration value="Rigid Lorry"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="VehicleCategoryMediumLorryDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P036 - enum (Declaration)</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Tractor"/>
+ <xs:enumeration value="Rigid Lorry"/>
+ <xs:enumeration value="Van"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="VehicleCategoryPrimaryBusDeclarationType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">036</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P036 - enum (Declaration)</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Bus"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:group name="Components_HEV-IEPC-S_GenSetSequenceGroup">
<xs:sequence>
<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
@@ -849,11 +1029,6 @@
</xs:group>
<xs:group name="Vehicle_ChassisLorryParametersSequenceGroup">
<xs:sequence>
- <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
- <xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="CorrectedActualMass" type="v1.0:VehicleCurbMassChassisType">
<xs:annotation>
<xs:documentation>P038 - [kg]</xs:documentation>
@@ -873,11 +1048,6 @@
</xs:group>
<xs:group name="Vehicle_ChassisPrimaryBusParametersSequenceGroup">
<xs:sequence>
- <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
- <xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="Articulated" type="xs:boolean"/>
<xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
<xs:annotation>
@@ -923,16 +1093,21 @@
<xs:group name="Vehicle_HeavyLorryParametersSequenceGroup">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
- <xs:element name="LegislativeCategory" type="v1.0:LegislativeClassDeclarationType">
+ <xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryHeavyLorryDeclarationType">
<xs:annotation>
<xs:documentation>P251 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ChasisConfiguration" type="v2.1:VehicleCategoryType">
+ <xs:element name="ChasisConfiguration" type="v2.10.2:VehicleCategoryHeavyLorryDeclarationType">
<xs:annotation>
<xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationHeavyLorryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P037 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:group ref="v2.10.2:Vehicle_ChassisLorryParametersSequenceGroup"/>
<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
@@ -957,28 +1132,26 @@
<xs:group name="Vehicle_MediumLorryParametersSequenceGroup">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
- <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
+ <xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryMediumLorryDeclarationType">
<xs:annotation>
<xs:documentation>P251 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="VehicleCategory">
+ <xs:element name="ChassisConfiguration" type="v2.10.2:VehicleCategoryMediumLorryDeclarationType">
<xs:annotation>
<xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Rigid Lorry"/>
- <xs:enumeration value="Tractor"/>
- <xs:enumeration value="Van"/>
- </xs:restriction>
- </xs:simpleType>
+ </xs:element>
+ <xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationMediumLorryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P037 - enum</xs:documentation>
+ </xs:annotation>
</xs:element>
<xs:group ref="v2.10.2:Vehicle_ChassisLorryParametersSequenceGroup"/>
<xs:element name="CargoVolume" minOccurs="0">
<xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minExclusive value="0"/>
+ <xs:restriction base="v1.0:Double3">
+ <xs:minExclusive value="0.000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1002,16 +1175,21 @@
<xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
<xs:sequence>
<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
- <xs:element name="LegislativeCategory" type="v1.0:LegislativeClassDeclarationType">
+ <xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryPrimaryBusDeclarationType">
<xs:annotation>
<xs:documentation>P251 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ChassisConfiguration" type="v2.6:ChassisConfigurationDeclarationType">
+ <xs:element name="ChassisConfiguration" type="v2.10.2:VehicleCategoryPrimaryBusDeclarationType">
<xs:annotation>
<xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationPrimaryBusLorryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P037 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:group ref="v2.10.2:Vehicle_ChassisPrimaryBusParametersSequenceGroup"/>
<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
@@ -1039,7 +1217,6 @@
</xs:group>
<xs:group name="Vehicle_xEV-Parameters_SequenceGroup">
<xs:sequence>
- <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEVType"/>
<xs:element name="OvcHev" type="xs:boolean"/>
<xs:element name="MaxChargingPower" minOccurs="0">
<xs:simpleType>
@@ -1050,4 +1227,7 @@
</xs:element>
</xs:sequence>
</xs:group>
+ <xs:simpleType name="ArchitectureID_HEV_Type">
+ <xs:union memberTypes="v2.10.2:ArchitectureID_HEV-Px_Type v2.10.2:ArchitectureID_HEV-Sx_Type v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
+ </xs:simpleType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 2077b78e04..b8673a4cd7 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -9,59 +9,6 @@
<xs:complexType name="AbstractCompletedVehicleComponentsDeclarationType" abstract="true"/>
<xs:complexType name="AbstractPrimaryVehicleAuxiliaryDataDeclarationType" abstract="true"/>
<xs:complexType name="AbstractPrimaryVehicleComponentsDeclarationType" abstract="true"/>
- <xs:complexType name="GearboxDataDeclarationType">
- <xs:annotation>
- <xs:documentation>Gearbox Component</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="v1.0:AbstractTransmissionDataDeclarationType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P205</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P206</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P262</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P208</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P209</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType">
- <xs:annotation>
- <xs:documentation>P076 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DifferentialIncluded" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Pxxx - [bool[</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AxlegearRatio" type="v1.0:Double3"/>
- <xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:complexType name="PrimaryVehicleAuxiliariesComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v2.6:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"/>
@@ -357,126 +304,6 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="VehicleComponentsNoAxlegearType">
- <xs:complexContent>
- <xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType">
- <xs:sequence>
- <xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
- <xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
- <xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries" type="v2.0:AuxiliariesComponentDeclarationType"/>
- <xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="VehicleMediumLorryDeclarationType">
- <xs:complexContent>
- <xs:extension base="v2.0:AbstractVehicleDeclarationType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P235</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
- <xs:annotation>
- <xs:documentation>P252</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P236</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VIN" type="v1.0:VINType">
- <xs:annotation>
- <xs:documentation>P238</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P239</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
- <xs:annotation>
- <xs:documentation>P251 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VehicleCategory">
- <xs:annotation>
- <xs:documentation>P036 - enum</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Rigid Lorry"/>
- <xs:enumeration value="Tractor"/>
- <xs:enumeration value="Van"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="AxleConfiguration" type="v2.6:VehicleAxleConfigurationDeclarationType">
- <xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CurbMassChassis" type="v1.0:VehicleCurbMassChassisType">
- <xs:annotation>
- <xs:documentation>P038 - [kg]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
- <xs:annotation>
- <xs:documentation>P041 - [kg]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CargoVolume" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P198 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType">
- <xs:annotation>
- <xs:documentation>P052 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
- <xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
- <xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"/>
- <xs:element name="VehicleTypeApprovalNumber">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
- <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="v2.0:AbstractVehicleComponentsDeclarationType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:simpleType name="AlternatorTechnologyType">
<xs:restriction base="xs:string">
<xs:enumeration value="conventional"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_heavyLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_heavyLorry_AMT.xml
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_heavyLorry_AMT_Px.xml
rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_heavyLorry_AMT.xml
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_mediumLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_mediumLorry_AMT.xml
new file mode 100644
index 0000000000..dc8592f8bb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Conventional_mediumLorry_AMT.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_Conventional_MediumLorryType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_Conventional_Type">
+ <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
+ <v2.10.2:EcoRollWithoutEngineStop>false</v2.10.2:EcoRollWithoutEngineStop>
+ <v2.10.2:EcoRollWithEngineStop>true</v2.10.2:EcoRollWithEngineStop>
+ <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2: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>
+ <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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_APT-N.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_APT-N.xml
new file mode 100644
index 0000000000..05da3ce2a9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_APT-N.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="EM-asdf">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>GB_12-gear</Model>
+ <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+ <Date>2017-09-26T15:33:45.0954248Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <TransmissionType>APT-N</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.10.1:Gears>
+ </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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </tns:Gearbox>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_IHPC.xml
new file mode 100644
index 0000000000..f016aedcd5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Gearbox_IHPC.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="EM-asdf">
+ <!--<v2.0:Data id="GBX-GB_12-gear" xsi:type="v2.6:GearboxDataDeclarationType"> -->
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>GB_12-gear</Model>
+ <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+ <Date>2017-09-26T15:33:45.0954248Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <TransmissionType>IHPC Type 1</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="4">
+ <Ratio>7.040</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="5">
+ <Ratio>5.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="6">
+ <Ratio>4.400</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="7">
+ <Ratio>3.390</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="8">
+ <Ratio>2.650</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="9">
+ <Ratio>2.050</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="10">
+ <Ratio>1.600</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="11">
+ <Ratio>1.280</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="12">
+ <Ratio>1.000</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.10.1:Gears>
+ </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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </tns:Gearbox>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_IEPC-S.xml
index 6620468df3..8801e71638 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_IEPC-S.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>S-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S3.xml
index 8a0037e12a..2ec006a703 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S3.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>S3</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S4.xml
index 4a556e3a4e..1956d4f8ef 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S4.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>S4</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_AMT_S2.xml
new file mode 100644
index 0000000000..44e2d1cd2b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_AMT_S2.xml
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>S2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
+ <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
+ <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2: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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1: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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_IEPC-S.xml
new file mode 100644
index 0000000000..b54abc63f5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_IEPC-S.xml
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>S-IEPC</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
+ <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
+ <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2: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="v2.10.2:ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-IEPC-S_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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <IEPC>
+ <v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <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>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <v2.0:Ratio>3.000</v2.0:Ratio>
+ </Gear>
+ <Gear number="2">
+ <v2.0:Ratio>1.000</v2.0:Ratio>
+ <MaxOutShaftTorque>2000.00</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </IEPC>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S3.xml
new file mode 100644
index 0000000000..643e2b8353
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S3.xml
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>S3</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
+ <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
+ <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2: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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>3</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-S3_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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios><!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S4.xml
new file mode 100644
index 0000000000..8996699758
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S4.xml
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>S4</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
+ <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
+ <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2: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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>4</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-S4_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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios><!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_mediumLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_mediumLorry_AMT_Px.xml
new file mode 100644
index 0000000000..d36ec0efe1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_mediumLorry_AMT_Px.xml
@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="v2.10.2:Vehicle_HEV-Px_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1: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="v2.10.2: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="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin><!-- optional -->
+ <SOCmax>80</SOCmax><!-- optional -->
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_heavyLorry.xml
index 1980bfd5d1..a96397720e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_heavyLorry.xml
@@ -22,9 +22,9 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>E-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
- <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <ADAS xsi:type="v2.10.2:ADAS_IEPC_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_IEPC_LorryType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_mediumLorry.xml
new file mode 100644
index 0000000000..068c6d2978
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_mediumLorry.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_IEPC_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E-IEPC</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_IEPC_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_IEPC_LorryType">
+ <IEPC>
+ <v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DifferentialIncluded>false</DifferentialIncluded>
+ <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gear number="1">
+ <v2.0:Ratio>3.000</v2.0:Ratio>
+ </Gear>
+ <Gear number="2">
+ <v2.0:Ratio>1.000</v2.0:Ratio>
+ <MaxOutShaftTorque>2000.00</MaxOutShaftTorque>
+ </Gear>
+ </Gears>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </IEPC>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_AMT_E2.xml
index 808b674ffa..c2f3cc1ed1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_AMT_E2.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>E2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_APT-N_E2.xml
new file mode 100644
index 0000000000..ffc3f8f613
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_APT-N_E2.xml
@@ -0,0 +1,473 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <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>
+ <ChasisConfiguration>Rigid Lorry</ChasisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
+ <v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
+ <v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <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="v2.10.2:ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1: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.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>GB_12-gear</Model>
+ <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+ <Date>2017-09-26T15:33:45.0954248Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <TransmissionType>APT-N</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.10.1:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive> <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E3.xml
index 0dc7c26ecf..fdf7da3601 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E3.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>E3</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E4.xml
index 7ddb050fcd..566b1de864 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_heavyLorry_E4.xml
@@ -22,7 +22,7 @@
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
- <ArchitectureID>S2</ArchitectureID>
+ <ArchitectureID>E4</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_AMT_E2.xml
new file mode 100644
index 0000000000..f47c1da6aa
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_AMT_E2.xml
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1: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.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_APT-N_E2.xml
new file mode 100644
index 0000000000..ad86b2efef
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_APT-N_E2.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1: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.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>GB_12-gear</Model>
+ <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+ <Date>2017-09-26T15:33:45.0954248Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <TransmissionType>APT-N</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.10.1:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E3.xml
new file mode 100644
index 0000000000..40dd79aca7
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E3.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E3</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_PEV-E3_LorryType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E4.xml
new file mode 100644
index 0000000000..9e95b373ea
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_mediumLorry_E4.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" 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>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E4</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <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="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_PEV-E4_LorryType">
+ <ElectricMachine>
+ <PowertrainPosition>4</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measurement</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <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>
+ <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 circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1: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.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <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" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries xsi:type="v2.0:AuxiliariesComponentDeclarationType">
+ <v2.0:Data xsi:type="v2.0:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology>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>
+ </v2.0: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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 1755ef29a7..e2f0c6b77d 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -8,7 +8,6 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_engine-sample.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_tyre-sample.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-components_1.0.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-new_parameters-sample.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-sample_LNG.xml" HomeFolder="Yes"/>
@@ -94,16 +93,32 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\ElectricMachineSystem-IHPC_1.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\ElectricMachineSystem_1.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\ElectricMachineSystem_StdValues.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Gearbox_APT-N.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Gearbox_IHPC.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\IEPC_1.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\IEPC_StdValues.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="Schema 2.10_Jobs">
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Conventional_heavyLorry_AMT_Px.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Conventional_heavyLorry_AMT.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Conventional_MediumLorry_AMT.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_heavyLorry_AMT_S2.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_heavyLorry_IEPC-S.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_heavyLorry_S3.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_heavyLorry_S4.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_mediumLorry_AMT_S2.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_mediumLorry_IEPC-S.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_mediumLorry_S3.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV-S_mediumLorry_S4.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV_heavyLorry_AMT_Px.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\HEV_mediumLorry_AMT_Px.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\IEPC_heavyLorry.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\IEPC_mediumLorry.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_heavyLorry_AMT_E2.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_heavyLorry_APT-N_E2.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_heavyLorry_E3.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_heavyLorry_E4.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_mediumLorry_AMT_E2.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\PEV_mediumLorry_APT-N_E2.xml" HomeFolder="Yes"/>
</Folder>
</Folder>
<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
--
GitLab