diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
index e86c8283e1bdb76c72329d33ea53129da488a4b5..228888aa42a97cd10366bc0f4517e962434b795e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
@@ -12,24 +12,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules {
public override void Load()
{
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationPrimaryBusVehicleDataProviderV210>()
- .Named(XMLDeclarationPrimaryBusVehicleDataProviderV210.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationExemptedPrimaryBusDataProviderV210>()
- .Named(XMLDeclarationExemptedPrimaryBusDataProviderV210.QUALIFIED_XSD_TYPE);
-
-
- Bind<IXMLVehicleComponentsDeclaration>().To<XMLDeclarationPrimaryBusComponentsDataProviderV210>()
- .Named(XMLDeclarationPrimaryBusComponentsDataProviderV210.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLDeclarationPrimaryBusAuxiliariesDataProviderV210>()
- .Named(XMLDeclarationPrimaryBusAuxiliariesDataProviderV210.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMediumLorryVehicleDataProviderV210>()
- .Named(XMLDeclarationMediumLorryVehicleDataProviderV210.QUALIFIED_XSD_TYPE);
-
-
- Bind<IXMLComponentReader>().To<XMLComponentReaderV210_PrimaryBus>().Named(XMLComponentReaderV210_PrimaryBus.QUALIFIED_XSD_TYPE);
+
}
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 f2360aaa3db38e02e627778b16781ed9950b8895..a3126db5a349be831a17e59583082dc0d5b734de 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -29,7 +29,9 @@
<xs:complexType name="Abstract_AUX_PEV_LorryDeclarationType"/>
<xs:complexType name="Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
<xs:complexType name="Abstract_AUX_xEV_CompletedBusDeclarationType"/>
- <xs:complexType name="Abstract_Components_Conventional_CompletedBusType" abstract="true"/>
+ <xs:complexType name="Abstract_Components_Conventional_CompletedBusDeclarationType" abstract="true"/>
+ <xs:complexType name="Abstract_Components_Conventional_LorryDeclarationType" abstract="true"/>
+ <xs:complexType name="Abstract_Components_Conventional_PrimaryBusDeclarationType" abstract="true"/>
<xs:complexType name="Abstract_Components_HEV-IEPC-S_LorryDeclarationType" abstract="true">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
@@ -81,15 +83,13 @@
</xs:complexContent>
</xs:complexType>
<xs:complexType name="Abstract_Components_xEV_CompletedBusType" abstract="true"/>
- <xs:complexType name="AbstractBoostingLimitationsType" abstract="true"/>
+ <xs:complexType name="AbstractBoostingLimitationsDeclarationType" abstract="true"/>
<xs:complexType name="AbstractCompletedBusVehicleType" abstract="true">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleDeclarationType"/>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AbstractConventionalLorryVehicleComponentsDeclarationType" abstract="true"/>
- <xs:complexType name="AbstractConventionalPrimaryBusVehicleComponentsDeclarationType" abstract="true"/>
- <xs:complexType name="AbstractElectricMotorVehicleTorqueLimitsType" abstract="true"/>
+ <xs:complexType name="AbstractElectricMotorVehicleTorqueLimitsDeclarationType" abstract="true"/>
<xs:complexType name="ADAS_Conventional_Type">
<xs:complexContent>
<xs:extension base="v2.10.2:Abstract_ADAS_ConventionalType">
@@ -154,7 +154,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_Conventional_LorryDataDeclarationType">
+ <xs:complexType name="AUX_Conventional_LorryDataType">
<xs:complexContent>
<xs:extension base="v2.0:AbstractAuxiliaryDataDeclarationType">
<xs:sequence>
@@ -302,7 +302,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_HEV_LorryDataDeclarationType">
+ <xs:complexType name="AUX_HEV_LorryDataType">
<xs:complexContent>
<xs:extension base="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType">
<xs:sequence>
@@ -530,7 +530,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_IEPC_LorryDataDeclarationType">
+ <xs:complexType name="AUX_IEPC_LorryDataType">
<xs:complexContent>
<xs:extension base="v2.10.2:Abstract_AUX_IEPC_LorryDeclarationType">
<xs:sequence>
@@ -654,7 +654,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_PEV_LorryDataDeclarationType">
+ <xs:complexType name="AUX_PEV_LorryDataType">
<xs:complexContent>
<xs:extension base="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType">
<xs:sequence>
@@ -799,7 +799,7 @@
</xs:complexType>
<xs:complexType name="BoostingLimitationsType">
<xs:complexContent>
- <xs:extension base="v2.10.2:AbstractBoostingLimitationsType">
+ <xs:extension base="v2.10.2:AbstractBoostingLimitationsDeclarationType">
<xs:sequence>
<xs:element name="Entry" minOccurs="2" maxOccurs="unbounded">
<xs:complexType>
@@ -813,7 +813,7 @@
</xs:complexType>
<xs:complexType name="Components_Conventional_CompletedBusType">
<xs:complexContent>
- <xs:extension base="v2.10.2:Abstract_Components_Conventional_CompletedBusType">
+ <xs:extension base="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType">
<xs:sequence>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
<xs:element name="Auxiliaries" minOccurs="0">
@@ -829,7 +829,7 @@
</xs:complexType>
<xs:complexType name="Components_Conventional_LorryType">
<xs:complexContent>
- <xs:extension base="v2.10.2:AbstractConventionalLorryVehicleComponentsDeclarationType">
+ <xs:extension base="v2.10.2:Abstract_Components_Conventional_LorryDeclarationType">
<xs:sequence>
<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
@@ -852,7 +852,7 @@
</xs:complexType>
<xs:complexType name="Components_Conventional_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="v2.10.2:AbstractConventionalPrimaryBusVehicleComponentsDeclarationType">
+ <xs:extension base="v2.10.2:Abstract_Components_Conventional_PrimaryBusDeclarationType">
<xs:sequence>
<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
@@ -1287,7 +1287,7 @@
</xs:complexType>
<xs:complexType name="ElectricMachineTorqueLimitsType">
<xs:complexContent>
- <xs:extension base="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType">
+ <xs:extension base="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType">
<xs:sequence>
<xs:element name="ElectricMachine" maxOccurs="unbounded">
<xs:complexType>
@@ -1418,7 +1418,7 @@
</xs:annotation>
</xs:element>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType" minOccurs="0"/>
- <xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_CompletedBusType" minOccurs="0"/>
+ <xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1436,7 +1436,7 @@
<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="v2.10.2:AbstractConventionalLorryVehicleComponentsDeclarationType"/>
+ <xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1454,7 +1454,7 @@
<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/>
<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:element name="Components" type="v2.10.2:Abstract_Components_Conventional_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1478,12 +1478,12 @@
<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType"/>
<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="v2.10.2:AbstractConventionalPrimaryBusVehicleComponentsDeclarationType"/>
+ <xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="Vehicle_Exempted_CompletedBusType">
+ <xs:complexType name="Vehicle_Exempted_CompletedBusDeclarationType">
<xs:annotation>
<xs:documentation>Exempted vehicle stage input parts</xs:documentation>
</xs:annotation>
@@ -1536,7 +1536,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="Vehicle_Exempted_HeavyLorryType">
+ <xs:complexType name="Vehicle_Exempted_HeavyLorryDeclarationType">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
@@ -1594,7 +1594,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="Vehicle_Exempted_MediumLorryType">
+ <xs:complexType name="Vehicle_Exempted_MediumLorryDeclarationType">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
@@ -1651,7 +1651,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="Vehicle_Exempted_PrimaryBusType">
+ <xs:complexType name="Vehicle_Exempted_PrimaryBusDeclarationType">
<xs:complexContent>
<xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
@@ -1735,8 +1735,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1757,8 +1757,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1785,8 +1785,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1807,8 +1807,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1829,8 +1829,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1857,8 +1857,8 @@
<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"/>
- <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1879,7 +1879,7 @@
<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="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1900,7 +1900,7 @@
<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="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -1927,7 +1927,7 @@
<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="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -2065,7 +2065,7 @@
<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"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -2081,7 +2081,7 @@
<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"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_LorryDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -2103,7 +2103,7 @@
<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"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
@@ -2141,7 +2141,7 @@
<xs:simpleType name="AlternatorTechnologyType">
<xs:union memberTypes="v2.10.2:AlternatorTechnology_Conventional_Type v2.10.2:AlternatorTechnology_HEV_Type v2.10.2:AlternatorTechnology_PEV_Type v2.10.2:AlternatorTechnology_IEPC_Type v2.10.2:AlternatorTechnology_HEV-S_Type"/>
</xs:simpleType>
- <xs:simpleType name="ArchitectureID">
+ <xs:simpleType name="ArchitectureIDType">
<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_Type">
@@ -2485,7 +2485,7 @@
<xs:enumeration value="M3"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="NumberOfPassengersType">
+ <xs:simpleType name="PassengerCountType">
<xs:annotation>
<xs:appinfo>
<vectoParam:description>
@@ -2998,22 +2998,22 @@
</xs:group>
<xs:group name="Vehicle_CompletedBus_PassengerCountSequenceGroup">
<xs:sequence>
- <xs:element name="NumberPassengerSeatsLowerDeck" type="v2.10.2:NumberOfPassengersType">
+ <xs:element name="NumberPassengerSeatsLowerDeck" type="v2.10.2:PassengerCountType">
<xs:annotation>
<xs:documentation>P283 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="NumberPassengersStandingLowerDeck" type="v2.10.2:NumberOfPassengersType">
+ <xs:element name="NumberPassengersStandingLowerDeck" type="v2.10.2:PassengerCountType">
<xs:annotation>
<xs:documentation>P354 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="NumberPassengerSeatsUpperDeck" type="v2.10.2:NumberOfPassengersType">
+ <xs:element name="NumberPassengerSeatsUpperDeck" type="v2.10.2:PassengerCountType">
<xs:annotation>
<xs:documentation>P284 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="NumberPassengersStandingUpperDeck" type="v2.10.2:NumberOfPassengersType">
+ <xs:element name="NumberPassengersStandingUpperDeck" type="v2.10.2:PassengerCountType">
<xs:annotation>
<xs:documentation>P355 - [-]</xs:documentation>
</xs:annotation>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
index bae92d51d37a3605e173d63b7d5833281bf5f911..2445ad02f59daea4485e9098af8d3aaa1cf1bd28 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCDecl/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class5_Class-5_5t0">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
index 01368a86b82648ae253234863ecb631141b1beee..a37b6e8eb9600dc990a1307139b784d8cebf0245 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRoll.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
index 78b0ecf0ee0dc4fe20a4b929c064ab8bb89e4911..55b52a8b8103612a17ee5206a78b826e9d88de71 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EcoRollEngineStop.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_EcoRollEngineStop">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
index 917583a3f8bf6f3243b71964393274c322296efe..eccb769b78f587994ce7c52a1a733d2eb2cadea8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5_EngineStopStart.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
index a160bece1a5a8097eec6e744a96d409e64f7c233..e69ccd89dc75a9fcdd58ed1d263af546e9dad5c0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
@@ -8,7 +8,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class9_AT_EcoRoll" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
index 22d1cada879e2d9bc47041d2649898597b5343a5..1dce2edb9831019936c1d68df1201c89b369f691 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll_missingParam.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EcoRoll">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
index abfb50221ec7d45ac6842b1e9ad03bccb17654b9..2e489740785e0ec68309517d0e6b9a0a7c94a922 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EngineStopStart.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_AT_EngineStopStart">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCC.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCC.xml
index 339a029dc5437bcff94d2366bbc0bc136c7eb3d1..ca7958f44e3028d4e6bf8596c72cb2a8e2a8159c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCC.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCC.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_Class-9_9t0">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
index 396d79c2f2abeb99ade0544a50952cffc733da27..bdfd833130ebaff44991bc322607ea2ddae29686 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_PCCEcoRoll.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9_Class-9_9t0_PCCEcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 1fb3b2f6d2991834d3f217ab1d547ab51965bbdb..4bbd3da184097a875552d5c8a3e2ceb4280d1dd5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -597,8 +597,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
<ClassBus>I+II</ClassBus>
- <NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
- <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+ <NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CE</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>3000</HeightIntegratedBody>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index 4219c8578373897a6e02b6a4b4c16853defb697d..659e886259cf43a155de604c17bee3d7459c973c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,18 +24,18 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
@@ -209,7 +218,7 @@
<Entry engineSpeed='2600.00' maxTorque='0.00' dragTorque='-132.07'/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -218,10 +227,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox >
+ <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" >
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -1194,7 +1203,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1203,10 +1212,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -1243,15 +1252,15 @@
<Entry speedRatio='5.0000' torqueRatio='1.00' inputTorqueRef='-4242.00'/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -1268,7 +1277,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1277,10 +1286,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -1315,7 +1324,7 @@
<Entry retarderSpeed="4000.00" torqueLoss="42.00"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1324,10 +1333,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2109,7 +2118,7 @@
<Entry inputSpeed='3250.00' inputTorque='-7960.98' torqueLoss='268.68'/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2118,10 +2127,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -2179,9 +2188,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -2190,7 +2199,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -2207,7 +2215,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index 8c295412cb80623fa03bb0ed9b4939c061e7cd3e..6190094f801221443ad323f32af1075b876c1514 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart_ATP" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart_ATP" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,18 +24,18 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
@@ -209,7 +218,7 @@
<Entry engineSpeed='2600.00' maxTorque='0.00' dragTorque='-132.07'/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -218,10 +227,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -746,7 +755,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -755,10 +764,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -785,15 +794,15 @@
<Entry speedRatio="8.1500" torqueRatio="1.00" inputTorqueRef="-16540.98"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -828,7 +837,7 @@
<Entry retarderSpeed="4000.00" torqueLoss="42.00"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -837,10 +846,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -1622,7 +1631,7 @@
<Entry inputSpeed='3250.00' inputTorque='-7960.98' torqueLoss='268.68'/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1631,10 +1640,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" >
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -1692,9 +1701,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -1703,7 +1712,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -1720,7 +1728,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
index c4bea06ee54b9f6e8dd1d963240706be853b5966..0f49a2ea2d2638bd054379093f572f85ac494321 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
@@ -181,7 +190,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -190,10 +199,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2581,7 +2590,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2590,10 +2599,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2606,15 +2615,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2631,7 +2640,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2640,10 +2649,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>RET-generic</Model>
<CertificationNumber>standard values</CertificationNumber>
@@ -2714,7 +2723,7 @@
<Entry retarderSpeed="6000.00" torqueLoss="14.00" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2723,10 +2732,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -3231,7 +3240,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3240,10 +3249,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3328,9 +3337,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3339,7 +3348,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3356,7 +3364,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index c9db0481c519a1fab72f7b3ce821c71351e5c0e3..fa1cbceca716e41338cb7afa62dda4d4e2c76814 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<tns:VectoInputDeclaration schemaVersion="2.8"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -31,9 +32,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <Data id="CabinX23h" xsi:type="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>
@@ -43,7 +44,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -52,10 +53,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.8:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -67,10 +68,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 4-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 0fe54266ec17ef49046ea9f5c5aa41c36db79bec..b006b23e43f367e2aa4af9a830c74ba53c716d15 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<tns:VectoInputDeclaration schemaVersion="2.8"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="InterimStageInputType" >
+ <v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890_m</VIN>
@@ -31,9 +32,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>mixed</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <Data id="CabinX23h" xsi:type="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>
@@ -43,7 +44,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -52,10 +53,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.8:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -67,10 +68,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
index 6fbd95682f22879d8226585099b06ed5c3cc9e23..6422345a377266bf8042973f7e2af7a2b0835b46 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<tns:VectoInputDeclaration schemaVersion="2.8"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -30,9 +31,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <Data id="CabinX23h" xsi:type="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>
@@ -42,7 +43,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -51,10 +52,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.8:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -66,10 +67,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
index 9ee432111624b9ec7e8b3b1998c51b91c3c97e02..601b8197935a0b05c4d2bd447b6dcca2247d09ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+ xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Electrically driven - Electronically controlled</Technology>
</Fan>
@@ -3266,7 +3275,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3283,7 +3291,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 24c1114427f0b957eda716e1e443eac0a4878376..d9381a22d5b76ad5971a029a27068830f583e94c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>8x2</AxleConfiguration>
<Articulated>true</Articulated>
@@ -15,20 +24,20 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Entry gear="6" maxTorque="1800"/>
- <Entry gear="1" maxTorque="2500"/>
- <Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <v2.0:Entry gear="6" maxTorque="1800"/>
+ <v2.0:Entry gear="1" maxTorque="2500"/>
+ <v2.0:Entry gear="12" maxTorque="1900"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
+ <v2.0:Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>8x2 articulated bus Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -209,7 +218,7 @@
<Entry engineSpeed='2600.00' maxTorque='0.00' dragTorque='-172.00'/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -218,10 +227,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>8x2 Bus</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -688,8 +697,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,10 +707,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -716,15 +725,15 @@
<Entry speedRatio='3.6738' torqueRatio='1.22' inputTorqueRef='-3238.32'/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -741,7 +750,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -750,10 +759,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -788,7 +797,7 @@
<Entry retarderSpeed="4000.00" torqueLoss="42.00"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -797,10 +806,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>8x2 articulated bus</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -1400,7 +1409,7 @@
<Entry inputSpeed='4930.00' inputTorque='5303.63' torqueLoss='131.21'/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1409,10 +1418,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -1524,9 +1533,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -1535,7 +1544,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -1552,7 +1560,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index 1218ea9e6c58183cac5e710f12f7428d6badae43..ee0bce9b6ec425823a0d84ae3232a33eaeff3387 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<tns:VectoInputDeclaration schemaVersion="2.8"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -30,9 +31,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <Data id="CabinX23h" xsi:type="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>
@@ -42,7 +43,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -51,10 +52,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.8:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -66,10 +67,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
index 095050c4686fd49b8b8fce67577fd27ec30545e0..bf75e78a988ce0bd6d0cb1c9a90dc4a79d285a4b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3266,7 +3275,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3283,7 +3291,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index 680613a7bd1119fdda7e5674722c44e96d1d81be..da399b24ecd7100d77f96b68697b6abf1e906d18 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_SmartES" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_SmartES" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartES</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3275,7 +3284,6 @@
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3292,7 +3300,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index f7452fd6df79b0c1c660e0731c03cac1a098aacf..b1a4c67429a8544c1841ad48f6c4293a9d004060 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartES-PS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3275,7 +3284,6 @@
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3292,7 +3300,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index 510a78327853b541a61a6d9487c145292fc8ced1..e65b0681b622d455ed8cb1d42a9989cc6f69c1a2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" >
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3266,7 +3275,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3283,7 +3291,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index e31a44e7d3507c8bb177972986a14d1dfca04794..de7d3112aa8452918002aea74d135ec9205624d8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3266,7 +3275,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3283,7 +3291,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index f60a12e48e37cf148783cea1ae0e0909cdf8b0b9..b66c704be48a2e26b26156c23d4f5dafa0894d67 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
@@ -173,7 +182,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -182,10 +191,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="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>
@@ -2573,7 +2582,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2582,10 +2591,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2598,15 +2607,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="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>
@@ -2623,7 +2632,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2632,10 +2641,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="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>
@@ -2669,7 +2678,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2678,10 +2687,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="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>
@@ -3185,7 +3194,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3194,10 +3203,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3255,9 +3264,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3266,7 +3275,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3283,7 +3291,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index 7edc44e504c22c8b4dab0856f57c608c9cd44597..cf0d205bc88442fd72cb35ddb57f1ff400184cfd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class4_Vocational/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class4">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index 18b364021547b4281c925a3ac25fcc4d8111389f..a9b91e68d024882d9c0664d1e43c3fec5471ef08 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_ADAS/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index bca4430e757ab7db5fe7606ce6d86b808043766e..fdc6212002c1235cce9f8314761e4d109e186339 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_NG/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.1.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index 455dede892a66afec55c0ca2a6c0a61bbd1dbca2..1aaecc0106f27ba7a7842675fa42d7f8711f4e5e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Vocational/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
index 98818d2a51e24b8d7d2c7cf5bb64447802fa6a0c..9a63044e731537f08d8596a8b5e3a844844c577b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd"
- xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
index 597692b6a9bcd6b5a3967e4d64779aba597b38a2..52ddc4c8423faca882a93f1e200e1188c4204114 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
index 5587ae41adc2e92c5479626522e2eae3c683d179..f7981664a36efc0bafb0751824805b83b2d7b8f8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
@@ -1,30 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.6_Buses.xsd">
- <v2.0:Vehicle id="VEH-class5_Class-5_5t0_van" xsi:type="VehicleMediumLorryDeclarationType">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class5_Class-5_5t0_van" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>class 5_Class-5_5t0</Model>
<VIN>standard values_van</VIN>
<Date>2017-09-26T15:33:45.0798047Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Van</VehicleCategory>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <CurbMassChassis>4229</CurbMassChassis>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>4229</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
- <CargoVolume>8.55</CargoVolume>
- <IdlingSpeed>100</IdlingSpeed>
+ <IdlingSpeed>600</IdlingSpeed>
+ <CargoVolume>8.550</CargoVolume>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
+ <VehicleTypeApprovalNumber>asdf</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <Components xsi:type="VehicleComponentsNoAxlegearType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
<v2.0:Data id="ENG-350kW_IVT_12l" xsi:type="v1.0:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
@@ -190,8 +199,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
</Reference>
</v2.0:Signature>
</Engine>
- <v2.6:Gearbox>
- <v2.0:Data id="GBX-GB_12-gear" xsi:type="v2.6:GearboxDataDeclarationType">
+ <Gearbox>
+ <v2.0:Data id="GBX-GB_12-gear" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -199,9 +208,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <DifferentialIncluded>true</DifferentialIncluded>
- <AxlegearRatio>2.600</AxlegearRatio>
- <v2.6:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gears xsi:type="v2.0:GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -382,7 +389,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00"/>
</TorqueLossMap>
</Gear>
- </v2.6:Gears>
+ </Gears>
</v2.0:Data>
<v2.0:Signature>
<Reference URI="#GBX-GB_12-gear" xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -394,9 +401,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestValue/>
</Reference>
</v2.0:Signature>
- </v2.6:Gearbox>
- <v2.6:Retarder xsi:type="v2.0:RetarderComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType">
+ </Gearbox>
+ <Retarder>
+ <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>RET-generic</Model>
<CertificationNumber>standard values</CertificationNumber>
@@ -437,7 +444,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-RET-generic" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -446,10 +453,526 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data xsi:type="AxlegearDataDeclarationType" id="AXL-EC3ohnoh" 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="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="0.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="0.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="0.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="0.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="0.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="0.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="0.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="0.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="0.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="0.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="0.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="0.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="0.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="0.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="0.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="0.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="0.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="0.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="0.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="0.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="0.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="0.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="0.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="0.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <Reference URI="#AXL-EC3ohnoh" xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <Transforms>
+ <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </Transforms>
+ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</DigestValue>
+ </Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -507,14 +1030,14 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -526,9 +1049,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Technology>Default</Technology>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
- <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
- <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType">
+ </Auxiliaries>
+ <AirDrag>
+ <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>generic cabin</CertificationNumber>
@@ -538,7 +1061,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<TransferredCdxA>5.57</TransferredCdxA>
<DeclaredCdxA>5.57</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-genericcabin" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -547,8 +1070,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
- </v2.6:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
index cde693140435822b76c9123792203ae98422c9b6..7d5b9a3bc18b4db7fbecdfcd604f738c544849ec 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.6_Buses.xsd">
- <v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleMediumLorryDeclarationType">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>class 5_Class-5_5t0</Model>
<VIN>standard values</VIN>
<Date>2017-09-26T15:33:45.0798047Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Lorry</VehicleCategory>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <CurbMassChassis>4229</CurbMassChassis>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>4229</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>100</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
+ <VehicleTypeApprovalNumber>asdf</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <Components xsi:type="VehicleComponentsNoAxlegearType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
<v2.0:Data id="ENG-350kW_IVT_12l" xsi:type="v1.0:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
@@ -189,8 +198,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
</Reference>
</v2.0:Signature>
</Engine>
- <v2.6:Gearbox>
- <v2.0:Data id="GBX-GB_12-gear" xsi:type="v2.6:GearboxDataDeclarationType">
+ <Gearbox>
+ <v2.0:Data id="GBX-GB_12-gear" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -198,9 +207,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <DifferentialIncluded>true</DifferentialIncluded>
- <AxlegearRatio>2.600</AxlegearRatio>
- <v2.6:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -381,7 +388,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00"/>
</TorqueLossMap>
</Gear>
- </v2.6:Gears>
+ </Gears>
</v2.0:Data>
<v2.0:Signature>
<Reference URI="#GBX-GB_12-gear" xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -393,9 +400,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestValue/>
</Reference>
</v2.0:Signature>
- </v2.6:Gearbox>
- <v2.6:Retarder xsi:type="v2.0:RetarderComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType">
+ </Gearbox>
+ <Retarder>
+ <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>RET-generic</Model>
<CertificationNumber>standard values</CertificationNumber>
@@ -436,7 +443,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-RET-generic" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -445,10 +452,526 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data xsi:type="AxlegearDataDeclarationType" id="AXL-asdf" 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="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="0.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="0.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="0.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="0.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="0.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="0.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="0.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="0.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="0.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="0.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="0.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="0.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="0.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="0.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="0.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="0.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="0.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="0.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="0.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="0.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="0.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="0.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="0.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="0.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <Reference URI="#AXL-EC3ohnoh" xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <Transforms>
+ <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </Transforms>
+ <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</DigestValue>
+ </Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -506,14 +1029,14 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -525,9 +1048,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Technology>Default</Technology>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
- <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
- <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType">
+ </Auxiliaries>
+ <AirDrag>
+ <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>generic cabin</CertificationNumber>
@@ -537,7 +1060,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<TransferredCdxA>5.57</TransferredCdxA>
<DeclaredCdxA>5.57</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-genericcabin" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -546,8 +1069,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
- </v2.6:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorryFWD.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorryFWD.xml
deleted file mode 100644
index bec0a2a816ef64b0374239ff3869e2a6310fa683..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorryFWD.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.6_Buses.xsd">
- <v2.0:Vehicle id="VEH-class5_Class-5_5t0_fwd" xsi:type="VehicleMediumLorryDeclarationType">
- <Manufacturer>Generic Vendor</Manufacturer>
- <ManufacturerAddress>N.A.</ManufacturerAddress>
- <Model>class 5_Class-5_5t0</Model>
- <VIN>standard values_fwd</VIN>
- <Date>2017-09-26T15:33:45.0798047Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Van</VehicleCategory>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <CurbMassChassis>4229</CurbMassChassis>
- <TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
- <CargoVolume>10.32</CargoVolume>
- <IdlingSpeed>100</IdlingSpeed>
- <RetarderType>Transmission Output Retarder</RetarderType>
- <RetarderRatio>1.000</RetarderRatio>
- <AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
- <EngineStopStart>false</EngineStopStart>
- <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
- <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
- <PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <Components xsi:type="VehicleComponentsNoAxlegearType">
- <Engine>
- <v2.0:Data id="ENG-350kW_IVT_12l" xsi:type="v1.0:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>350kW_IVT_12l</Model>
- <CertificationNumber>ENG-350kW_IVT_12l</CertificationNumber>
- <Date>2017-09-26T15:33:45.0954248Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <Displacement>12700</Displacement>
- <IdlingSpeed>600</IdlingSpeed>
- <RatedSpeed>1736</RatedSpeed>
- <RatedPower>325032</RatedPower>
- <MaxEngineTorque>2134</MaxEngineTorque>
- <WHTCUrban>1.0400</WHTCUrban>
- <WHTCRural>1.0100</WHTCRural>
- <WHTCMotorway>1.0000</WHTCMotorway>
- <BFColdHot>1.0000</BFColdHot>
- <CFRegPer>1.0000</CFRegPer>
- <CFNCV>1.0000</CFNCV>
- <FuelType>Diesel CI</FuelType>
- <FuelConsumptionMap>
- <Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00"/>
- <Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00"/>
- <Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75"/>
- <Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91"/>
- <Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95"/>
- <Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27"/>
- <Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00"/>
- <Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45"/>
- <Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57"/>
- <Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68"/>
- <Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80"/>
- <Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92"/>
- <Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00"/>
- <Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69"/>
- <Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77"/>
- <Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06"/>
- <Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92"/>
- <Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55"/>
- <Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09"/>
- <Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44"/>
- <Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90"/>
- <Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02"/>
- <Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05"/>
- <Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96"/>
- <Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00"/>
- <Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15"/>
- <Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49"/>
- <Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43"/>
- <Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87"/>
- <Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49"/>
- <Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62"/>
- <Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10"/>
- <Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31"/>
- <Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18"/>
- <Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40"/>
- <Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09"/>
- <Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00"/>
- <Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21"/>
- <Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69"/>
- <Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67"/>
- <Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76"/>
- <Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71"/>
- <Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70"/>
- <Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40"/>
- <Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65"/>
- <Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67"/>
- <Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29"/>
- <Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72"/>
- <Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00"/>
- <Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21"/>
- <Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55"/>
- <Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50"/>
- <Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59"/>
- <Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22"/>
- <Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81"/>
- <Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77"/>
- <Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22"/>
- <Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60"/>
- <Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89"/>
- <Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10"/>
- <Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00"/>
- <Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15"/>
- <Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52"/>
- <Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44"/>
- <Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41"/>
- <Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61"/>
- <Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71"/>
- <Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01"/>
- <Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96"/>
- <Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37"/>
- <Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97"/>
- <Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23"/>
- <Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00"/>
- <Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84"/>
- <Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80"/>
- <Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69"/>
- <Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18"/>
- <Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30"/>
- <Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33"/>
- <Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82"/>
- <Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91"/>
- <Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82"/>
- <Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52"/>
- <Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14"/>
- <Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00"/>
- <Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40"/>
- <Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91"/>
- <Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19"/>
- <Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18"/>
- <Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21"/>
- <Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36"/>
- <Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25"/>
- <Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48"/>
- <Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01"/>
- <Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92"/>
- <Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75"/>
- <Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00"/>
- <Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80"/>
- <Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09"/>
- <Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05"/>
- <Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56"/>
- <Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62"/>
- <Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51"/>
- <Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51"/>
- <Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25"/>
- <Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29"/>
- <Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45"/>
- <Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09"/>
- <Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00"/>
- <Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51"/>
- <Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55"/>
- <Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96"/>
- <Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46"/>
- <Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94"/>
- <Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10"/>
- <Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71"/>
- <Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15"/>
- <Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35"/>
- <Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10"/>
- <Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30"/>
- </FuelConsumptionMap>
- <FullLoadAndDragCurve>
- <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
- <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
- <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
- <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
- <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
- <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
- <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
- <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
- <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
- <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
- </FullLoadAndDragCurve>
- </v2.0:Data>
- <v2.0:Signature>
- <Reference URI="#ENG-350kW_IVT_12l" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </v2.0:Signature>
- </Engine>
- <v2.6:Gearbox>
- <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>AMT</TransmissionType>
- <MainCertificationMethod>Standard values</MainCertificationMethod>
- <DifferentialIncluded>true</DifferentialIncluded>
- <AxlegearRatio>2.600</AxlegearRatio>
- <v2.6: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.6:Gears>
- </v2.0:Data>
- <v2.0:Signature>
- <Reference URI="#GBX-GB_12-gear" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </v2.0:Signature>
- </v2.6:Gearbox>
- <v2.6:Retarder xsi:type="v2.0:RetarderComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>RET-generic</Model>
- <CertificationNumber>standard values</CertificationNumber>
- <Date>2017-09-26T15:33:45.0954248Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <CertificationMethod>Standard values</CertificationMethod>
- <RetarderLossMap>
- <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
- <Entry retarderSpeed="100.00" torqueLoss="10.00"/>
- <Entry retarderSpeed="200.00" torqueLoss="10.10"/>
- <Entry retarderSpeed="300.00" torqueLoss="10.20"/>
- <Entry retarderSpeed="400.00" torqueLoss="10.30"/>
- <Entry retarderSpeed="500.00" torqueLoss="10.50"/>
- <Entry retarderSpeed="600.00" torqueLoss="10.70"/>
- <Entry retarderSpeed="700.00" torqueLoss="11.00"/>
- <Entry retarderSpeed="800.00" torqueLoss="11.30"/>
- <Entry retarderSpeed="900.00" torqueLoss="11.60"/>
- <Entry retarderSpeed="1000.00" torqueLoss="12.00"/>
- <Entry retarderSpeed="1100.00" torqueLoss="12.40"/>
- <Entry retarderSpeed="1200.00" torqueLoss="12.90"/>
- <Entry retarderSpeed="1300.00" torqueLoss="13.40"/>
- <Entry retarderSpeed="1400.00" torqueLoss="13.90"/>
- <Entry retarderSpeed="1500.00" torqueLoss="14.50"/>
- <Entry retarderSpeed="1600.00" torqueLoss="15.10"/>
- <Entry retarderSpeed="1700.00" torqueLoss="15.80"/>
- <Entry retarderSpeed="1800.00" torqueLoss="16.50"/>
- <Entry retarderSpeed="1900.00" torqueLoss="17.20"/>
- <Entry retarderSpeed="2000.00" torqueLoss="18.00"/>
- <Entry retarderSpeed="2100.00" torqueLoss="18.80"/>
- <Entry retarderSpeed="2200.00" torqueLoss="19.70"/>
- <Entry retarderSpeed="2300.00" torqueLoss="20.60"/>
- <Entry retarderSpeed="2400.00" torqueLoss="21.50"/>
- <Entry retarderSpeed="2500.00" torqueLoss="22.50"/>
- <Entry retarderSpeed="2600.00" torqueLoss="23.50"/>
- <Entry retarderSpeed="2700.00" torqueLoss="24.60"/>
- <Entry retarderSpeed="2800.00" torqueLoss="25.70"/>
- <Entry retarderSpeed="2900.00" torqueLoss="26.80"/>
- <Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
- </RetarderLossMap>
- </Data>
- <Signature>
- <Reference URI="#RET-RET-generic" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
- <Axles>
- <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
- <AxleType>VehicleNonDriven</AxleType>
- <TwinTyres>false</TwinTyres>
- <Steered>true</Steered>
- <Tyre>
- <Data id="TYRE-315_70R225" xsi:type="TyreDataDeclarationType">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>315/70 R22.5</Model>
- <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
- <Date>2017-09-26T15:33:45.1110278Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <Dimension>315/70 R22.5</Dimension>
- <RRCDeclared>0.0052</RRCDeclared>
- <FzISO>33350</FzISO>
- </Data>
- <Signature>
- <Reference URI="#TYRE-315_70R225" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </Signature>
- </Tyre>
- </Axle>
- <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
- <AxleType>VehicleDriven</AxleType>
- <TwinTyres>true</TwinTyres>
- <Steered>false</Steered>
- <Tyre>
- <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.2:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>315/70 R22.5</Model>
- <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
- <Date>2017-09-26T15:33:45.1110278Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <Dimension>235/60 R17C</Dimension>
- <RRCDeclared>0.0061</RRCDeclared>
- <FzISO>33350</FzISO>
- </v2.0:Data>
- <Signature>
- <Reference URI="#TYRE-315_70R225" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </Signature>
- </Tyre>
- </Axle>
- </Axles>
- </Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
- <Data xsi:type="AuxiliariesDataDeclarationType">
- <Fan>
- <Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
- </Fan>
- <SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
- </SteeringPump>
- <ElectricSystem>
- <Technology>Standard technology</Technology>
- </ElectricSystem>
- <PneumaticSystem>
- <Technology>Medium Supply 1-stage + ESS + AMS</Technology>
- </PneumaticSystem>
- <HVAC>
- <Technology>Default</Technology>
- </HVAC>
- </Data>
- </v2.6:Auxiliaries>
- <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
- <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>N.A.</Model>
- <CertificationNumber>generic cabin</CertificationNumber>
- <Date>2017-09-26T15:33:45.1110278Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <CdxA_0>5.57</CdxA_0>
- <TransferredCdxA>5.57</TransferredCdxA>
- <DeclaredCdxA>5.57</DeclaredCdxA>
- </Data>
- <Signature>
- <Reference URI="#Airdrag-genericcabin" xmlns="http://www.w3.org/2000/09/xmldsig#">
- <Transforms>
- <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
- <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- </Transforms>
- <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestValue/>
- </Reference>
- </Signature>
- </v2.6:AirDrag>
- </Components>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
index acf1d421b3c9e75840ca0eea31b085a5f278c4f2..08516efcb9bdea147b75aac22b5e18429a23aefb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class1">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
index dc5decd5014c643488b25c2e1c4993c81e52c384..71f5d5eea4261e40ce0b73e850962c076fca8cec 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class2">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index ef39358017b9985604b2adf7df5756c46d3109f4..5729902664647c1ccf0cc3aa6942ced9c57ebb0d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class3">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index 6b7b491c29dbae1b3d1eb0f1aa94bd7cfd3aa5e3..11e07063064de6cdbb98f349fa537a37192df741 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class4">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
index 0a8016124b260f06ecfd2bdc14a13674cdb81456..9d630d62d28632f31ccb7d147b7ec1ddf709b18a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class9">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
index 11dde054e5c4d359c388a2899f46659bf0769bc3..6d45545365fe2b2c8a54493b96b1eb7c5634c91a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class11">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
index fc9a49d0aead644492f8640ef7434e6d7fd18e78..50e38f4e9702d8540aaa7aa07fc13a8f9b866045 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class16">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index ed78e2df859c1ab0fdc802dedfb98c0f4d6761de..a85ffd7f4da7545d885ffabca0ab9436ec57c1f2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
index a89857f85c79e902e0902daf56a6f29f0fc470d7..4f9f8bb12e2493dab7c20ca86f5262c5205a3262 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_FlatFC">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
index 9605825fed25fc1f2ed5f7988e63752a0eedfcfb..531879faa23dba94ff9841584f72690a67c57d70 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class5_IncreasingFC">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
index f0259bb06c899f7c9c8664db645a17b56acb82f0..72b83fea9baa88c2f263c0d03002173e4693c44b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class10">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
index 92203b94eb71d1d86f8d7a35e9bba98a3aefa4cd..4b3f5b27d281dc56d41d6ed2e48fc236aad8c651 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Class12">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml
index b557aed00d664a1fb9aa0d4f99f5bf06b3fc93f7..e62dafdf2782cadfe57c58d74bc6bb7c2456fb70 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
+<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
<mrf:Data xsi:type="VectoOutputDataType" id="RESULT-05da3904a69f4a3a810c">
<Vehicle xsi:type="VehicleTruckType">
<Model>Generic Model</Model>
@@ -23,7 +23,7 @@
<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- <adas:ATEcoRollReleaseLockupClutch>false</adas:ATEcoRollReleaseLockupClutch>
+ <adas:APTEcoRollReleaseLockupClutch>false</adas:APTEcoRollReleaseLockupClutch>
</ADAS>
<TorqueLimits>
<Entry gear="1" torqueLimit="1900" unit="Nm" torqueLimitPercent="82.6" />
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
index 44f09ba7bac3d21b21f987bc94f3a183b7e9a277..985d39370e6a135bf474c145ae78c855167e29d0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle XMLJob PTO/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle XMLJob PTO/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
index 6b5433a542edd5db65a165a4cd5f7ee16c526f76..2f0769aad635f75fc4515fdcf01417b62036e4a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle XMLJob PTO/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle XMLJob PTO/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoOutput schemaVersion="0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.4.xsd">
+<VectoOutput schemaVersion="0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.4.xsd">
<Data id="RESULT-b330b679d81a449f92ed">
<Vehicle>
<VIN>standard values</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml
index 3069eb40a95836621bde9462d3ccdbe35bc0b9d6..78158d108fa1a84c03019e6bd44fb6af284c9132 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoOutput schemaVersion="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.5.xsd">
+<VectoOutput schemaVersion="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.5.xsd">
<Data id="RESULT-bf220343fe634daa8708">
<Vehicle>
<VIN>1234</VIN>
@@ -15,7 +15,7 @@
<Model>175kW 6.8l Engine</Model>
<CertificationNumber>1234</CertificationNumber>
<DigestValue>JZmOioDqDbJWb3SWfxl/wSaxs9/WN5mLPh8vtJjs8Vs=</DigestValue>
- <RatedPower unit="kW">0</RatedPower>
+ <RatedPower unit="kW">10</RatedPower>
<IdlingSpeed unit="rpm">650</IdlingSpeed>
<RatedSpeed unit="rpm">2200</RatedSpeed>
<Displacement unit="ltr">6.9</Displacement>
@@ -29,11 +29,11 @@
<GearsCount>6</GearsCount>
<TransmissionRatioFinalGear>0.620</TransmissionRatioFinalGear>
</Gearbox>
- <TorqueConverter>
- <Model />
+ <Torqueconverter>
+ <Model >asdf</Model>
<CertificationMethod>Standard values</CertificationMethod>
<DigestValue />
- </TorqueConverter>
+ </Torqueconverter>
<Retarder>
<RetarderType>None</RetarderType>
</Retarder>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
index 28a2b3c3e3bdc345a6e612b96e441d6780ab2eec..af0a1c5512290cfca00ee7156aea2404546cdcbe 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.1.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-N.A.">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
index a5924d2fbd2c2d222766fb8db4d342c98a715322..00902b6089bae44c9e5dc4a1664a30d3db4d0323 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser_2TC.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.1.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-N.A.">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
index 1df1671cc57e3b43b1426dc57f12a0fd26d2d27d..90369ac624447a9a88271a4b9f06a5846c0a083c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/GB_12-gear.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Gearbox>
<Data id="GBX-12gear_Hugo">
<Manufacturer>N.A.</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
index e124d308c9f8348f0f8a9f4142ddabd63c50dd72..b7154d1528d62ea4c2ab0c461d47dfff4300e2b5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Generic Engine.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Engine>
<Data id="ENG-gooZah3D">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
@@ -12,148 +12,146 @@
<RatedSpeed>1800</RatedSpeed>
<RatedPower>325000</RatedPower>
<MaxEngineTorque>2100</MaxEngineTorque>
- <WHTCUrban>1.04</WHTCUrban>
- <WHTCRural>1.01</WHTCRural>
- <WHTCMotorway>1.00</WHTCMotorway>
+ <WHTCUrban>1.0400</WHTCUrban>
+ <WHTCRural>1.0100</WHTCRural>
+ <WHTCMotorway>1.0000</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>Diesel CI</FuelType>
<FuelConsumptionMap>
-<Entry engineSpeed='600.00' torque='-150.00' fuelConsumption='0.00'/>
-<Entry engineSpeed='600.00' torque='0.00' fuelConsumption='1488.18'/>
-<Entry engineSpeed='600.00' torque='216.90' fuelConsumption='3609.53'/>
-<Entry engineSpeed='600.00' torque='433.80' fuelConsumption='6055.65'/>
-<Entry engineSpeed='600.00' torque='650.70' fuelConsumption='8756.65'/>
-<Entry engineSpeed='600.00' torque='867.60' fuelConsumption='10922.44'/>
-<Entry engineSpeed='600.00' torque='1084.50' fuelConsumption='13315.08'/>
-<Entry engineSpeed='600.00' torque='1301.40' fuelConsumption='15886.96'/>
-<Entry engineSpeed='600.00' torque='1518.30' fuelConsumption='18459.52'/>
-<Entry engineSpeed='600.00' torque='1735.20' fuelConsumption='21032.07'/>
-<Entry engineSpeed='600.00' torque='1952.10' fuelConsumption='23604.64'/>
-<Entry engineSpeed='600.00' torque='2169.00' fuelConsumption='26177.20'/>
-<Entry engineSpeed='748.90' torque='-153.25' fuelConsumption='0.00'/>
-<Entry engineSpeed='748.90' torque='0.00' fuelConsumption='1807.12'/>
-<Entry engineSpeed='748.90' torque='216.90' fuelConsumption='4373.53'/>
-<Entry engineSpeed='748.90' torque='433.80' fuelConsumption='7475.64'/>
-<Entry engineSpeed='748.90' torque='650.70' fuelConsumption='10457.98'/>
-<Entry engineSpeed='748.90' torque='867.60' fuelConsumption='13478.84'/>
-<Entry engineSpeed='748.90' torque='1084.50' fuelConsumption='16596.51'/>
-<Entry engineSpeed='748.90' torque='1301.40' fuelConsumption='19894.53'/>
-<Entry engineSpeed='748.90' torque='1518.30' fuelConsumption='23170.22'/>
-<Entry engineSpeed='748.90' torque='1735.20' fuelConsumption='26588.36'/>
-<Entry engineSpeed='748.90' torque='1952.10' fuelConsumption='29968.67'/>
-<Entry engineSpeed='748.90' torque='2169.00' fuelConsumption='33353.96'/>
-<Entry engineSpeed='897.80' torque='-159.33' fuelConsumption='0.00'/>
-<Entry engineSpeed='897.80' torque='0.00' fuelConsumption='2408.37'/>
-<Entry engineSpeed='897.80' torque='216.90' fuelConsumption='5478.92'/>
-<Entry engineSpeed='897.80' torque='433.80' fuelConsumption='8922.38'/>
-<Entry engineSpeed='897.80' torque='650.70' fuelConsumption='12260.27'/>
-<Entry engineSpeed='897.80' torque='867.60' fuelConsumption='15955.34'/>
-<Entry engineSpeed='897.80' torque='1084.50' fuelConsumption='19735.59'/>
-<Entry engineSpeed='897.80' torque='1301.40' fuelConsumption='23532.52'/>
-<Entry engineSpeed='897.80' torque='1518.30' fuelConsumption='27401.60'/>
-<Entry engineSpeed='897.80' torque='1735.20' fuelConsumption='31431.48'/>
-<Entry engineSpeed='897.80' torque='1952.10' fuelConsumption='35551.49'/>
-<Entry engineSpeed='897.80' torque='2169.00' fuelConsumption='39938.19'/>
-<Entry engineSpeed='1046.70' torque='-167.79' fuelConsumption='0.00'/>
-<Entry engineSpeed='1046.70' torque='0.00' fuelConsumption='3027.57'/>
-<Entry engineSpeed='1046.70' torque='216.90' fuelConsumption='6592.96'/>
-<Entry engineSpeed='1046.70' torque='433.80' fuelConsumption='10304.72'/>
-<Entry engineSpeed='1046.70' torque='650.70' fuelConsumption='14130.84'/>
-<Entry engineSpeed='1046.70' torque='867.60' fuelConsumption='18430.08'/>
-<Entry engineSpeed='1046.70' torque='1084.50' fuelConsumption='22831.37'/>
-<Entry engineSpeed='1046.70' torque='1301.40' fuelConsumption='27074.27'/>
-<Entry engineSpeed='1046.70' torque='1518.30' fuelConsumption='31464.60'/>
-<Entry engineSpeed='1046.70' torque='1735.20' fuelConsumption='36010.76'/>
-<Entry engineSpeed='1046.70' torque='1952.10' fuelConsumption='40847.22'/>
-<Entry engineSpeed='1046.70' torque='2169.00' fuelConsumption='46065.97'/>
-<Entry engineSpeed='1195.57' torque='-178.58' fuelConsumption='0.00'/>
-<Entry engineSpeed='1195.57' torque='0.00' fuelConsumption='3363.15'/>
-<Entry engineSpeed='1195.57' torque='216.90' fuelConsumption='7335.38'/>
-<Entry engineSpeed='1195.57' torque='433.80' fuelConsumption='11515.29'/>
-<Entry engineSpeed='1195.57' torque='650.70' fuelConsumption='16035.00'/>
-<Entry engineSpeed='1195.57' torque='867.60' fuelConsumption='20991.82'/>
-<Entry engineSpeed='1195.57' torque='1084.50' fuelConsumption='25994.51'/>
-<Entry engineSpeed='1195.57' torque='1301.40' fuelConsumption='30827.23'/>
-<Entry engineSpeed='1195.57' torque='1518.30' fuelConsumption='35706.34'/>
-<Entry engineSpeed='1195.57' torque='1735.20' fuelConsumption='40827.13'/>
-<Entry engineSpeed='1195.57' torque='1952.10' fuelConsumption='46406.83'/>
-<Entry engineSpeed='1195.57' torque='2169.00' fuelConsumption='51871.18'/>
-<Entry engineSpeed='1359.19' torque='-197.42' fuelConsumption='0.00'/>
-<Entry engineSpeed='1359.19' torque='0.00' fuelConsumption='4184.19'/>
-<Entry engineSpeed='1359.19' torque='216.90' fuelConsumption='8425.73'/>
-<Entry engineSpeed='1359.19' torque='433.80' fuelConsumption='13344.09'/>
-<Entry engineSpeed='1359.19' torque='650.70' fuelConsumption='18488.94'/>
-<Entry engineSpeed='1359.19' torque='867.60' fuelConsumption='23710.52'/>
-<Entry engineSpeed='1359.19' torque='1084.50' fuelConsumption='29183.94'/>
-<Entry engineSpeed='1359.19' torque='1301.40' fuelConsumption='34869.73'/>
-<Entry engineSpeed='1359.19' torque='1518.30' fuelConsumption='40569.44'/>
-<Entry engineSpeed='1359.19' torque='1735.20' fuelConsumption='46859.18'/>
-<Entry engineSpeed='1359.19' torque='1952.10' fuelConsumption='53535.69'/>
-<Entry engineSpeed='1359.19' torque='2169.00' fuelConsumption='59527.43'/>
-<Entry engineSpeed='1484.00' torque='-216.03' fuelConsumption='0.00'/>
-<Entry engineSpeed='1484.00' torque='0.00' fuelConsumption='4778.54'/>
-<Entry engineSpeed='1484.00' torque='216.90' fuelConsumption='9374.62'/>
-<Entry engineSpeed='1484.00' torque='433.80' fuelConsumption='14744.80'/>
-<Entry engineSpeed='1484.00' torque='650.70' fuelConsumption='20327.76'/>
-<Entry engineSpeed='1484.00' torque='867.60' fuelConsumption='26067.43'/>
-<Entry engineSpeed='1484.00' torque='1084.50' fuelConsumption='31952.86'/>
-<Entry engineSpeed='1484.00' torque='1301.40' fuelConsumption='38111.10'/>
-<Entry engineSpeed='1484.00' torque='1518.30' fuelConsumption='44443.35'/>
-<Entry engineSpeed='1484.00' torque='1735.20' fuelConsumption='51470.04'/>
-<Entry engineSpeed='1484.00' torque='1952.10' fuelConsumption='58756.61'/>
-<Entry engineSpeed='1484.00' torque='2169.00' fuelConsumption='65464.76'/>
-<Entry engineSpeed='1608.90' torque='-236.34' fuelConsumption='0.00'/>
-<Entry engineSpeed='1608.90' torque='0.00' fuelConsumption='5366.63'/>
-<Entry engineSpeed='1608.90' torque='216.90' fuelConsumption='10403.91'/>
-<Entry engineSpeed='1608.90' torque='433.80' fuelConsumption='16163.11'/>
-<Entry engineSpeed='1608.90' torque='650.70' fuelConsumption='22182.12'/>
-<Entry engineSpeed='1608.90' torque='867.60' fuelConsumption='28597.95'/>
-<Entry engineSpeed='1608.90' torque='1084.50' fuelConsumption='34917.01'/>
-<Entry engineSpeed='1608.90' torque='1301.40' fuelConsumption='41482.64'/>
-<Entry engineSpeed='1608.90' torque='1518.30' fuelConsumption='48448.45'/>
-<Entry engineSpeed='1608.90' torque='1735.20' fuelConsumption='56115.31'/>
-<Entry engineSpeed='1608.90' torque='1952.10' fuelConsumption='63908.02'/>
-<Entry engineSpeed='1608.90' torque='2169.00' fuelConsumption='71473.19'/>
-<Entry engineSpeed='1733.80' torque='-253.92' fuelConsumption='0.00'/>
-<Entry engineSpeed='1733.80' torque='0.00' fuelConsumption='6131.02'/>
-<Entry engineSpeed='1733.80' torque='216.90' fuelConsumption='11766.81'/>
-<Entry engineSpeed='1733.80' torque='433.80' fuelConsumption='17828.63'/>
-<Entry engineSpeed='1733.80' torque='650.70' fuelConsumption='24479.55'/>
-<Entry engineSpeed='1733.80' torque='867.60' fuelConsumption='31562.49'/>
-<Entry engineSpeed='1733.80' torque='1084.50' fuelConsumption='38232.16'/>
-<Entry engineSpeed='1733.80' torque='1301.40' fuelConsumption='45509.86'/>
-<Entry engineSpeed='1733.80' torque='1518.30' fuelConsumption='53112.67'/>
-<Entry engineSpeed='1733.80' torque='1735.20' fuelConsumption='61204.37'/>
-<Entry engineSpeed='1733.80' torque='1952.10' fuelConsumption='69616.48'/>
-<Entry engineSpeed='1733.80' torque='2169.00' fuelConsumption='77908.71'/>
-<Entry engineSpeed='1858.61' torque='-274.22' fuelConsumption='0.00'/>
-<Entry engineSpeed='1858.61' torque='0.00' fuelConsumption='7348.60'/>
-<Entry engineSpeed='1858.61' torque='216.90' fuelConsumption='13406.42'/>
-<Entry engineSpeed='1858.61' torque='433.80' fuelConsumption='19725.74'/>
-<Entry engineSpeed='1858.61' torque='650.70' fuelConsumption='26797.91'/>
-<Entry engineSpeed='1858.61' torque='867.60' fuelConsumption='34515.72'/>
-<Entry engineSpeed='1858.61' torque='1084.50' fuelConsumption='42106.72'/>
-<Entry engineSpeed='1858.61' torque='1301.40' fuelConsumption='50047.02'/>
-<Entry engineSpeed='1858.61' torque='1518.30' fuelConsumption='58207.47'/>
-<Entry engineSpeed='1858.61' torque='1735.20' fuelConsumption='66630.83'/>
-<Entry engineSpeed='1858.61' torque='1952.10' fuelConsumption='75353.62'/>
-<Entry engineSpeed='1858.61' torque='2169.00' fuelConsumption='84031.99'/>
-
-
+ <Entry engineSpeed='600.00' torque='-150.00' fuelConsumption='0.00'/>
+ <Entry engineSpeed='600.00' torque='0.00' fuelConsumption='1488.18'/>
+ <Entry engineSpeed='600.00' torque='216.90' fuelConsumption='3609.53'/>
+ <Entry engineSpeed='600.00' torque='433.80' fuelConsumption='6055.65'/>
+ <Entry engineSpeed='600.00' torque='650.70' fuelConsumption='8756.65'/>
+ <Entry engineSpeed='600.00' torque='867.60' fuelConsumption='10922.44'/>
+ <Entry engineSpeed='600.00' torque='1084.50' fuelConsumption='13315.08'/>
+ <Entry engineSpeed='600.00' torque='1301.40' fuelConsumption='15886.96'/>
+ <Entry engineSpeed='600.00' torque='1518.30' fuelConsumption='18459.52'/>
+ <Entry engineSpeed='600.00' torque='1735.20' fuelConsumption='21032.07'/>
+ <Entry engineSpeed='600.00' torque='1952.10' fuelConsumption='23604.64'/>
+ <Entry engineSpeed='600.00' torque='2169.00' fuelConsumption='26177.20'/>
+ <Entry engineSpeed='748.90' torque='-153.25' fuelConsumption='0.00'/>
+ <Entry engineSpeed='748.90' torque='0.00' fuelConsumption='1807.12'/>
+ <Entry engineSpeed='748.90' torque='216.90' fuelConsumption='4373.53'/>
+ <Entry engineSpeed='748.90' torque='433.80' fuelConsumption='7475.64'/>
+ <Entry engineSpeed='748.90' torque='650.70' fuelConsumption='10457.98'/>
+ <Entry engineSpeed='748.90' torque='867.60' fuelConsumption='13478.84'/>
+ <Entry engineSpeed='748.90' torque='1084.50' fuelConsumption='16596.51'/>
+ <Entry engineSpeed='748.90' torque='1301.40' fuelConsumption='19894.53'/>
+ <Entry engineSpeed='748.90' torque='1518.30' fuelConsumption='23170.22'/>
+ <Entry engineSpeed='748.90' torque='1735.20' fuelConsumption='26588.36'/>
+ <Entry engineSpeed='748.90' torque='1952.10' fuelConsumption='29968.67'/>
+ <Entry engineSpeed='748.90' torque='2169.00' fuelConsumption='33353.96'/>
+ <Entry engineSpeed='897.80' torque='-159.33' fuelConsumption='0.00'/>
+ <Entry engineSpeed='897.80' torque='0.00' fuelConsumption='2408.37'/>
+ <Entry engineSpeed='897.80' torque='216.90' fuelConsumption='5478.92'/>
+ <Entry engineSpeed='897.80' torque='433.80' fuelConsumption='8922.38'/>
+ <Entry engineSpeed='897.80' torque='650.70' fuelConsumption='12260.27'/>
+ <Entry engineSpeed='897.80' torque='867.60' fuelConsumption='15955.34'/>
+ <Entry engineSpeed='897.80' torque='1084.50' fuelConsumption='19735.59'/>
+ <Entry engineSpeed='897.80' torque='1301.40' fuelConsumption='23532.52'/>
+ <Entry engineSpeed='897.80' torque='1518.30' fuelConsumption='27401.60'/>
+ <Entry engineSpeed='897.80' torque='1735.20' fuelConsumption='31431.48'/>
+ <Entry engineSpeed='897.80' torque='1952.10' fuelConsumption='35551.49'/>
+ <Entry engineSpeed='897.80' torque='2169.00' fuelConsumption='39938.19'/>
+ <Entry engineSpeed='1046.70' torque='-167.79' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1046.70' torque='0.00' fuelConsumption='3027.57'/>
+ <Entry engineSpeed='1046.70' torque='216.90' fuelConsumption='6592.96'/>
+ <Entry engineSpeed='1046.70' torque='433.80' fuelConsumption='10304.72'/>
+ <Entry engineSpeed='1046.70' torque='650.70' fuelConsumption='14130.84'/>
+ <Entry engineSpeed='1046.70' torque='867.60' fuelConsumption='18430.08'/>
+ <Entry engineSpeed='1046.70' torque='1084.50' fuelConsumption='22831.37'/>
+ <Entry engineSpeed='1046.70' torque='1301.40' fuelConsumption='27074.27'/>
+ <Entry engineSpeed='1046.70' torque='1518.30' fuelConsumption='31464.60'/>
+ <Entry engineSpeed='1046.70' torque='1735.20' fuelConsumption='36010.76'/>
+ <Entry engineSpeed='1046.70' torque='1952.10' fuelConsumption='40847.22'/>
+ <Entry engineSpeed='1046.70' torque='2169.00' fuelConsumption='46065.97'/>
+ <Entry engineSpeed='1195.57' torque='-178.58' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1195.57' torque='0.00' fuelConsumption='3363.15'/>
+ <Entry engineSpeed='1195.57' torque='216.90' fuelConsumption='7335.38'/>
+ <Entry engineSpeed='1195.57' torque='433.80' fuelConsumption='11515.29'/>
+ <Entry engineSpeed='1195.57' torque='650.70' fuelConsumption='16035.00'/>
+ <Entry engineSpeed='1195.57' torque='867.60' fuelConsumption='20991.82'/>
+ <Entry engineSpeed='1195.57' torque='1084.50' fuelConsumption='25994.51'/>
+ <Entry engineSpeed='1195.57' torque='1301.40' fuelConsumption='30827.23'/>
+ <Entry engineSpeed='1195.57' torque='1518.30' fuelConsumption='35706.34'/>
+ <Entry engineSpeed='1195.57' torque='1735.20' fuelConsumption='40827.13'/>
+ <Entry engineSpeed='1195.57' torque='1952.10' fuelConsumption='46406.83'/>
+ <Entry engineSpeed='1195.57' torque='2169.00' fuelConsumption='51871.18'/>
+ <Entry engineSpeed='1359.19' torque='-197.42' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1359.19' torque='0.00' fuelConsumption='4184.19'/>
+ <Entry engineSpeed='1359.19' torque='216.90' fuelConsumption='8425.73'/>
+ <Entry engineSpeed='1359.19' torque='433.80' fuelConsumption='13344.09'/>
+ <Entry engineSpeed='1359.19' torque='650.70' fuelConsumption='18488.94'/>
+ <Entry engineSpeed='1359.19' torque='867.60' fuelConsumption='23710.52'/>
+ <Entry engineSpeed='1359.19' torque='1084.50' fuelConsumption='29183.94'/>
+ <Entry engineSpeed='1359.19' torque='1301.40' fuelConsumption='34869.73'/>
+ <Entry engineSpeed='1359.19' torque='1518.30' fuelConsumption='40569.44'/>
+ <Entry engineSpeed='1359.19' torque='1735.20' fuelConsumption='46859.18'/>
+ <Entry engineSpeed='1359.19' torque='1952.10' fuelConsumption='53535.69'/>
+ <Entry engineSpeed='1359.19' torque='2169.00' fuelConsumption='59527.43'/>
+ <Entry engineSpeed='1484.00' torque='-216.03' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1484.00' torque='0.00' fuelConsumption='4778.54'/>
+ <Entry engineSpeed='1484.00' torque='216.90' fuelConsumption='9374.62'/>
+ <Entry engineSpeed='1484.00' torque='433.80' fuelConsumption='14744.80'/>
+ <Entry engineSpeed='1484.00' torque='650.70' fuelConsumption='20327.76'/>
+ <Entry engineSpeed='1484.00' torque='867.60' fuelConsumption='26067.43'/>
+ <Entry engineSpeed='1484.00' torque='1084.50' fuelConsumption='31952.86'/>
+ <Entry engineSpeed='1484.00' torque='1301.40' fuelConsumption='38111.10'/>
+ <Entry engineSpeed='1484.00' torque='1518.30' fuelConsumption='44443.35'/>
+ <Entry engineSpeed='1484.00' torque='1735.20' fuelConsumption='51470.04'/>
+ <Entry engineSpeed='1484.00' torque='1952.10' fuelConsumption='58756.61'/>
+ <Entry engineSpeed='1484.00' torque='2169.00' fuelConsumption='65464.76'/>
+ <Entry engineSpeed='1608.90' torque='-236.34' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1608.90' torque='0.00' fuelConsumption='5366.63'/>
+ <Entry engineSpeed='1608.90' torque='216.90' fuelConsumption='10403.91'/>
+ <Entry engineSpeed='1608.90' torque='433.80' fuelConsumption='16163.11'/>
+ <Entry engineSpeed='1608.90' torque='650.70' fuelConsumption='22182.12'/>
+ <Entry engineSpeed='1608.90' torque='867.60' fuelConsumption='28597.95'/>
+ <Entry engineSpeed='1608.90' torque='1084.50' fuelConsumption='34917.01'/>
+ <Entry engineSpeed='1608.90' torque='1301.40' fuelConsumption='41482.64'/>
+ <Entry engineSpeed='1608.90' torque='1518.30' fuelConsumption='48448.45'/>
+ <Entry engineSpeed='1608.90' torque='1735.20' fuelConsumption='56115.31'/>
+ <Entry engineSpeed='1608.90' torque='1952.10' fuelConsumption='63908.02'/>
+ <Entry engineSpeed='1608.90' torque='2169.00' fuelConsumption='71473.19'/>
+ <Entry engineSpeed='1733.80' torque='-253.92' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1733.80' torque='0.00' fuelConsumption='6131.02'/>
+ <Entry engineSpeed='1733.80' torque='216.90' fuelConsumption='11766.81'/>
+ <Entry engineSpeed='1733.80' torque='433.80' fuelConsumption='17828.63'/>
+ <Entry engineSpeed='1733.80' torque='650.70' fuelConsumption='24479.55'/>
+ <Entry engineSpeed='1733.80' torque='867.60' fuelConsumption='31562.49'/>
+ <Entry engineSpeed='1733.80' torque='1084.50' fuelConsumption='38232.16'/>
+ <Entry engineSpeed='1733.80' torque='1301.40' fuelConsumption='45509.86'/>
+ <Entry engineSpeed='1733.80' torque='1518.30' fuelConsumption='53112.67'/>
+ <Entry engineSpeed='1733.80' torque='1735.20' fuelConsumption='61204.37'/>
+ <Entry engineSpeed='1733.80' torque='1952.10' fuelConsumption='69616.48'/>
+ <Entry engineSpeed='1733.80' torque='2169.00' fuelConsumption='77908.71'/>
+ <Entry engineSpeed='1858.61' torque='-274.22' fuelConsumption='0.00'/>
+ <Entry engineSpeed='1858.61' torque='0.00' fuelConsumption='7348.60'/>
+ <Entry engineSpeed='1858.61' torque='216.90' fuelConsumption='13406.42'/>
+ <Entry engineSpeed='1858.61' torque='433.80' fuelConsumption='19725.74'/>
+ <Entry engineSpeed='1858.61' torque='650.70' fuelConsumption='26797.91'/>
+ <Entry engineSpeed='1858.61' torque='867.60' fuelConsumption='34515.72'/>
+ <Entry engineSpeed='1858.61' torque='1084.50' fuelConsumption='42106.72'/>
+ <Entry engineSpeed='1858.61' torque='1301.40' fuelConsumption='50047.02'/>
+ <Entry engineSpeed='1858.61' torque='1518.30' fuelConsumption='58207.47'/>
+ <Entry engineSpeed='1858.61' torque='1735.20' fuelConsumption='66630.83'/>
+ <Entry engineSpeed='1858.61' torque='1952.10' fuelConsumption='75353.62'/>
+ <Entry engineSpeed='1858.61' torque='2169.00' fuelConsumption='84031.99'/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
-<Entry engineSpeed='600.00' maxTorque='1188.00' dragTorque='-138.00'/>
-<Entry engineSpeed='800.00' maxTorque='1661.00' dragTorque='-143.00'/>
-<Entry engineSpeed='1000.00' maxTorque='2134.00' dragTorque='-152.00'/>
-<Entry engineSpeed='1200.00' maxTorque='2134.00' dragTorque='-165.00'/>
-<Entry engineSpeed='1400.00' maxTorque='2134.00' dragTorque='-187.00'/>
-<Entry engineSpeed='1600.00' maxTorque='1928.00' dragTorque='-217.00'/>
-<Entry engineSpeed='1800.00' maxTorque='1722.00' dragTorque='-244.00'/>
-<Entry engineSpeed='2000.00' maxTorque='1253.00' dragTorque='-278.00'/>
-<Entry engineSpeed='2100.00' maxTorque='750.00' dragTorque='-296.00'/>
-<Entry engineSpeed='2200.00' maxTorque='0.00' dragTorque='-314.00'/>
+ <Entry engineSpeed='600.00' maxTorque='1188.00' dragTorque='-138.00'/>
+ <Entry engineSpeed='800.00' maxTorque='1661.00' dragTorque='-143.00'/>
+ <Entry engineSpeed='1000.00' maxTorque='2134.00' dragTorque='-152.00'/>
+ <Entry engineSpeed='1200.00' maxTorque='2134.00' dragTorque='-165.00'/>
+ <Entry engineSpeed='1400.00' maxTorque='2134.00' dragTorque='-187.00'/>
+ <Entry engineSpeed='1600.00' maxTorque='1928.00' dragTorque='-217.00'/>
+ <Entry engineSpeed='1800.00' maxTorque='1722.00' dragTorque='-244.00'/>
+ <Entry engineSpeed='2000.00' maxTorque='1253.00' dragTorque='-278.00'/>
+ <Entry engineSpeed='2100.00' maxTorque='750.00' dragTorque='-296.00'/>
+ <Entry engineSpeed='2200.00' maxTorque='0.00' dragTorque='-314.00'/>
</FullLoadAndDragCurve>
</Data>
<Signature>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.MANUFACTURER.xml
index ea2c5ec6f471ca58508eff9473a3ea5dd2ad46a6..e92e78777d1c49caa39e28bcd53a644e452783bb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoOutput schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.7.xsd">
+<VectoOutput schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.7.xsd">
<Data id="RESULT-6e1bc850c57f40569c4c">
<Vehicle>
<Model>N.A.</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index ff4511addd5aaac9a9f13e7ee842cd96e267b86e..89cf35e03b89e4bc9b4d2e9f933d31c49f02d34e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class3">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
index 6b5433a542edd5db65a165a4cd5f7ee16c526f76..2f0769aad635f75fc4515fdcf01417b62036e4a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoOutput schemaVersion="0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.4.xsd">
+<VectoOutput schemaVersion="0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.4.xsd">
<Data id="RESULT-b330b679d81a449f92ed">
<Vehicle>
<VIN>standard values</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 0737f918d4eb8891d02581b209f89fabb10314af..9d9f7873207d2aa643c239ccbb9674f107568d82 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Tabelle1_Class-5_Genericvehicle">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
index 88dac2206d093cc074a8c70d343d5c088e2d0ae9..9500387481828cfbe07a1125c2d63bcc2fbd1e20 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoOutput schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.7.xsd">
+<VectoOutput schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoOutputManufacturer.0.7.xsd">
<Data id="RESULT-db205f616a0b4ccc9fed">
<Vehicle>
<Model>Tabelle1_Class-5_Genericvehicle</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index a392d712df00ea4ab263ef9acaded0f7a6a3a49e..97b96ff1e4d648aabac1230375bf90118d8796ab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle_CNG/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-Tabelle1_Class-5_Genericvehicle">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
index d5fc1df9a7bef06d1ef2abf1c5625f17dfc2517d..625e7fa3b39723da3416ae376d6d133733cbbac1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
@@ -1,6 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
+<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
+xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
+ xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput"
+ xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput v:\VectoCore\VectoCore\Resources\XSD/VectoOutputManufacturer.xsd">
<mrf:Data xsi:type="VectoOutputDataType" id="RESULT-b2d5a208fb6d49b09083">
<Vehicle xsi:type="VehicleCompletedBusType">
<PrimaryVehicle>
@@ -71,30 +77,32 @@
<DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</DigestValue>
<CdxA>5.20</CdxA>
</AirDrag>
- <Auxiliaries xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:CompletedVehicleAuxiliaryDataDeclarationType">
- <aux:ElectricSystem>
- <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
- <aux:LEDLights>
- <aux:Dayrunninglights>true</aux:Dayrunninglights>
- <aux:Headlights>true</aux:Headlights>
- <aux:Positionlights>true</aux:Positionlights>
- <aux:Brakelights>true</aux:Brakelights>
- <aux:Interiorlights>true</aux:Interiorlights>
- </aux:LEDLights>
- </aux:ElectricSystem>
- <aux:HVAC>
- <aux:SystemConfiguration>6</aux:SystemConfiguration>
- <aux:CompressorType>
- <aux:DriverAC>2-stage</aux:DriverAC>
- <aux:PassengerAC>2-stage</aux:PassengerAC>
- </aux:CompressorType>
- <aux:AuxiliaryHeaterPower>30000</aux:AuxiliaryHeaterPower>
- <aux:DoubleGlazing>true</aux:DoubleGlazing>
- <aux:HeatPump>false</aux:HeatPump>
- <aux:AdjustableAuxiliaryHeater>true</aux:AdjustableAuxiliaryHeater>
- <aux:SeparateAirDistributionDucts>true</aux:SeparateAirDistributionDucts>
- </aux:HVAC>
- </Auxiliaries>
+ <mrf0.8:Auxiliaries xsi:type="AUX_Conventional_CompletedBusType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>true</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>true</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>6</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
+ <DoubleGlazing>true</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ </HVAC>
+ </mrf0.8:Auxiliaries>
</Components>
<InputDataSignature>
<di:Reference>
@@ -137,8 +145,8 @@
<AverageGearboxEfficiency unit="%">96.34</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">95.23</AverageAxlegearEfficiency>
</VehiclePerformance>
- <FuelConsumptionFactor>0.9840</FuelConsumptionFactor>
- <Fuel type="Diesel CI">
+<!-- <FuelConsumptionFactor>0.9840</FuelConsumptionFactor> -->
+ <Fuel type="Diesel CI">
<FuelConsumption unit="g/km">409.4</FuelConsumption>
<FuelConsumption unit="g/t-km">80.1</FuelConsumption>
<FuelConsumption unit="g/p-km">5.69</FuelConsumption>
@@ -184,7 +192,7 @@
<AverageGearboxEfficiency unit="%">96.46</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">94.82</AverageAxlegearEfficiency>
</VehiclePerformance>
- <FuelConsumptionFactor>1.046</FuelConsumptionFactor>
+<!-- <FuelConsumptionFactor>1.046</FuelConsumptionFactor>-->
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">369.4</FuelConsumption>
<FuelConsumption unit="g/t-km">214.4</FuelConsumption>
@@ -231,7 +239,7 @@
<AverageGearboxEfficiency unit="%">97.45</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">91.58</AverageAxlegearEfficiency>
</VehiclePerformance>
- <FuelConsumptionFactor>1.025</FuelConsumptionFactor>
+<!-- <FuelConsumptionFactor>1.025</FuelConsumptionFactor>-->
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">276.0</FuelConsumption>
<FuelConsumption unit="g/t-km">150.2</FuelConsumption>
@@ -278,7 +286,7 @@
<AverageGearboxEfficiency unit="%">97.36</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">92.16</AverageAxlegearEfficiency>
</VehiclePerformance>
- <FuelConsumptionFactor>1.023</FuelConsumptionFactor>
+<!-- <FuelConsumptionFactor>1.023</FuelConsumptionFactor>-->
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">292.7</FuelConsumption>
<FuelConsumption unit="g/t-km">63.7</FuelConsumption>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.RSLT_MANUFACTURER.xml
index 57ec419a5fd1130d2de7298e4b9f7f872d502f80..e6e31b0f9c8b8b7250b064e35443ff673ab6173b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.RSLT_MANUFACTURER.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
+<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
<mrf:Data xsi:type="VectoOutputDataType" id="RESULT-35861c040b024dd292c3">
<Vehicle xsi:type="VehiclePrimaryBusType">
<Model>Generic Model</Model>
@@ -91,19 +91,18 @@
<aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
</aux:SteeringPump>
<aux:ElectricSystem>
- <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
- <aux:SmartElectrics>false</aux:SmartElectrics>
- <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
- <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
+ <aux:AlternatorTechnology>conventional</aux:AlternatorTechnology>
+ <aux:SupplyFromHEVPossible>true</aux:SupplyFromHEVPossible>
</aux:ElectricSystem>
<aux:PneumaticSystem>
<aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+ <aux:CompressorDrive>mechanically</aux:CompressorDrive>
<aux:Clutch>none</aux:Clutch>
<aux:CompressorRatio>1.000</aux:CompressorRatio>
<aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
<aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
<aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
- <aux:AdBlueDosing>true</aux:AdBlueDosing>
+ <aux:PneumaticSCRReagentDosing>true</aux:PneumaticSCRReagentDosing>
</aux:PneumaticSystem>
<aux:HVAC>
<aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
index 3b8a9919d3f236fd6510b210ddfb380664cc7f07..e2c94c01dfb3ade63a8cd36538a60b06118f33b1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
<Articulated>false</Articulated>
@@ -15,19 +24,19 @@
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <v2.6:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800"/>
<Entry gear="1" maxTorque="2500"/>
<Entry gear="12" maxTorque="1900"/>
- </v2.6:TorqueLimits>
- <Components xsi:type="PrimaryVehicleComponentsDeclarationType">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </v2.10.2:TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
@@ -181,7 +190,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -190,10 +199,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" >
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -201,7 +210,7 @@
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears xsi:type="GearsDeclarationType">
+ <Gears>
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -2580,8 +2589,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2590,10 +2599,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <v2.0:Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" >
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2605,16 +2614,16 @@
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:TorqueConverter>
- <v2.6:Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" >
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2630,8 +2639,8 @@
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2640,10 +2649,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Angledrive>
- <v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" >
<Manufacturer>Generic Vendor</Manufacturer>
<Model>RET-generic</Model>
<CertificationNumber>standard values</CertificationNumber>
@@ -2713,8 +2722,8 @@
<Entry retarderSpeed="5900.00" torqueLoss="13.70" />
<Entry retarderSpeed="6000.00" torqueLoss="14.00" />
</RetarderLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -2723,10 +2732,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" >
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -3230,8 +3239,8 @@
<Entry inputSpeed="2100.00" inputTorque="34000.00" torqueLoss="550.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -3240,10 +3249,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:Axlegear>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" >
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3328,9 +3337,9 @@
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
- <Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -3339,7 +3348,6 @@
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
@@ -3356,7 +3364,7 @@
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
index db5c7d97ad54750e66bd9003fb32a4816f8f5c0f..fc99200f3ca2bfdbeec0358194e2a3b2c55ac5d2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
@@ -1,29 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
- <Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
- <LegislativeClass>M3</LegislativeClass>
- <RegisteredClass>II+III</RegisteredClass>
- <VehicleCode>CB</VehicleCode>
- <CurbMassChassis>19400</CurbMassChassis>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>19400</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
- <RegisteredPassengers>
- <LowerDeck>16</LowerDeck>
- <UpperDeck>56</UpperDeck>
- </RegisteredPassengers>
+ <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <NgTankSystem>Compressed</NgTankSystem>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>56</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
<LowEntry>true</LowEntry>
- <HeightIntegratedBody>4.000</HeightIntegratedBody>
- <VehicleLength>13.890</VehicleLength>
- <VehicleWidth>2.550</VehicleWidth>
- <EntranceHeight>0.300</EntranceHeight>
+ <HeightIntegratedBody>4000</HeightIntegratedBody>
+ <VehicleLength>13890</VehicleLength>
+ <VehicleWidth>550</VehicleWidth>
+ <EntranceHeight>300</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -32,8 +35,8 @@
<CdxA_0>5.20</CdxA_0>
<TransferredCdxA>5.20</TransferredCdxA>
<DeclaredCdxA>5.20</DeclaredCdxA>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -42,29 +45,31 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
- </v2.6:AirDrag>
+ </v2.0:Signature>
+ </AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
<LEDLights>
+ <Interiorlights>true</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
- <Headlights>true</Headlights>
<Positionlights>true</Positionlights>
<Brakelights>true</Brakelights>
- <Interiorlights>true</Interiorlights>
+ <Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>6</SystemConfiguration>
- <CompressorType>
- <DriverAC>2-stage</DriverAC>
- <PassengerAC>2-stage</PassengerAC>
- </CompressorType>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
- <HeatPump>false</HeatPump>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
</HVAC>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto
index 0cab2d9df728b96f64b494f3078d0ba292bd5471..0da8ed888315c2d05ceaade18ec8b4e9b9d10965 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/VTP_MediumLorry.vecto
@@ -7,8 +7,8 @@
},
"Body": {
"SavedInDeclMode": true,
- "DeclarationVehicle": "vecto_vehicle-medium_lorry_4x2F.xml",
- "ManufacturerRecord": "vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml",
+ "DeclarationVehicle": "vecto_vehicle-medium_lorry_4x2.xml",
+ "ManufacturerRecord": "vecto_vehicle-medium_lorry_4x2.RSLT_MANUFACTURER.xml",
"Mileage": 30000.0,
"NCVTestFuel": 42.5,
"FanPowerCoefficients": [
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
similarity index 74%
rename from VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.xml
rename to VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
index 2b916178fc07ab65165639f02acb6fd126d51f41..5b4c4f972ee25d564029fd088a26941f279ba51a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
@@ -1,31 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.6_Buses.xsd">
- <v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleMediumLorryDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>ML2r</Model>
<VIN>standard values</VIN>
<Date>2017-09-26T15:33:45.0798047Z</Date>
- <LegislativeClass>N2</LegislativeClass>
- <VehicleCategory>Van</VehicleCategory>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <CurbMassChassis>2500</CurbMassChassis>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>2500</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
- <CargoVolume>8.53</CargoVolume>
<IdlingSpeed>800</IdlingSpeed>
+ <CargoVolume>8.530</CargoVolume>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <v2.6:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
- <EngineStopStart>false</EngineStopStart>
- <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
- <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
- <PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.6:ADAS>
- <Components xsi:type="v2.6:VehicleComponentsNoAxlegearType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="ENG-130kW_IVT_3l" xsi:type="EngineDataDeclarationType">
+ <VehicleTypeApprovalNumber>a</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
+ <v2.3:EngineStopStart>false</v2.3:EngineStopStart>
+ <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
+ <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
+ <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
+ <v2.0:Data id="ENG-130kW_IVT_3l" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>130kW engine</Model>
<CertificationNumber>ENG-130kW_IVT_3l</CertificationNumber>
@@ -365,8 +375,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry engineSpeed='3878.21' maxTorque='270.61' dragTorque='-63.57'/>
<Entry engineSpeed='3987.18' maxTorque='235.95' dragTorque='-65.72'/>
</FullLoadAndDragCurve>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#ENG-130kW_IVT_3l" xmlns="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -375,10 +385,10 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</di:DigestValue>
</Reference>
- </Signature>
- </v2.6:Engine>
- <v2.6:Gearbox xsi:type="GearboxComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <v2.0:Data id="GB_6-gear_MT" xsi:type="v2.6:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="GB_6-gear_MT" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_6-gear_MT</Model>
<CertificationNumber>GB_6-gear_MT</CertificationNumber>
@@ -386,9 +396,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<AppVersion>VectoCore</AppVersion>
<TransmissionType>SMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <DifferentialIncluded>true</DifferentialIncluded>
- <AxlegearRatio>4.300</AxlegearRatio>
- <v2.6:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gears>
<Gear number="1">
<Ratio>5.375</Ratio>
<TorqueLossMap>
@@ -1520,9 +1528,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry inputSpeed='4000.00' inputTorque='5500.00' torqueLoss='244.00'/>
</TorqueLossMap>
</Gear>
- </v2.6:Gears>
+ </Gears>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GB_6-gear_MT" xmlns="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1531,10 +1539,10 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</di:DigestValue>
</Reference>
- </Signature>
- </v2.6:Gearbox>
- <v2.6:Retarder xsi:type="v2.0:RetarderComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType">
+ </v2.0:Signature>
+ </Gearbox>
+ <Retarder>
+ <v2.0:Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>RET-generic</Model>
<CertificationNumber>standard values</CertificationNumber>
@@ -1574,8 +1582,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Entry retarderSpeed="2900.00" torqueLoss="26.80"/>
<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
</RetarderLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#RET-RET-generic" xmlns="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -1584,10 +1592,526 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</di:DigestValue>
</Reference>
- </Signature>
- </v2.6:Retarder>
- <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data xsi:type="AxlegearDataDeclarationType" id="AXL-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.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="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="0.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="0.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="0.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="0.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="0.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="0.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="0.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="0.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="0.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="0.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="0.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="0.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="0.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="0.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="0.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="0.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="0.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="0.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="0.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="0.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="0.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="0.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="0.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="0.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="0.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="0.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="0.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1300.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1500.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1700.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="34000.00" torqueLoss="550.00"/>
+ <Entry inputSpeed="1900.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="1000.00" torqueLoss="55.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="2000.00" torqueLoss="70.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="85.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="4000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="6000.00" torqueLoss="130.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="7000.00" torqueLoss="145.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="8000.00" torqueLoss="160.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="9000.00" torqueLoss="175.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="10000.00" torqueLoss="190.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="11000.00" torqueLoss="205.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="12000.00" torqueLoss="220.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="13000.00" torqueLoss="235.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="14000.00" torqueLoss="250.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="16000.00" torqueLoss="280.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="17000.00" torqueLoss="295.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="18000.00" torqueLoss="310.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="19000.00" torqueLoss="325.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="20000.00" torqueLoss="340.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="21000.00" torqueLoss="355.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="22000.00" torqueLoss="370.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="23000.00" torqueLoss="385.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="24000.00" torqueLoss="400.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="25000.00" torqueLoss="415.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="26000.00" torqueLoss="430.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="27000.00" torqueLoss="445.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="28000.00" torqueLoss="460.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="29000.00" torqueLoss="475.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="30000.00" torqueLoss="490.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="31000.00" torqueLoss="505.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="32000.00" torqueLoss="520.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="33000.00" torqueLoss="535.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="34000.00" torqueLoss="550.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>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
@@ -1645,14 +2169,14 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
</Axle>
</Axles>
</Data>
- </v2.6:AxleWheels>
- <v2.6:Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Bimetallic controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
@@ -1664,7 +2188,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Technology>Default</Technology>
</HVAC>
</Data>
- </v2.6:Auxiliaries>
+ </Auxiliaries>
<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
<Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_CUSTOMER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_CUSTOMER.xml
deleted file mode 100644
index 5a15e24eaf6ac55188e3fb3724c19e5e388c05ef..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_CUSTOMER.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<VectoCustomerInformation schemaVersion="0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputCustomer.0.8.xsd">
- <Data id="COC-e712642b655e49f29461">
- <Vehicle>
- <Model>ML2r</Model>
- <Manufacturer>Generic Vendor</Manufacturer>
- <ManufacturerAddress>N.A.</ManufacturerAddress>
- <VIN>standard values</VIN>
- <LegislativeClass>N2</LegislativeClass>
- <GrossVehicleMass unit="t">7.0</GrossVehicleMass>
- <CurbMassChassis unit="kg">2500</CurbMassChassis>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <HybridElectricHDV>false</HybridElectricHDV>
- <DualFuelVehicle>false</DualFuelVehicle>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <VehicleGroup>ML2r</VehicleGroup>
- <VocationalVehicle>false</VocationalVehicle>
- <SleeperCab>false</SleeperCab>
- <ADAS>
- <EngineStopStart>false</EngineStopStart>
- <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
- <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
- <PredictiveCruiseControl>false</PredictiveCruiseControl>
- </ADAS>
- <EngineRatedPower unit="kW">130</EngineRatedPower>
- <EngineDisplacement unit="ltr">3.0</EngineDisplacement>
- <FuelTypes>
- <FuelType>Diesel CI</FuelType>
- </FuelTypes>
- <TransmissionMainCertificationMethod>Standard values</TransmissionMainCertificationMethod>
- <TransmissionType>SMT</TransmissionType>
- <GearsCount>6</GearsCount>
- <Retarder>false</Retarder>
- <AxleRatio>4.300</AxleRatio>
- <AverageRRCMotorVehicleTyres>0.0074</AverageRRCMotorVehicleTyres>
- <AverageFuelEfficiencyLabelMotorVehicleTyres>E</AverageFuelEfficiencyLabelMotorVehicleTyres>
- <InputDataSignature>
- <di:Reference URI="#VEH-class5_Class-5_5t0">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>hBQl3bPXtviHPjVq/jmOM8ai5kkHLooMWoTVJfzkuLQ=</di:DigestValue>
- </di:Reference>
- </InputDataSignature>
- </Vehicle>
- <ResultDataSignature>
- <di:Reference URI="#RESULT-8a1c4eb391614a73b113">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>Ymq1wujbJTpLLkbvcZZcMb0DkFHpOD6khpNPuRz89RI=</di:DigestValue>
- </di:Reference>
- </ResultDataSignature>
- <Results>
- <Status>success</Status>
- <Result status="success">
- <Mission>Regional Delivery</Mission>
- <Payload unit="kg">1129</Payload>
- <FuelMode>single fuel mode</FuelMode>
- <AverageSpeed unit="km/h">60.4</AverageSpeed>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">144.3</FuelConsumption>
- <FuelConsumption unit="g/t-km">127.8</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.38</FuelConsumption>
- <FuelConsumption unit="l/100km">17.3</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.153</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00764</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">451.5</CO2>
- <CO2 unit="g/t-km">400.0</CO2>
- <CO2 unit="g/m³-km">20.0</CO2>
- </Result>
- <Result status="success">
- <Mission>Regional Delivery</Mission>
- <Payload unit="kg">224</Payload>
- <FuelMode>single fuel mode</FuelMode>
- <AverageSpeed unit="km/h">60.4</AverageSpeed>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">138.9</FuelConsumption>
- <FuelConsumption unit="g/t-km">621.1</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.15</FuelConsumption>
- <FuelConsumption unit="l/100km">16.6</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.743</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00735</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">434.7</CO2>
- <CO2 unit="g/t-km">1944.2</CO2>
- <CO2 unit="g/m³-km">19.2</CO2>
- </Result>
- <Result status="success">
- <Mission>Urban Delivery</Mission>
- <Payload unit="kg">1129</Payload>
- <FuelMode>single fuel mode</FuelMode>
- <AverageSpeed unit="km/h">25.7</AverageSpeed>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">166.9</FuelConsumption>
- <FuelConsumption unit="g/t-km">147.8</FuelConsumption>
- <FuelConsumption unit="g/m³-km">7.38</FuelConsumption>
- <FuelConsumption unit="l/100km">20.0</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.177</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00883</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">522.4</CO2>
- <CO2 unit="g/t-km">462.7</CO2>
- <CO2 unit="g/m³-km">23.1</CO2>
- </Result>
- <Result status="success">
- <Mission>Urban Delivery</Mission>
- <Payload unit="kg">224</Payload>
- <FuelMode>single fuel mode</FuelMode>
- <AverageSpeed unit="km/h">25.7</AverageSpeed>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">154.0</FuelConsumption>
- <FuelConsumption unit="g/t-km">688.9</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.82</FuelConsumption>
- <FuelConsumption unit="l/100km">18.4</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.824</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00815</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">482.1</CO2>
- <CO2 unit="g/t-km">2156.4</CO2>
- <CO2 unit="g/m³-km">21.3</CO2>
- </Result>
- <Summary>
- <SpecificCO2Emissions unit="gCO2/tkm">699.0</SpecificCO2Emissions>
- <AveragePayload unit="t">0.676</AveragePayload>
- </Summary>
- </Results>
- <ApplicationInformation>
- <SimulationToolVersion>0.6.0.1875-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-02-22T15:44:10.8724832Z</Date>
- </ApplicationInformation>
- </Data>
- <Signature>
- <di:Reference URI="#COC-e712642b655e49f29461">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>CT2Kx2BI0ubf703c2nNHGHCBS7Dq1EzbzDiNWLRJuEI=</di:DigestValue>
- </di:Reference>
- </Signature>
-</VectoCustomerInformation>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml
deleted file mode 100644
index 3b40af410eb325f0ced41be945b01428ff500a4f..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
-<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
- <mrf:Data xsi:type="VectoOutputDataType" id="RESULT-8a1c4eb391614a73b113">
- <Vehicle xsi:type="VehicleTruckType">
- <Model>ML2r</Model>
- <Manufacturer>Generic Vendor</Manufacturer>
- <ManufacturerAddress>N.A.</ManufacturerAddress>
- <VIN>standard values</VIN>
- <LegislativeClass>N2</LegislativeClass>
- <GrossVehicleMass unit="t">7.0</GrossVehicleMass>
- <CurbMassChassis unit="kg">2500</CurbMassChassis>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <HybridElectricHDV>false</HybridElectricHDV>
- <DualFuelVehicle>false</DualFuelVehicle>
- <AxleConfiguration>4x2F</AxleConfiguration>
- <VehicleGroup>ML2r</VehicleGroup>
- <VocationalVehicle>false</VocationalVehicle>
- <SleeperCab>false</SleeperCab>
- <PTO>false</PTO>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
- <Components xsi:type="ComponentsTruckFWDType">
- <Engine>
- <Model>130kW engine</Model>
- <CertificationNumber>ENG-130kW_IVT_3l</CertificationNumber>
- <DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
- <RatedPower unit="kW">130</RatedPower>
- <IdlingSpeed unit="rpm">800</IdlingSpeed>
- <RatedSpeed unit="rpm">3600</RatedSpeed>
- <Displacement unit="ltr">3.0</Displacement>
- <WHRType>none</WHRType>
- <Mode>
- <FuelType>Diesel CI</FuelType>
- </Mode>
- </Engine>
- <Gearbox>
- <Model>GB_6-gear_MT</Model>
- <CertificationMethod>Standard values</CertificationMethod>
- <DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
- <TransmissionType>SMT</TransmissionType>
- <GearsCount>6</GearsCount>
- <AxlegearRatio>4.300</AxlegearRatio>
- <TransmissionRatioFinalGear>0.791</TransmissionRatioFinalGear>
- </Gearbox>
- <Retarder>
- <RetarderType>None</RetarderType>
- </Retarder>
- <AirDrag>
- <Model>N.A.</Model>
- <CertificationMethod>Measured</CertificationMethod>
- <CertificationNumber>generic cabin</CertificationNumber>
- <DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
- <CdxA>5.80</CdxA>
- </AirDrag>
- <AxleWheels>
- <Axle axleNumber="1">
- <TyreDimension>215/75 R17.5</TyreDimension>
- <TyreCertificationNumber>TYRE-235/65 R16C</TyreCertificationNumber>
- <DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
- <TyreRRCDeclared>0.0074</TyreRRCDeclared>
- <TwinTyres>false</TwinTyres>
- </Axle>
- <Axle axleNumber="2">
- <TyreDimension>215/75 R17.5</TyreDimension>
- <TyreCertificationNumber>TYRE-215/75 R17.5</TyreCertificationNumber>
- <DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
- <TyreRRCDeclared>0.0074</TyreRRCDeclared>
- <TwinTyres>true</TwinTyres>
- </Axle>
- </AxleWheels>
- <Auxiliaries>
- <FanTechnology>Crankshaft mounted - Bimetallic controlled visco clutch</FanTechnology>
- <SteeringPumpTechnology>Fixed displacement</SteeringPumpTechnology>
- <ElectricSystemTechnology>Standard technology - LED headlights, all</ElectricSystemTechnology>
- <PneumaticSystemTechnology>Vacuum pump</PneumaticSystemTechnology>
- <HVACTechnology>Default</HVACTechnology>
- </Auxiliaries>
- </Components>
- <InputDataSignature>
- <di:Reference URI="#VEH-class5_Class-5_5t0">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>hBQl3bPXtviHPjVq/jmOM8ai5kkHLooMWoTVJfzkuLQ=</di:DigestValue>
- </di:Reference>
- </InputDataSignature>
- </Vehicle>
- <Results>
- <Status>success</Status>
- <Result status="success">
- <Mission>Regional Delivery</Mission>
- <Distance unit="km">100.000</Distance>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">4429</TotalVehicleMass>
- <Payload unit="kg">1129</Payload>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <VehiclePerformance>
- <AverageSpeed unit="km/h">60.4</AverageSpeed>
- <AverageDrivingSpeed unit="km/h">69.0</AverageDrivingSpeed>
- <MinSpeed unit="km/h">0.0</MinSpeed>
- <MaxSpeed unit="km/h">85.0</MaxSpeed>
- <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
- <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
- <FullLoadDrivingtimePercentage>7.16</FullLoadDrivingtimePercentage>
- <GearshiftCount>111</GearshiftCount>
- <EngineSpeedDriving>
- <Min unit="rpm">800.0</Min>
- <Average unit="rpm">1936.1</Average>
- <Max unit="rpm">3196.3</Max>
- </EngineSpeedDriving>
- <AverageGearboxEfficiency unit="%">88.74</AverageGearboxEfficiency>
- <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
- </VehiclePerformance>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">144.3</FuelConsumption>
- <FuelConsumption unit="g/t-km">127.8</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.38</FuelConsumption>
- <FuelConsumption unit="MJ/km">6.16</FuelConsumption>
- <FuelConsumption unit="MJ/t-km">5.46</FuelConsumption>
- <FuelConsumption unit="MJ/m³-km">0.273</FuelConsumption>
- <FuelConsumption unit="l/100km">17.3</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.153</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00764</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">451.5</CO2>
- <CO2 unit="g/t-km">400.0</CO2>
- <CO2 unit="g/m³-km">20.0</CO2>
- </Result>
- <Result status="success">
- <Mission>Regional Delivery</Mission>
- <Distance unit="km">100.000</Distance>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">3524</TotalVehicleMass>
- <Payload unit="kg">224</Payload>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <VehiclePerformance>
- <AverageSpeed unit="km/h">60.4</AverageSpeed>
- <AverageDrivingSpeed unit="km/h">69.1</AverageDrivingSpeed>
- <MinSpeed unit="km/h">0.0</MinSpeed>
- <MaxSpeed unit="km/h">85.0</MaxSpeed>
- <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
- <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
- <FullLoadDrivingtimePercentage>3.58</FullLoadDrivingtimePercentage>
- <GearshiftCount>100</GearshiftCount>
- <EngineSpeedDriving>
- <Min unit="rpm">800.0</Min>
- <Average unit="rpm">1925.5</Average>
- <Max unit="rpm">2876.2</Max>
- </EngineSpeedDriving>
- <AverageGearboxEfficiency unit="%">88.37</AverageGearboxEfficiency>
- <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
- </VehiclePerformance>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">138.9</FuelConsumption>
- <FuelConsumption unit="g/t-km">621.1</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.15</FuelConsumption>
- <FuelConsumption unit="MJ/km">5.93</FuelConsumption>
- <FuelConsumption unit="MJ/t-km">26.5</FuelConsumption>
- <FuelConsumption unit="MJ/m³-km">0.262</FuelConsumption>
- <FuelConsumption unit="l/100km">16.6</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.743</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00735</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">434.7</CO2>
- <CO2 unit="g/t-km">1944.2</CO2>
- <CO2 unit="g/m³-km">19.2</CO2>
- </Result>
- <Result status="success">
- <Mission>Urban Delivery</Mission>
- <Distance unit="km">99.999</Distance>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">4429</TotalVehicleMass>
- <Payload unit="kg">1129</Payload>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <VehiclePerformance>
- <AverageSpeed unit="km/h">25.7</AverageSpeed>
- <AverageDrivingSpeed unit="km/h">33.7</AverageDrivingSpeed>
- <MinSpeed unit="km/h">0.0</MinSpeed>
- <MaxSpeed unit="km/h">85.0</MaxSpeed>
- <MaxDeceleration unit="m/s²">1.45</MaxDeceleration>
- <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
- <FullLoadDrivingtimePercentage>5.23</FullLoadDrivingtimePercentage>
- <GearshiftCount>796</GearshiftCount>
- <EngineSpeedDriving>
- <Min unit="rpm">800.0</Min>
- <Average unit="rpm">1709.3</Average>
- <Max unit="rpm">3671.2</Max>
- </EngineSpeedDriving>
- <AverageGearboxEfficiency unit="%">83.39</AverageGearboxEfficiency>
- <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
- </VehiclePerformance>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">166.9</FuelConsumption>
- <FuelConsumption unit="g/t-km">147.8</FuelConsumption>
- <FuelConsumption unit="g/m³-km">7.38</FuelConsumption>
- <FuelConsumption unit="MJ/km">7.13</FuelConsumption>
- <FuelConsumption unit="MJ/t-km">6.31</FuelConsumption>
- <FuelConsumption unit="MJ/m³-km">0.315</FuelConsumption>
- <FuelConsumption unit="l/100km">20.0</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.177</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00883</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">522.4</CO2>
- <CO2 unit="g/t-km">462.7</CO2>
- <CO2 unit="g/m³-km">23.1</CO2>
- </Result>
- <Result status="success">
- <Mission>Urban Delivery</Mission>
- <Distance unit="km">99.999</Distance>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">3524</TotalVehicleMass>
- <Payload unit="kg">224</Payload>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <VehiclePerformance>
- <AverageSpeed unit="km/h">25.7</AverageSpeed>
- <AverageDrivingSpeed unit="km/h">33.7</AverageDrivingSpeed>
- <MinSpeed unit="km/h">0.0</MinSpeed>
- <MaxSpeed unit="km/h">85.0</MaxSpeed>
- <MaxDeceleration unit="m/s²">1.41</MaxDeceleration>
- <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
- <FullLoadDrivingtimePercentage>3.86</FullLoadDrivingtimePercentage>
- <GearshiftCount>747</GearshiftCount>
- <EngineSpeedDriving>
- <Min unit="rpm">800.0</Min>
- <Average unit="rpm">1695.9</Average>
- <Max unit="rpm">3677.2</Max>
- </EngineSpeedDriving>
- <AverageGearboxEfficiency unit="%">81.68</AverageGearboxEfficiency>
- <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
- </VehiclePerformance>
- <Fuel type="Diesel CI">
- <FuelConsumption unit="g/km">154.0</FuelConsumption>
- <FuelConsumption unit="g/t-km">688.9</FuelConsumption>
- <FuelConsumption unit="g/m³-km">6.82</FuelConsumption>
- <FuelConsumption unit="MJ/km">6.58</FuelConsumption>
- <FuelConsumption unit="MJ/t-km">29.4</FuelConsumption>
- <FuelConsumption unit="MJ/m³-km">0.291</FuelConsumption>
- <FuelConsumption unit="l/100km">18.4</FuelConsumption>
- <FuelConsumption unit="l/t-km">0.824</FuelConsumption>
- <FuelConsumption unit="l/m³-km">0.00815</FuelConsumption>
- </Fuel>
- <CO2 unit="g/km">482.1</CO2>
- <CO2 unit="g/t-km">2156.4</CO2>
- <CO2 unit="g/m³-km">21.3</CO2>
- </Result>
- </Results>
- <ApplicationInformation>
- <SimulationToolVersion>0.6.0.1875-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-02-22T15:44:10.8645043Z</Date>
- </ApplicationInformation>
- </mrf:Data>
- <mrf:Signature>
- <di:Reference URI="#RESULT-8a1c4eb391614a73b113">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>Ymq1wujbJTpLLkbvcZZcMb0DkFHpOD6khpNPuRz89RI=</di:DigestValue>
- </di:Reference>
- </mrf:Signature>
-</mrf:VectoOutput>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index 283f53b26f531c059263566c1e11cb9c4f325c73..ca1871926d184b45a0d5defde9ba2570339e59a9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -1,5 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vif0.1:VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<vif0.1:VectoOutputMultistage
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<vif0.1:PrimaryVehicle>
<vif0.1:Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
<vif0.1:Vehicle xsi:type="VehiclePIFType">
@@ -565,29 +574,31 @@
<di:DigestValue>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
</di:Reference>
</vif0.1:HashPreviousStage>
- <vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-a00526e499f144139792">
- <v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>Infinite Loop 1</v2.8:ManufacturerAddress>
- <v2.8:VIN>VEH-1234567890</v2.8:VIN>
- <v2.8:Date>2021-05-23T22:00:00Z</v2.8:Date>
- <v2.8:Model>Sample Bus Model</v2.8:Model>
- <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
- <v2.8:CorrectedActualMass>8300</v2.8:CorrectedActualMass>
- <v2.8:TechnicalPermissibleMaximumLadenMass>18000</v2.8:TechnicalPermissibleMaximumLadenMass>
- <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
- <v2.8:ClassBus>II+III</v2.8:ClassBus>
- <v2.8:NumberPassengersLowerDeck>30</v2.8:NumberPassengersLowerDeck>
- <v2.8:NumberPassengersUpperDeck>0</v2.8:NumberPassengersUpperDeck>
- <v2.8:BodyworkCode>CA</v2.8:BodyworkCode>
- <v2.8:LowEntry>true</v2.8:LowEntry>
- <v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
- <v2.8:VehicleLength>11830</v2.8:VehicleLength>
- <v2.8:VehicleWidth>2550</v2.8:VehicleWidth>
- <v2.8:EntranceHeight>120</v2.8:EntranceHeight>
- <v2.8:DoorDriveTechnology>pneumatic</v2.8:DoorDriveTechnology>
- <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
- <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag>
+ <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-a00526e499f144139792" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-05-23T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>8300</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <NgTankSystem>Compressed</NgTankSystem>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CA</BodyworkCode>
+ <LowEntry>true</LowEntry>
+ <HeightIntegratedBody>3000</HeightIntegratedBody>
+ <VehicleLength>11830</VehicleLength>
+ <VehicleWidth>2550</VehicleWidth>
+ <EntranceHeight>120</EntranceHeight>
+ <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -608,32 +619,36 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</Signature>
- </v2.8:AirDrag>
- <v2.8:Auxiliaries>
- <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
- <v2.8:ElectricSystem>
- <v2.8:LEDLights>
- <v2.8:Interiorlights>false</v2.8:Interiorlights>
- <v2.8:Dayrunninglights>false</v2.8:Dayrunninglights>
- <v2.8:Positionlights>false</v2.8:Positionlights>
- <v2.8:Brakelights>false</v2.8:Brakelights>
- <v2.8:Headlights>false</v2.8:Headlights>
- </v2.8:LEDLights>
- </v2.8:ElectricSystem>
- <v2.8:HVAC>
- <v2.8:SystemConfiguration>7</v2.8:SystemConfiguration>
- <v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
- <v2.8:HeatPumpModeDriverCompartment>cooling</v2.8:HeatPumpModeDriverCompartment>
- <v2.8:HeatPumpTypePassengerCompartment>non R-744 4-stage</v2.8:HeatPumpTypePassengerCompartment>
- <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
- <v2.8:AuxiliaryHeaterPower>0</v2.8:AuxiliaryHeaterPower>
- <v2.8:DoubleGlazing>true</v2.8:DoubleGlazing>
- <v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
- <v2.8:SeparateAirDistributionDucts>true</v2.8:SeparateAirDistributionDucts>
- </v2.8:HVAC>
- </v2.8:Data>
- </v2.8:Auxiliaries>
- </v2.8:Components>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>false</Dayrunninglights>
+ <Positionlights>false</Positionlights>
+ <Brakelights>false</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>7</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 4-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
+ <DoubleGlazing>true</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
</vif0.1:Vehicle>
<vif0.1:ApplicationInformation>
<vif0.1:SimulationToolVersion>0.7.3.2247-DEV</vif0.1:SimulationToolVersion>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
index bf97f2d63e384bdbb925fa1915db4fd9dc5a9e83..1ffa0726cc1cd17e5eebd2075445836fd263bbb6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -3,7 +3,7 @@
xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
index b889e2dfb8c8859ef2aebfcd1940eba801ba6bb3..e2d2a56901f1797330a0c9dca73f2cf5dc9f2003 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-new_parameters-sample.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
index 2e755eb0ca9b12d8d8b12678f54e2544205457d1..021d870ad6e8e2ebf6f362dc6f47727887e71c47 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
index e00b0f177919d4f5e9cc15fddaf4f771024cffcb..bdc38e09cf334455140ec0d03e2e0516491aa326 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -5,8 +5,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<v2.1:Manufacturer>Generic Vendor</v2.1:Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
index 35d1d33c0e6040f86ff0965b52da64a8c03f08b1..45b80b1cdc5f75ea5a079647f029884aea171e0d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
index 57e464da4240cd0d9dfc7ac0135cc8c370d8135a..5ce75cc5bf30c9ca98e8f167c605f28b4fb8b288 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_2.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
index 763f42b6d4ed9fcfe07f1f13ea6f57053520d307..59651be7fa628bb521d5a52976b01568b7a6d015 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-engine_2.0.xml
@@ -7,7 +7,7 @@
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
index 14fd77fd79058e7b69b3f1c486623c340e9e3b77..044bc2534e0fcc692b227fa93b469010f5a58023 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-exempted-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
index 665ce44d75348d7ab34f8d6fabf367fc5e607389..ec54dae802f148eb32044bff96afcab88ddb5693 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-new_parameters-sample.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
index 3520871a08ce8a05bbf5d8794b18881674c4fa83..5feddcb6e48889e35e27a8355a6b33a97da87118 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-sample_LNG.xml
@@ -6,8 +6,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
index c81834b89d7428ce2742a7af53fabaf358279534..de9f07222a15656a48a7b8f2312d1339afbc9a04 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
index 7aecb041c5484590d5e4d6468196f0bc293b12a2..67ac8a07a7fb6f72e074d0bd3301efc625114f04 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
index 053f4bc853a014a2c099cab3db29548c6cd8e419..fa42d88e4b72d2c0a537a316eece5756daf13a69 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
@@ -7,7 +7,7 @@ xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_HeavyLorryType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_HeavyLorryDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
index e27e7ae083431c1e1eb6b8b7bcdc381734edd763..cd7af94789b3aa072c0c5a299c9473d089de2557 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
@@ -7,7 +7,7 @@ xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_MediumLorryType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_MediumLorryDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
index d425a88196be24c916b3efd9826b74a3e965fdf0..5cc36baaaa513905235570b41cedccd5e3bc7f46 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
@@ -7,7 +7,7 @@ xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
index 466703acb1c81888134bf15e3ed15faaebd33dc5..1fdc103c377597409f77112313a561db212dade2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
@@ -283,7 +283,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_Conventional_LorryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
index c091caba091372e0950c20cb735d5254b517a54e..f3a81fac59ee1ed646b4fbedca5592784d90551f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
@@ -527,7 +527,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <v2.10.2:Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <v2.10.2:Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
index 069c4f567716f20a0eabca68a686c4677cefc894..1843e1c388fa269f683a14ab99ac9e9712b1e009 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
@@ -410,7 +410,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType" >
+ <Data xsi:type="AUX_HEV_LorryDataType" >
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
index 5c7bab3b8a4355c1db4513496655f3c1faa0eb7d..531f55e734553215c0301a0ebd21d5052af1a33a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
@@ -428,7 +428,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
index ab32ac6679cbcf0106e52af801881a4afa799d20..b704e6c6c1fb4b2578a610cfc56b2c431e1cdc5d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
@@ -398,7 +398,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
index 9f3f7584f84781de30e18b01c9ea56fe7bb3c730..ae6001ad1d8a179db43d49eae1e98be500c495ce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
@@ -1 +1 @@
-<?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-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<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>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="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 xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.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="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>
<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>
<Data xsi:type="AUX_HEV_LorryDataDeclarationType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag><!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions: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-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<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>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="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 xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.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="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>
<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>
<Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag><!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
index ab8ac10f345bb253634f07926fe4cb904f337ede..263d06aa9bb3877fb3e6fd59d89fb140657879f6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
@@ -285,7 +285,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_IEPC_LorryDataDeclarationType">
+ <Data xsi:type="AUX_IEPC_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
index dc0d678458ce11bc79525287b06027063a139582..29490c42e84ff056b3fcc8ce8a75afb4c074d83e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
@@ -405,7 +405,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
index 151f1a3b65f7235e21ceebbe6d1a63420055ceef..1fddfb644cc8c3562c5c684afb26e8a299f6c520 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
@@ -427,7 +427,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
index 15f3d1cd965445b89de493a47c882a9f16aa764c..cba0d7e062dd12b911cb66d11a530ca8dad626f3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
@@ -306,7 +306,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
index 5bab2f78675398599fcd952114a48e03c6a01995..452af9e2ddb92d86f2a0fa7a6a56acd822e37103 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
@@ -276,7 +276,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
index 1989aa4af18e478424801b455e2b43cf363c454c..94b6fa0837c24462457905e7ad95fe8e52fd63c5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
@@ -278,7 +278,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_Conventional_LorryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
index 5517eb4aa88d8a0f53ad2fc3a21253069134ceb3..cd86450a9ff19782ed095fa8411dab824d36a6b6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
@@ -522,7 +522,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
index 3c849e36ae75297f66cd1183a1b1aaac983ce626..f9496b28826b61ec6077aa06afa1444442d3ed32 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
@@ -407,7 +407,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
index 3c33d3b6cb24c02d98ba3e9066fbc4f6de9f5dec..8d5b9061734f931d70df07e41188c4dc124c9902 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
@@ -423,7 +423,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
index ec7db70847bad09688779e246550504284c4c293..a481ed45a3e216665e763036b143e5061c52ac58 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
@@ -393,7 +393,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
index 7909623bdcb2f6500533b4aa58576eb1922d209c..ff89b1ce95c4c3ad3a5925689cd4347debf4c984 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
@@ -443,7 +443,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_HEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_HEV_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
index b33249be6e00c8fb998b170136f858d6fc6a1b40..077d0350f10c099980844156ff5712c5d2b409ca 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
@@ -280,7 +280,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_IEPC_LorryDataDeclarationType">
+ <Data xsi:type="AUX_IEPC_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
index fd1071c542a01bd06fea14e48d8764e33e7501a1..8ac475c48572f665367b3f3ea362e57068209037 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
@@ -400,7 +400,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
index 6d20bb2f3fe5c1b1ac789363ac5bb027ccd344a7..aafc9089ed44afa93caada28e5112eae6aa7e167 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
@@ -419,7 +419,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
index 2ebfbb52d6c2f8433655ac9cbbd58c4730ff2636..b1bbe17db1af963ecceba7be749f1a8e13d34f0c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
@@ -301,7 +301,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
index cab62456442ddbad2263919980ec2d91ef02aef0..71cd6bcb3c4b5a06bb3cfb47fa154395f4a4a41f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
@@ -271,7 +271,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_PEV_LorryDataDeclarationType">
+ <Data xsi:type="AUX_PEV_LorryDataType">
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
index 1a6c64c4473b72b678fbf68d90b09ee4561ec387..7a42287103aac2e19ac38e0b69ee69d607b12e7b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
@@ -8,7 +8,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_PrimaryBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
index 2ba63f13aa231a3d76937229043ec149f4aae45d..c03460f972605df60cdaa1515e15fbbd7f3ec4a2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
@@ -5,7 +5,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 180463292a6cbf7c561e5a3969767d5d96f58814..7ecb5e926bdb0a9793c7262f3b7d8600769597ac 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 4725f6acf5a5286b4caddb32b75470852ae9cca2..9d649c89131917e60a72d58efb9e78ff892b86d3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 6830356d6049c88c30953e5d7b1f7574c71ba9f9..b04e71dc329e51696d0621e3c7af9ed99abb6b1b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
index df2d1ee1f7050f002b42bcdb5afb8468d67269f2..e16d649641b0a9d543d3280f677d7c5d1e1f11bf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
@@ -533,7 +533,7 @@
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AUX_Conventional_LorryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
index d1e5b1621b2b0ae9ffff017987dd8513b6d57bfd..748430e078f878fd3691b40a5535d43bd264cbb6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle xsi:type="InterimStageInputType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<NgTankSystem>Liquefied</NgTankSystem>
<ClassBus>B</ClassBus>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>1,2</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>true</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<NgTankSystem>Liquefied</NgTankSystem>
<ClassBus>B</ClassBus>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
index d688d47acf2aade1fbe7e9987d58fa206343bef8..f506066a9138d7e010eac99cda6c9be8dc4ff4e4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -6,8 +6,7 @@
xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
index 514bc4a24ff111d30f27899289713a25b29f7d09..34224c3650d6ca54871fce7dafd3f931aabdfedf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_engine-sample.xml
@@ -6,7 +6,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoComponent.2.0.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"
>
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
index 44094e031c3d92b0f533096dae628dd6ada7757b..342fa98219be33f596eeffee4cdf9450e5dc64b0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -3246,7 +3246,7 @@
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
- <Dimension>235/60 R17 C</Dimension> <!-- New Dimesion added in v2.2 -->
+ <Dimension>235/60 R17C</Dimension> <!-- New Dimesion added in v2.2 -->
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</v2.0:Data>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
index a577d20478e20d4743eac7dff7659e1470433711..c5659826e44e739a1f1dda69897a663ef6fa8b5e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
@@ -2,12 +2,12 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_FurtherDev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
- <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF">
+ <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -17,7 +17,11 @@
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
- <WHRType>none</WHRType>
+ <WHRType>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
+ </WHRType>
<Mode>
<IdlingSpeed>560</IdlingSpeed>
<FullLoadAndDragCurve>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
index 23c953dc82653b563c4c2864845df821450a251c..6a8aec969e79295bcaa6306fc0e35ca584c38c8e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
@@ -5,7 +5,7 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoComponent.2.0.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
index 124becae98823784aea62e9f109ee540b4609d0b..e2e9a37427d3e1debc435f58656ade3ceb6e27a0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
@@ -2,12 +2,12 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent E:\QUAM\Workspace\VECTO_FurtherDev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:Engine xsi:type="v2.0:EngineComponentDeclarationType">
- <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF">
+ <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -17,7 +17,11 @@
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
- <WHRType>mechanical and electrical</WHRType>
+ <WHRType>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
+ </WHRType>
<Mode>
<IdlingSpeed>560</IdlingSpeed>
<FullLoadAndDragCurve>
@@ -40,14 +44,16 @@
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<WHRCorrectionFactors>
- <Urban>1.0097</Urban>
- <Rural>1.0000</Rural>
- <Motorway>1.0000</Motorway>
- <BFColdHot>1.0000</BFColdHot>
- <CFRegPer>1.0000</CFRegPer>
+ <Electrical>
+ <Urban>1.0097</Urban>
+ <Rural>1.0000</Rural>
+ <Motorway>1.0000</Motorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ </Electrical>
</WHRCorrectionFactors>
<FuelConsumptionMap>
- <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00" electricPower="200.00" mechanicalPower="" />
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00" electricPower="200.00" />
<Entry engineSpeed="560.00" torque="0.00" fuelConsumption="125.60" electricPower="200.00" />
<Entry engineSpeed="560.00" torque="200.00" fuelConsumption="319.70" electricPower="200.00" />
<Entry engineSpeed="560.00" torque="400.00" fuelConsumption="529.50" electricPower="200.00" />
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
index 7e09626a2ff6f2942ae599aba53ddf7a9c94100a..e46bf8a4a4b9189d06f42f2a1e8e2ecc8d9acd12 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
@@ -8,7 +8,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
index 7883d9a5f72223e0380bb5524eb645dbf310cb59..741270330426fcc3dee537dd4addbba051f7e573 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
index 0073f9b9efb7e30edd9023b44cc5936ec51a5fba..5cc40175de91483ed0d8095461ebf8a1ea3a58fa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
index e647e10f1e5d974a8d6533bafc3c5ad0e49d70eb..7ed32a6d062031c9d8779021ae97c688777f09cb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
@@ -7,7 +7,7 @@
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
index 19f990f401fdab766211e724ce1ebaf31b6d1328..fe4bc2b444cf05e47c5abf79e08b2bb3649dacb1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
@@ -8,7 +8,7 @@
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
>
<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index ad3f52514f7b719754b6488b16967dbbb89a6c8e..de7907d4cb4ff56da78cdeade5caeeb19a41c754 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -5724,9 +5724,6 @@
<Content Include="TestData\Integration\VTPMode\GenericVehicle XMLJob PTO\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\Integration\MediumLorries\vecto_vehicle-medium_lorryFWD.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="TestData\Integration\VTPMode\GenericVehicle\CityBus_AT_Ser_2TC.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -5811,10 +5808,10 @@
<Content Include="TestData\Integration\VTPMode\HeavyBus\vecto_vehicle-completed_heavyBus_34f.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml">
+ <Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2.RSLT_MANUFACTURER.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2F.xml">
+ <Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Jobs\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 1fb3b2f6d2991834d3f217ab1d547ab51965bbdb..4bbd3da184097a875552d5c8a3e2ceb4280d1dd5 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -597,8 +597,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
<ClassBus>I+II</ClassBus>
- <NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
- <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+ <NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CE</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>3000</HeightIntegratedBody>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 09c33da0837fc971b41958f73720ccccd46e3703..a1788eccc1bdafc6e2ef9e484aa96df5bc248011 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -72,20 +72,6 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_vif_input.xml" HomeFolder="Yes"/>
</Folder>
- <Folder FolderName="Schema Multistage 0.1">
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_airdrag.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_heatPump.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_hev.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_vif.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_one_stage.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_two_stages.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_only.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_3.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_mandatory.xml" HomeFolder="Yes"/>
- </Folder>
<Folder FolderName="Schema 2.10_Components" ValidFileSet="Yes" ValidFile="VectoCore\Resources\XSD\VectoComponent.2.10.xsd">
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\BatterySystem_1.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\CapacitorSystem_1.xml" HomeFolder="Yes"/>
@@ -150,6 +136,250 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_primaryBus.xml" HomeFolder="Yes"/>
</Folder>
</Folder>
+ <Folder FolderName="Schema Multistage 0.1">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_airdrag.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_heatPump.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_hev.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages_vif.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_one_stage.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_two_stages.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_only.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_3.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_mandatory.xml" HomeFolder="Yes"/>
+ </Folder>
+ </Folder>
+ <Folder FolderName="XML Files Vecto Testcases">
+ <Folder FolderName="SchemaVersion2.10" ExtStr=".xml">
+ <Folder FolderName="Distributed">
+ <Folder FolderName="CompletedBus">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\CompletedBus\Conventional_completedBus_1.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\CompletedBus\HEV_completedBus_1.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\CompletedBus\IEPC_completedBus_1.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\CompletedBus\PEV_completedBus_1.xml"/>
+ </Folder>
+ <Folder FolderName="ComponentData">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\BatterySystem_1.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\CapacitorSystem_1.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ElectricMachineSystem-IHPC_1.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ElectricMachineSystem_1.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ElectricMachineSystem_StdValues.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\Gearbox_APT-N.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\Gearbox_IHPC.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\IEPC_1.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\IEPC_StdValues.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="ExemptedVehicles">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_completedBus_input_full.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_completedBus_input_only_mandatory_entries.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_heavyLorry.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_mediumLorry.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ExemptedVehicles\exempted_primaryBus.xml"/>
+ </Folder>
+ <Folder FolderName="HeavyLorry">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\IEPC_heavyLorry.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_APT-N_E2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml"/>
+ </Folder>
+ <Folder FolderName="MediumLorry">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\Conventional_mediumLorry_AMT.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\HEV-S_mediumLorry_AMT_S2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\HEV-S_mediumLorry_IEPC-S.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\HEV-S_mediumLorry_S3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\HEV-S_mediumLorry_S4.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\HEV_mediumLorry_AMT_Px.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\IEPC_mediumLorry.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\PEV_mediumLorry_AMT_E2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\PEV_mediumLorry_APT-N_E2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\PEV_mediumLorry_E3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\PEV_mediumLorry_E4.xml"/>
+ </Folder>
+ <Folder FolderName="PrimaryBus">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV_primaryBus_AMT_Px.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\IEPC_primaryBus.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_E3.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_E4.xml"/>
+ </Folder>
+ </Folder>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\exempted_primary_heavyBus.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-completed_heavyBus-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-exempted_input_full-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-exempted_input_only_certain_entries01-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-exempted_input_only_certain_entries02-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-exempted_input_only_mandatory_entries.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-medium_lorry-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-primary_heavyBus-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-primary_heavyBusSmartES-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_full-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_full-sample_group41.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_certain_entries01-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_certain_entries02-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_component_nullable_entries.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_mandatory_entries.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_vif_input.xml"/>
+ </Folder>
+ <Folder FolderName="SchemaVersion2.3">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\engineSample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\engineSample_WHR.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\engineSampleDualModeDualFuel.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_tyre-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_vehicle-fullElectricSP.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel_WHR.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeDualFuel.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeDualFuel_WHR.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeSingleFuel_WHR.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="SchemaVersion2.2">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\Tractor_4x2_vehicle-class-5_5_t_0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\vecto_engine-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\vecto_tyre-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\vecto_vehicle-exempted-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\vecto_vehicle-new_parameters-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.2\vecto_vehicle-sample_LNG.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="SchemaVersion2.1">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\Tractor_4x2_vehicle-class-5_5_t_0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_engine-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_tyre-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-components_1.0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-components_2.0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-engine_2.0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-exempted-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-new_parameters-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\vecto_vehicle-sample_LNG.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="SchemaVersion2.0">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\Tractor_4x2_vehicle-class-5_5_t_0.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_engine-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_tyre-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-components_1.0.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-new_parameters-sample.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-sample_LNG.xml"/>
+ </Folder>
+ <Folder FolderName="SchemaVersion1.0">
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\test.VIF_Report_2.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\Tractor_4x2_vehicle-class-5_5_t_0.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\vecto_engine-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\vecto_vehicle-exempted-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\vecto_vehicle-new_parameters-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion1.0\vecto_vehicle-sample_LNG.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="Integration">
+ <Folder FolderName="DeclarationMode">
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\Class4_Vocational\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\Class5_ADAS\Tractor_4x2_vehicle-class-5_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\Class5_NG\Tractor_4x2_vehicle-class-5_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\Class5_Vocational\Tractor_4x2_vehicle-class-5_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\EngineSpeedTooHigh\vecto_vehicle-sample_9gears.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="Buses">
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\CompletedHeavyBus_33b1.RSLT_VIF.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group41.RSLT_VIF.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_AT-P.RSLT_VIF.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart_AT-P.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.RSLT_VIF.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\primary_heavyBus group42_SmartPS.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-completed_heavyBus.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_41.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_41_mixed.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_42.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartES.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartES_PS.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_SmartPS.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="ADAS">
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group5_EcoRoll.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group5_EcoRollEngineStop.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group5_EngineStopStart.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group9_AT_EcoRoll.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group9_AT_EcoRoll_missingParam.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group9_AT_EngineStopStart.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group9_AT_PCC.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group9_AT_PCCEcoRoll.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ADAS\Group5PCCDecl\Tractor_4x2_vehicle-class-5_5_t_0.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="MediumLorries">
+ <File FilePath="VectoCoreTest\TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry-Van.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="ShiftStrategy_SampleVehicles">
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_6x2_vehicle-class-10_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_6x4_vehicle-class-12_EURO6_2018.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="VTPMode">
+ <Folder FolderName="DualFuelVehicle">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\DualFuelVehicle\vehicle_sampleSingleModeDualFuel.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\DualFuelVehicle\vehicle_sampleSingleModeDualFuel.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="GenericVehicle">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\CityBus_AT_Ser.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\CityBus_AT_Ser.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\CityBus_AT_Ser_2TC.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\GB_12-gear.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\Generic Engine.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\Rigid Truck_4x2_vehicle-class-3_EURO6_2018.MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle\Tractor_4x2_vehicle-class-5_Generic vehicle.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="GenericVehicle XMLJob PTO">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle XMLJob PTO\Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle XMLJob PTO\Tractor_4x2_vehicle-class-5_Generic vehicle.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="GenericVehicle_CNG">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle_CNG\Tractor_4x2_vehicle-class-5_Generic vehicle.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\GenericVehicle_CNG\Tractor_4x2_vehicle-class-5_Generic vehicle.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="HeavyBus">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\HeavyBus\CompletedBus_34f.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\HeavyBus\primary_heavyBus group 42_non_Smart.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\HeavyBus\primary_heavyBus group 42_non_Smart.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\HeavyBus\vecto_vehicle-completed_heavyBus_34f.xml" HomeFolder="Yes"/>
+ </Folder>
+ <Folder FolderName="MediumLorry">
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2.RSLT_CUSTOMER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2.RSLT_MANUFACTURER.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2.xml" HomeFolder="Yes"/>
+ </Folder>
+ </Folder>
+ </Folder>
</Folder>
<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
<File FilePath="E:\QUAM\Workspace\VECTO_quam\Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/>