From f1736ac38f9b213121f9867d558c069b5715688e Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 1 Oct 2019 13:17:43 +0200
Subject: [PATCH] updating XML structure to most recent version
---
.../XSD/VectoDeclarationDefinitions.2.0.xsd | 104 ++++-----
.../VectoDeclarationDefinitions.2.3_DF.xsd | 40 ++--
.../VectoDeclarationDefinitions.2.4_Tyre.xsd | 201 ++++++++++++++++++
...ectoDeclarationDefinitions.2.5_Gearbox.xsd | 60 ++++++
.../XSD/VectoDeclarationDefinitions.xsd | 6 +-
.../XSD/VectoEngineeringDefinitions.1.0.xsd | 95 ++++++---
.../XSD/VectoEngineeringDefinitions.1.1.xsd | 64 ++++--
VectoCore/VectoXML.spp | 2 +
8 files changed, 460 insertions(+), 112 deletions(-)
create mode 100644 VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4_Tyre.xsd
create mode 100644 VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.5_Gearbox.xsd
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
index dfed1f3c8a..e8f2e7b3cf 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
@@ -9,6 +9,7 @@
<xs:complexType name="AbstractAxleWheelsComponentDeclarationType" abstract="true"/>
<xs:complexType name="AbstractAxleWheelsDataDeclarationType"/>
<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="AbstractVehicleComponentsDeclarationType" abstract="true"/>
@@ -579,13 +580,7 @@
<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="tns:AbstractGearsDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -619,6 +614,15 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="GearsDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="tns:AbstractGearsDeclarationType">
+ <xs:sequence>
+ <xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="PTOType">
<xs:complexContent>
<xs:extension base="tns:AbstractPTODataType">
@@ -894,6 +898,49 @@
</xs:simpleType>
</xs:attribute>
</xs:complexType>
+ <xs:complexType name="VehicleBaseType" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="tns:AbstractVehicleDeclarationType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P235</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
+ <xs:annotation>
+ <xs:documentation>P252</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P236</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VIN" type="v1.0:VINType">
+ <xs:annotation>
+ <xs:documentation>P238</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P239</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P251 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P036 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="VehicleComponentsType">
<xs:complexContent>
<xs:extension base="tns:AbstractVehicleComponentsDeclarationType">
@@ -957,47 +1004,4 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="VehicleBaseType" abstract="true">
- <xs:complexContent>
- <xs:extension base="tns:AbstractVehicleDeclarationType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P235</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
- <xs:annotation>
- <xs:documentation>P252</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P236</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VIN" type="v1.0:VINType">
- <xs:annotation>
- <xs:documentation>P238</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P239</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType">
- <xs:annotation>
- <xs:documentation>P251 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType">
- <xs:annotation>
- <xs:documentation>P036 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
index ddf0a16b6d..5e7000afa0 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.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:DeclarationDefinitions:v2.3_DF" 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" 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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" 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" 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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
@@ -55,16 +55,7 @@
<xs:documentation>P259 - [Nm]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WHRType">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="none"/>
- <xs:enumeration value="mechanical only"/>
- <xs:enumeration value="electrical only"/>
- <xs:enumeration value="mechanical and electrical"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
+ <xs:element name="WHRType" type="tns:WHRTypeType"/>
<xs:element name="Mode" type="tns:EngineFuelModeType" maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
@@ -86,7 +77,16 @@
<xs:documentation>P074 - [g/h]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="electricPower" type="v1.0:Double2"/>
+ <xs:attribute name="electricPower" type="v1.0:Double2">
+ <xs:annotation>
+ <xs:documentation>Pxxx - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="mechanicalPower" type="v1.0:Double2">
+ <xs:annotation>
+ <xs:documentation>Pxxx - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
<xs:complexType name="EngineFuelModeType">
<xs:sequence>
@@ -137,7 +137,14 @@
<xs:documentation>P260 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WHRCorrectionFactors" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+ <xs:element name="WHRCorrectionFactors" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Electrical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+ <xs:element name="Mechanical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="FuelConsumptionMap">
<xs:complexType>
<xs:sequence>
@@ -191,4 +198,11 @@
</xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="WHRTypeType">
+ <xs:sequence>
+ <xs:element name="MechanicalOutputICE" type="xs:boolean"/>
+ <xs:element name="MechanicalOutputDrivetrain" type="xs:boolean"/>
+ <xs:element name="ElectricalOutput" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4_Tyre.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4_Tyre.xsd
new file mode 100644
index 0000000000..3c99f9fb26
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4_Tyre.xsd
@@ -0,0 +1,201 @@
+<?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:DeclarationDefinitions:DEV:v2.4" 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" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
+ <xs:complexType name="TyreDataDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="v1.0:AbstractTyreDataDeclarationType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P230</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P231</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P267</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P233</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P234</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Dimension" type="tns:TyreDimensionType">
+ <xs:annotation>
+ <xs:documentation>P108 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TyreClass">
+ <xs:annotation>
+ <xs:documentation>Pxxx - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="C1"/>
+ <xs:enumeration value="C2"/>
+ <xs:enumeration value="C3"/>
+ <xs:enumeration value="N/A"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="FuelEfficiencyClass">
+ <xs:annotation>
+ <xs:documentation>Pxxx - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="A"/>
+ <xs:enumeration value="B"/>
+ <xs:enumeration value="C"/>
+ <xs:enumeration value="D"/>
+ <xs:enumeration value="E"/>
+ <xs:enumeration value="F"/>
+ <xs:enumeration value="G"/>
+ <xs:enumeration value="N/A"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RRCDeclared" type="v1.0:TyreRRCISOType">
+ <xs:annotation>
+ <xs:documentation>P046 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FzISO" type="v1.0:TyreFzISOType">
+ <xs:annotation>
+ <xs:documentation>P047 - [N]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:simpleType name="TyreDimensionType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Tyre">108</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P108 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="9 R22.5"/>
+ <xs:enumeration value="9.00 R20"/>
+ <xs:enumeration value="9.5 R17.5"/>
+ <xs:enumeration value="10 R17.5"/>
+ <xs:enumeration value="10 R22.5"/>
+ <xs:enumeration value="10.00 R20"/>
+ <xs:enumeration value="11 R22.5"/>
+ <xs:enumeration value="11.00 R20"/>
+ <xs:enumeration value="12 R22.5"/>
+ <xs:enumeration value="12.00 R20"/>
+ <xs:enumeration value="12.00 R24"/>
+ <xs:enumeration value="12.5 R20"/>
+ <xs:enumeration value="13 R22.5"/>
+ <xs:enumeration value="14.00 R20"/>
+ <xs:enumeration value="14.5 R20"/>
+ <xs:enumeration value="16.00 R20"/>
+ <xs:enumeration value="205/75 R17.5"/>
+ <xs:enumeration value="215/75 R17.5"/>
+ <xs:enumeration value="225/70 R17.5"/>
+ <xs:enumeration value="225/75 R17.5"/>
+ <xs:enumeration value="235/75 R17.5"/>
+ <xs:enumeration value="245/70 R17.5"/>
+ <xs:enumeration value="245/70 R19.5"/>
+ <xs:enumeration value="255/70 R22.5"/>
+ <xs:enumeration value="265/70 R17.5"/>
+ <xs:enumeration value="265/70 R19.5"/>
+ <xs:enumeration value="275/70 R22.5"/>
+ <xs:enumeration value="275/80 R22.5"/>
+ <xs:enumeration value="285/60 R22.5"/>
+ <xs:enumeration value="285/70 R19.5"/>
+ <xs:enumeration value="295/55 R22.5"/>
+ <xs:enumeration value="295/60 R22.5"/>
+ <xs:enumeration value="295/80 R22.5"/>
+ <xs:enumeration value="305/60 R22.5"/>
+ <xs:enumeration value="305/70 R19.5"/>
+ <xs:enumeration value="305/70 R22.5"/>
+ <xs:enumeration value="305/75 R24.5"/>
+ <xs:enumeration value="315/45 R22.5"/>
+ <xs:enumeration value="315/60 R22.5"/>
+ <xs:enumeration value="315/70 R22.5"/>
+ <xs:enumeration value="315/80 R22.5"/>
+ <xs:enumeration value="325/95 R24"/>
+ <xs:enumeration value="335/80 R20"/>
+ <xs:enumeration value="355/50 R22.5"/>
+ <xs:enumeration value="365/70 R22.5"/>
+ <xs:enumeration value="365/80 R20"/>
+ <xs:enumeration value="365/85 R20"/>
+ <xs:enumeration value="375/45 R22.5"/>
+ <xs:enumeration value="375/50 R22.5"/>
+ <xs:enumeration value="375/90 R22.5"/>
+ <xs:enumeration value="385/55 R22.5"/>
+ <xs:enumeration value="385/65 R22.5"/>
+ <xs:enumeration value="395/85 R20"/>
+ <xs:enumeration value="425/65 R22.5"/>
+ <xs:enumeration value="495/45 R22.5"/>
+ <xs:enumeration value="525/65 R20.5"/>
+ <xs:enumeration value="11.00 R16"/>
+ <xs:enumeration value="6.00 R9"/>
+ <xs:enumeration value="205/65 R17.5"/>
+ <xs:enumeration value="225/75 R16C"/>
+ <xs:enumeration value="255/100 R16"/>
+ <xs:enumeration value="255/60 R19.5"/>
+ <xs:enumeration value="265/55 R19.5"/>
+ <xs:enumeration value="275/60 R19.5"/>
+ <xs:enumeration value="275/80 R20"/>
+ <xs:enumeration value="285/65 R16C"/>
+ <xs:enumeration value="295/75 R22.5"/>
+ <xs:enumeration value="325/85 R16"/>
+ <xs:enumeration value="435/50 R19.5"/>
+ <xs:enumeration value="435/50 R22.5"/>
+ <xs:enumeration value="445/40 R22.5"/>
+ <xs:enumeration value="445/45 R19.5"/>
+ <xs:enumeration value="445/65 R22.5"/>
+ <xs:enumeration value="445/75 R22.5"/>
+ <xs:enumeration value="455/40 R22.5"/>
+ <xs:enumeration value="455/45 R22.5"/>
+ <xs:enumeration value="475/80 R20"/>
+ <xs:enumeration value="7.00 R16C"/>
+ <xs:enumeration value="7.50 R15"/>
+ <xs:enumeration value="7.50 R16"/>
+ <xs:enumeration value="7.50 R16C"/>
+ <xs:enumeration value="8.25 R15"/>
+ <xs:enumeration value="8.25 R16C"/>
+ <xs:enumeration value="8.5 R17.5"/>
+ <xs:enumeration value="8 R17.5"/>
+ <xs:enumeration value="LT265/75 R16"/>
+ <xs:enumeration value="385/55 R19.5"/>
+ <xs:enumeration value="24 R21"/>
+ <xs:enumeration value="205/70 R15C"/>
+ <xs:enumeration value="215/70 R15C"/>
+ <xs:enumeration value="225/70 R15C"/>
+ <xs:enumeration value="185/75 R16C"/>
+ <xs:enumeration value="195/65 R16C"/>
+ <xs:enumeration value="195/75 R16C"/>
+ <xs:enumeration value="205/65 R16C"/>
+ <xs:enumeration value="205/75 R16C"/>
+ <xs:enumeration value="215/65 R16C"/>
+ <xs:enumeration value="215/75 R16C"/>
+ <xs:enumeration value="225/65 R16C"/>
+ <xs:enumeration value="235/65 R16C"/>
+ <xs:enumeration value="215/60 R17C"/>
+ <xs:enumeration value="235/60 R17C"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.5_Gearbox.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.5_Gearbox.xsd
new file mode 100644
index 0000000000..31ca4b5567
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.5_Gearbox.xsd
@@ -0,0 +1,60 @@
+<?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:DeclarationDefinitions:DEV:v2.5" 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" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.5" elementFormDefault="qualified" attributeFormDefault="unqualified" 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:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
+ <xs:complexType name="GearboxDataDeclarationType">
+ <xs:annotation>
+ <xs:documentation>Gearbox Component</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="v1.0:AbstractTransmissionDataDeclarationType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P205</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P206</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P262</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P208</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P209</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType">
+ <xs:annotation>
+ <xs:documentation>P076 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P254 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DifferentialIncluded" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Pxxx - [bool[</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index 4f6104f07a..025dce88ab 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.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:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.5="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.5" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports all supported declaration definitions
@@ -10,6 +10,8 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" schemaLocation="VectoDeclarationDefinitions.2.3_DF.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF" schemaLocation="VectoDeclarationDefinitions.2.3_DF.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4_Tyre.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.5" schemaLocation="VectoDeclarationDefinitions.2.5_Gearbox.xsd"/>
<xs:complexType name="AbstractVectoOutputManufacturerType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd
index a18473344b..f2278cb22c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd
@@ -73,6 +73,7 @@
</xs:complexType>
<xs:complexType name="AbstractLookAheadCoastingEngineeringType" abstract="true"/>
<xs:complexType name="AbstractOverspeedEngineeringType" abstract="true"/>
+ <xs:complexType name="AbstractPCCParametersType" abstract="true"/>
<xs:complexType name="AbstractRetarderDataEngineeringType" abstract="true">
<xs:complexContent>
<xs:extension base="tns:EngineeringPowertrainComponentType"/>
@@ -408,16 +409,21 @@
<xs:element name="ShiftStrategyParameters" type="tns:AbstractShiftStrategyParametersEngineeringType" minOccurs="0"/>
<xs:element name="EngineStopStartParameters" type="tns:AbstractEngineStartStopParametersEngineeringType" minOccurs="0"/>
<xs:element name="EcoRoll" type="tns:AbstractEcoRollEngineeringType" minOccurs="0"/>
+ <xs:element name="PCCParameters" type="tns:AbstractPCCParametersType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="EcoRollEngineeringType">
- <xs:sequence>
- <xs:element name="ActivationDelay" type="tns:EcoRollActivationDelayType"/>
- <xs:element name="MinSpeed" type="tns:EcoRollMinSpeedType"/>
- <xs:element name="Underspeed" type="tns:EcoRollUnderSpeedType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="tns:AbstractEcoRollEngineeringType">
+ <xs:sequence>
+ <xs:element name="ActivationDelay" type="tns:EcoRollActivationDelayType" minOccurs="0"/>
+ <xs:element name="MinSpeed" type="tns:EcoRollMinSpeedType" minOccurs="0"/>
+ <xs:element name="Underspeed" type="tns:EcoRollUnderSpeedType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="EngineComponentEngineeringType">
<xs:choice>
@@ -686,6 +692,38 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="PCCParametersType">
+ <xs:complexContent>
+ <xs:extension base="tns:AbstractPCCParametersType">
+ <xs:sequence>
+ <xs:element name="EnablingSpeed" type="xs:double" minOccurs="0"/>
+ <xs:element name="MinSpeed" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction base="xs:double">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="AllowedUnderspeed" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction base="xs:double">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="AllowedOverspeed" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction base="xs:double">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="PreviewDistanceUseCase1" type="xs:double" minOccurs="0"/>
+ <xs:element name="PreviewDistanceUseCase2" type="xs:double" minOccurs="0"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="PTOCycleEngineeringType">
<xs:choice>
<xs:element name="Entry" type="tns:PTOCycleEntryType" maxOccurs="unbounded"/>
@@ -1444,6 +1482,13 @@
<xs:maxInclusive value="120"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="EcoRollType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="none"/>
+ <xs:enumeration value="without engine stop"/>
+ <xs:enumeration value="with engine stop"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="EcoRollUnderSpeedType">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
@@ -1514,37 +1559,37 @@
<xs:maxInclusive value="100"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="EngineStartStopMaxSpeedType">
+ <xs:simpleType name="EngineStartStopMaxOffTimeType">
<xs:annotation>
<xs:appinfo>
<vectoParam:description>
- <vectoParam:parameterId component="ADAS">011</vectoParam:parameterId>
- <vectoParam:unit>km/h</vectoParam:unit>
+ <vectoParam:parameterId component="ADAS">012</vectoParam:parameterId>
+ <vectoParam:unit>s</vectoParam:unit>
<vectoParam:genericValueType>constant value</vectoParam:genericValueType>
<vectoParam:genericValue>5</vectoParam:genericValue>
</vectoParam:description>
</xs:appinfo>
- <xs:documentation>P011</xs:documentation>
+ <xs:documentation>P012</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
- <xs:maxInclusive value="120"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="EngineStartStopMaxOffTimeType">
+ <xs:simpleType name="EngineStartStopMaxSpeedType">
<xs:annotation>
<xs:appinfo>
<vectoParam:description>
- <vectoParam:parameterId component="ADAS">012</vectoParam:parameterId>
- <vectoParam:unit>s</vectoParam:unit>
+ <vectoParam:parameterId component="ADAS">011</vectoParam:parameterId>
+ <vectoParam:unit>km/h</vectoParam:unit>
<vectoParam:genericValueType>constant value</vectoParam:genericValueType>
<vectoParam:genericValue>5</vectoParam:genericValue>
</vectoParam:description>
</xs:appinfo>
- <xs:documentation>P012</xs:documentation>
+ <xs:documentation>P011</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
+ <xs:maxInclusive value="120"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="GearboxEarlyShiftUpType">
@@ -1885,6 +1930,13 @@
<xs:maxInclusive value="1"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="PredictiveCruiseControlType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="none"/>
+ <xs:enumeration value="1,2"/>
+ <xs:enumeration value="1,2,3"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="ShiftDelayType">
<xs:annotation>
<xs:appinfo>
@@ -2049,18 +2101,5 @@
</xs:element>
</xs:sequence>
</xs:group>
- <xs:simpleType name="EcoRollType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="none"/>
- <xs:enumeration value="without engine stop"/>
- <xs:enumeration value="with engine stop"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="PredictiveCruiseControlType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="none"/>
- <xs:enumeration value="1,2"/>
- <xs:enumeration value="1,2,3"/>
- </xs:restriction>
- </xs:simpleType>
+ <xs:complexType name="PCCEngineeringT"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
index 1478405bf5..fae420a272 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
@@ -49,19 +49,46 @@
<xs:element name="WasteHeatRecovery" minOccurs="0">
<xs:complexType>
<xs:sequence>
- <xs:element name="WHRCorrection">
- <xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
+ <xs:element name="Electrical" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="WHRCorrection">
+ <xs:simpleType>
+ <xs:restriction base="xs:double">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="WHRMap">
+ <xs:complexType>
+ <xs:choice>
+ <xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
+ <xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="WHRMap">
+ <xs:element name="Mechanical" minOccurs="0">
<xs:complexType>
- <xs:choice>
- <xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
- <xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
- </xs:choice>
+ <xs:sequence>
+ <xs:element name="WHRCorrection">
+ <xs:simpleType>
+ <xs:restriction base="xs:double">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="WHRMap">
+ <xs:complexType>
+ <xs:choice>
+ <xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
+ <xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
@@ -109,12 +136,11 @@
</xs:annotation>
</xs:attribute>
</xs:complexType>
- <xs:simpleType name="WHRTypeType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="none"/>
- <xs:enumeration value="mechanical only"/>
- <xs:enumeration value="electrical only"/>
- <xs:enumeration value="mechanical and electrical"/>
- </xs:restriction>
- </xs:simpleType>
+ <xs:complexType name="WHRTypeType">
+ <xs:sequence>
+ <xs:element name="MechanicalOutputICE" type="xs:boolean"/>
+ <xs:element name="MechanicalOutputDrivetrain" type="xs:boolean"/>
+ <xs:element name="ElectricalOutput" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 75806f48e4..0203e1840a 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -69,6 +69,8 @@
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.1.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.2.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.3_DF.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.4_Tyre.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.5_Gearbox.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationJob.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/>
--
GitLab