diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.0.xsd
index 2ec0489fc347938a63c9f07155f3522870c04af6..f497a3d4974144a54cd1177f4eaf8844024d7bca 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.0.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdecdef1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdecdef1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:element name="VectoInputDeclaration">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
index dfed1f3c8a622991dba6ea95dc6b3841291b3070..1cb148e1cd6066621d9b9595dee9260c43a9b9bf 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<?xml-stylesheet type="text/xsl" href="../RenderTable.xslt"?>
-<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:complexType name="AbstractAuxiliaryDataDeclarationType" abstract="true"/>
<xs:complexType name="AbstractAxleDataDeclarationType" abstract="true"/>
<xs:complexType name="AbstractAxleWheelsComponentDeclarationType" abstract="true"/>
- <xs:complexType name="AbstractAxleWheelsDataDeclarationType"/>
+ <xs:complexType name="AbstractAxleWheelsDataDeclarationType" abstract="true"/>
<xs:complexType name="AbstractGearEntryType" abstract="true"/>
+ <xs:complexType name="AbstractGearsDeclarationType" abstract="true"/>
<xs:complexType name="AbstractPTODataType" abstract="true"/>
- <xs:complexType name="AbstractTorqueLimitsType"/>
+ <xs:complexType name="AbstractTorqueLimitsType" abstract="true"/>
<xs:complexType name="AbstractVehicleComponentsDeclarationType" abstract="true"/>
<xs:complexType name="AbstractVehicleDeclarationType" abstract="true">
<xs:complexContent>
- <xs:extension base="tns:DeclarationPowertrainComponentType"/>
+ <xs:extension base="v2.0:DeclarationPowertrainComponentType"/>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="AirDragComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractAirdragDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AirDragDataDeclarationType">
@@ -74,7 +75,7 @@
<xs:complexType name="AngledriveComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractAngledriveDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AngledriveDataDeclarationType">
@@ -119,7 +120,7 @@
<xs:element name="TorqueLossMap">
<xs:complexType>
<xs:sequence minOccurs="4" maxOccurs="unbounded">
- <xs:element name="Entry" type="tns:AngledriveLossMapEntryType"/>
+ <xs:element name="Entry" type="v2.0:AngledriveLossMapEntryType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -146,12 +147,12 @@
</xs:complexType>
<xs:complexType name="AuxiliariesComponentDeclarationType">
<xs:sequence>
- <xs:element name="Data" type="tns:AbstractAuxiliaryDataDeclarationType"/>
+ <xs:element name="Data" type="v2.0:AbstractAuxiliaryDataDeclarationType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AuxiliariesDataDeclarationType">
<xs:complexContent>
- <xs:extension base="tns:AbstractAuxiliaryDataDeclarationType">
+ <xs:extension base="v2.0:AbstractAuxiliaryDataDeclarationType">
<xs:sequence>
<xs:element name="Fan">
<xs:complexType>
@@ -214,7 +215,7 @@
</xs:complexType>
<xs:complexType name="AxleDataDeclarationType">
<xs:complexContent>
- <xs:extension base="tns:AbstractAxleDataDeclarationType">
+ <xs:extension base="v2.0:AbstractAxleDataDeclarationType">
<xs:sequence>
<xs:element name="AxleType" type="v1.0:AxleTypeDeclarationType">
<xs:annotation>
@@ -231,7 +232,7 @@
<xs:documentation>P195 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Tyre" type="tns:TyreComponentDeclarationType"/>
+ <xs:element name="Tyre" type="v2.0:TyreComponentDeclarationType"/>
</xs:sequence>
<xs:attribute name="axleNumber" use="required">
<xs:simpleType>
@@ -247,7 +248,7 @@
<xs:complexType name="AxlegearComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractAxlegearDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AxlegearDataDeclarationType">
@@ -328,9 +329,9 @@
<xs:complexType name="AxlegearTorqueLossMapType"/>
<xs:complexType name="AxleWheelsComponentDeclarationType">
<xs:complexContent>
- <xs:extension base="tns:AbstractAxleWheelsComponentDeclarationType">
+ <xs:extension base="v2.0:AbstractAxleWheelsComponentDeclarationType">
<xs:sequence>
- <xs:element name="Data" type="tns:AbstractAxleWheelsDataDeclarationType"/>
+ <xs:element name="Data" type="v2.0:AbstractAxleWheelsDataDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -340,12 +341,12 @@
<xs:documentation>Axles & Wheels Component</xs:documentation>
</xs:annotation>
<xs:complexContent>
- <xs:extension base="tns:AbstractAxleWheelsDataDeclarationType">
+ <xs:extension base="v2.0:AbstractAxleWheelsDataDeclarationType">
<xs:sequence>
<xs:element name="Axles">
<xs:complexType>
<xs:sequence>
- <xs:element name="Axle" type="tns:AbstractAxleDataDeclarationType" minOccurs="2" maxOccurs="4"/>
+ <xs:element name="Axle" type="v2.0:AbstractAxleDataDeclarationType" minOccurs="2" maxOccurs="4"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -355,13 +356,13 @@
</xs:complexType>
<xs:complexType name="DeclarationPowertrainComponentType" abstract="true">
<xs:complexContent>
- <xs:extension base="tns:VectoSimulationComponent"/>
+ <xs:extension base="v2.0:VectoSimulationComponent"/>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="EngineComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractCombustionEngineDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="EngineDataDeclarationType">
@@ -456,14 +457,14 @@
<xs:element name="FuelConsumptionMap">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="tns:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="v2.0:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="FullLoadAndDragCurve">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="tns:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="v2.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -534,7 +535,7 @@
<xs:complexType name="GearboxComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractTransmissionDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="GearboxDataDeclarationType">
@@ -579,20 +580,14 @@
<xs:documentation>P254 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Gears">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GearDeclarationType">
<xs:complexContent>
- <xs:extension base="tns:GearBaseType">
+ <xs:extension base="v2.0:GearBaseType">
<xs:sequence>
<xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
<xs:annotation>
@@ -607,9 +602,9 @@
<xs:element name="TorqueLossMap">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="tns:TorqueLossMapType">
+ <xs:extension base="v2.0:TorqueLossMapType">
<xs:sequence>
- <xs:element name="Entry" type="tns:TorqueLossMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="v2.0:TorqueLossMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -619,9 +614,18 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="GearsDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="v2.0:AbstractGearsDeclarationType">
+ <xs:sequence>
+ <xs:element name="Gear" type="v2.0:GearDeclarationType" maxOccurs="99"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="PTOType">
<xs:complexContent>
- <xs:extension base="tns:AbstractPTODataType">
+ <xs:extension base="v2.0:AbstractPTODataType">
<xs:sequence>
<xs:element name="PTOShaftsGearWheels" type="v1.0:PTOShaftsGearWheelsType">
<xs:annotation>
@@ -640,7 +644,7 @@
<xs:complexType name="RetarderComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractRetarderDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RetarderDataDeclarationType">
@@ -683,7 +687,7 @@
<xs:element name="RetarderLossMap">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="tns:RetarderLossmapEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="v2.0:RetarderLossmapEntryType" minOccurs="2" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -731,7 +735,7 @@
<xs:complexType name="TorqueConverterComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractTorqueConverterDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TorqueConverterDataDeclarationType">
@@ -785,7 +789,7 @@
<xs:documentation>P196 - [-]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="maxTorque" type="v1.0:TorqueLimitEntryMaxTorqueType" use="required">
+ <xs:attribute name="maxTorque" type="v2.0:TorqueLimitEntryMaxTorqueType" use="required">
<xs:annotation>
<xs:documentation>P197 - [Nm]</xs:documentation>
</xs:annotation>
@@ -793,9 +797,9 @@
</xs:complexType>
<xs:complexType name="TorqueLimitsType">
<xs:complexContent>
- <xs:extension base="tns:AbstractTorqueLimitsType">
+ <xs:extension base="v2.0:AbstractTorqueLimitsType">
<xs:sequence maxOccurs="unbounded">
- <xs:element name="Entry" type="tns:TorqueLimitsEntryType"/>
+ <xs:element name="Entry" type="v2.0:TorqueLimitsEntryType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -821,7 +825,7 @@
<xs:complexType name="TyreComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="v1.0:AbstractTyreDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
+ <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TyreDataDeclarationType">
@@ -874,7 +878,7 @@
</xs:complexType>
<xs:complexType name="VectoDeclarationJobType">
<xs:sequence>
- <xs:element name="Vehicle" type="tns:AbstractVehicleDeclarationType"/>
+ <xs:element name="Vehicle" type="v2.0:AbstractVehicleDeclarationType"/>
</xs:sequence>
<xs:attribute name="schemaVersion" use="required">
<xs:simpleType>
@@ -894,110 +898,115 @@
</xs:simpleType>
</xs:attribute>
</xs:complexType>
- <xs:complexType name="VehicleComponentsType">
- <xs:complexContent>
- <xs:extension base="tns:AbstractVehicleComponentsDeclarationType">
- <xs:sequence>
- <xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
- <xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
- <xs:element name="TorqueConverter" type="tns:TorqueConverterComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
- <xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
- <xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="VehicleDeclarationType">
+ <xs:complexType name="VehicleBaseType" abstract="true">
<xs:complexContent>
- <xs:extension base="tns:VehicleBaseType">
+ <xs:extension base="v2.0:AbstractVehicleDeclarationType">
<xs:sequence>
- <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
+ <xs:documentation>P235</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="CurbMassChassis" type="v1.0:VehicleCurbMassChassisType">
+ <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
<xs:annotation>
- <xs:documentation>P038 - [kg]</xs:documentation>
+ <xs:documentation>P252</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="GrossVehicleMass" type="v1.0:VehicleGrossVehicleMassType">
+ <xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P041 - [kg]</xs:documentation>
+ <xs:documentation>P236</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+ <xs:element name="VIN" type="v1.0:VINType">
<xs:annotation>
- <xs:documentation>P198 - [1/min]</xs:documentation>
+ <xs:documentation>P238</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType">
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P052 - enum</xs:documentation>
+ <xs:documentation>P239</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
+ <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
<xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
+ <xs:documentation>P251 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType">
<xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
+ <xs:documentation>P036 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="PTO" type="tns:AbstractPTODataType"/>
- <xs:element name="TorqueLimits" type="tns:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="tns:AbstractVehicleComponentsDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="VehicleBaseType" abstract="true">
+ <xs:complexType name="VehicleComponentsType">
<xs:complexContent>
- <xs:extension base="tns:AbstractVehicleDeclarationType">
+ <xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType">
<xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
+ <xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
+ <xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
+ <xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
+ <xs:element name="Auxiliaries" type="v2.0:AuxiliariesComponentDeclarationType"/>
+ <xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="VehicleDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="v2.0:VehicleBaseType">
+ <xs:sequence>
+ <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
<xs:annotation>
- <xs:documentation>P235</xs:documentation>
+ <xs:documentation>P037 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
+ <xs:element name="CurbMassChassis" type="v1.0:VehicleCurbMassChassisType">
<xs:annotation>
- <xs:documentation>P252</xs:documentation>
+ <xs:documentation>P038 - [kg]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
+ <xs:element name="GrossVehicleMass" type="v1.0:VehicleGrossVehicleMassType">
<xs:annotation>
- <xs:documentation>P236</xs:documentation>
+ <xs:documentation>P041 - [kg]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="VIN" type="v1.0:VINType">
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
<xs:annotation>
- <xs:documentation>P238</xs:documentation>
+ <xs:documentation>P198 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:element name="RetarderType" type="v1.0:RetarderTypeType">
<xs:annotation>
- <xs:documentation>P239</xs:documentation>
+ <xs:documentation>P052 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
+ <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P251 - enum</xs:documentation>
+ <xs:documentation>P053 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType">
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
<xs:annotation>
- <xs:documentation>P036 - enum</xs:documentation>
+ <xs:documentation>P180 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="PTO" type="v2.0:AbstractPTODataType"/>
+ <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="Components" type="v2.0:AbstractVehicleComponentsDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:simpleType name="TorqueLimitEntryMaxTorqueType">
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
index 01368a86b82648ae253234863ecb631141b1beee..5c241fda115239997c5b9b7c7537a704fa07abef 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5_EcoRoll.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI: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:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
<Vehicle id="VEH-Class5_EcoRoll">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
index e987ce961c2eddba0cdf6b335675abbb04264ab0..74b202d848016262a2a2e765ec7249b47e5c9e0a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll.xml
@@ -251,7 +251,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>APT-S</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>3.490</Ratio>
<TorqueLossMap>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
index 22d1cada879e2d9bc47041d2649898597b5343a5..ae42232e921b144ad7a6c286303649295c08f033 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group9_AT_EcoRoll_missingParam.xml
@@ -1,5 +1,6 @@
<?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:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
<Vehicle id="VEH-class9_AT_EcoRoll">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
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 c335a20d1e3d37ad21d17548b62c90c532e12c14..235fd43a4cca382396e7b8ad66f457acff0da8b2 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
@@ -198,7 +198,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
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 3455a0a68867981b57ab26f330fef6757e4b190c..01edc68fb6ef1ef46f2c12efbd58f58a0c50db8c 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
@@ -210,7 +210,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
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 c1c534020fd51560965e57a436af78279efcab85..29450c8d32417f851810402cc8acea4136949321 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
@@ -200,7 +200,7 @@
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
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 0550cda00c07cf2b111ed18fdf117507c6dc743b..58b3c56db593b927b36be7676d004383fe24c26b 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
@@ -211,7 +211,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>