From ef8581bfc78b4413a4cf35afee8f03aebeae0a55 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 8 Jan 2020 15:00:55 +0100
Subject: [PATCH] updating xml schema PIF heav bus, sample PIF XML
---
.../XSD/VectoDeclarationDefinitions.2.0.xsd | 2 +-
.../VectoDeclarationDefinitions.2.6_Buses.xsd | 5 -
.../XSD/VectoDeclarationDefinitions.xsd | 3 +-
.../Resources/XSD/VectoOutputPrimaryBus.xsd | 721 +++++++++---------
.../VectoOutputPrimaryVehicleInformation.xsd | 13 +-
.../example_heavyBus_PIF.xml | 367 +++++++++
.../vecto_vehicle-primary_heavyBus.xml | 4 +-
VectoCore/VectoXML.spp | 7 +-
8 files changed, 759 insertions(+), 363 deletions(-)
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
index e8f2e7b3cf..88c5c9b415 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
@@ -7,7 +7,7 @@
<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"/>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index ea8d69ab7e..dc23539768 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -26,11 +26,6 @@
<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="tns:VehicleCategoryDeclarationType">
<xs:annotation>
<xs:documentation>P036 - enum</xs:documentation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index 110173ba69..c79f5e2759 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 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
@@ -11,5 +11,6 @@
<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:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/>
<xs:complexType name="AbstractVectoOutputManufacturerType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
index c9dd7819cb..3f2d0289f2 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.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="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformationFile:v0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:pif="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformationFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformation:HeavyBus:v0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:pif="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformation:HeavyBus:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" schemaLocation="VectoOutputPrimaryVehicleInformation.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -8,6 +8,102 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/>
+ <xs:complexType name="AbstractAngledriveDataPIFType" abstract="true"/>
+ <xs:complexType name="AbstractAxlegearDataPIFType" abstract="true"/>
+ <xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
+ <xs:complexType name="AbstractTransmissionDataPIFType" abstract="true"/>
+ <xs:complexType name="AbstractTransmissionGearsPIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsPIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehiclePIFType" abstract="true"/>
+ <xs:complexType name="AngledriveDataPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractAngledriveDataPIFType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P220</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P221</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P265</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P223</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P224</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Ratio"/>
+ <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P258 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="AngledrivePIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="AbstractAngledriveDataPIFType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AxlegearDataPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractAxlegearDataPIFType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P215</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P216</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P264</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P218</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P219</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LineType"/>
+ <xs:element name="Ratio"/>
+ <xs:element name="CertificationMethod" type="v1.0:AxlegearCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P256 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="AxlegearPIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="AbstractAxlegearDataPIFType"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="CO2Type">
<xs:simpleContent>
<xs:extension base="xs:double">
@@ -15,6 +111,86 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
+ <xs:complexType name="EngineComponentPIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="AbstractEngineDataPIFType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="EngineDataPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractEngineDataPIFType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P200</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P201</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P261</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P203</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P204</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
+ <xs:annotation>
+ <xs:documentation>P061 - [cm³]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
+ <xs:annotation>
+ <xs:documentation>P249 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
+ <xs:annotation>
+ <xs:documentation>P250 - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
+ <xs:annotation>
+ <xs:documentation>P259 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="WHRType" type="v2.3:WHRTypeType"/>
+ <xs:element name="Mode" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
+ <xs:element name="FullLoadAndDragCurve">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Fuels">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="FuelType" type="v1.0:FuelTypeType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="EngineSpeedDrivingType">
<xs:sequence>
<xs:element name="Min">
@@ -53,6 +229,83 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
+ <xs:complexType name="PrimaryVehicleHeavyBusDataType">
+ <xs:complexContent>
+ <xs:extension base="pif:AbstractPrimaryVehicleDataPIFType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="AbstractVehiclePIFType"/>
+ <xs:element name="ResultDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="Results" type="ResultsPIFType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>II.2.5</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>II.2.5</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="ResultPIFType">
+ <xs:sequence>
+ <xs:element name="VehicleGroup">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Mission" type="MissionTypeType">
+ <xs:annotation>
+ <xs:documentation>I.2.1.1 / #56</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SimulationParameters" type="SimulationParametersType"/>
+ <xs:choice>
+ <xs:sequence>
+ <xs:element name="Fuel" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:sequence>
+ <xs:element name="Error" type="xs:string"/>
+ <xs:element name="ErrorDetails" type="xs:string"/>
+ </xs:sequence>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="status" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="ResultsPIFType">
+ <xs:sequence>
+ <xs:element name="Status"/>
+ <xs:element name="Result" type="ResultPIFType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="SimulationParametersType">
<xs:sequence>
<xs:element name="TotalVehicleMass">
@@ -79,7 +332,7 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
- <xs:element name="PassengerCont">
+ <xs:element name="PassengerCount">
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minExclusive value="0"/>
@@ -96,6 +349,91 @@
</xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="TransmissionComponentPIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="AbstractTransmissionDataPIFType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="TransmissionDataPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractTransmissionDataPIFType">
+ <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"/>
+ <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P254 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Gears" type="AbstractTransmissionGearsPIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="TransmissionGearsPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractTransmissionGearsPIFType">
+ <xs:sequence>
+ <xs:element name="Gear" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Ratio"/>
+ <xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P157 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxSpeed" type="v1.0:GearboxGearMaxSpeedType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P194 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="number" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="VehicleComponentsPIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractVehicleComponentsPIFType">
+ <xs:sequence>
+ <xs:element name="Engine" type="EngineComponentPIFType"/>
+ <xs:element name="Transmission" type="TransmissionComponentPIFType"/>
+ <xs:element name="Angledrive" type="AngledrivePIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="AxlegearPIFType"/>
+ <xs:element name="AxleWheels" type="v2.0:AbstractAxleWheelsComponentDeclarationType"/>
+ <xs:element name="Auxiliaries" type="AuxiliariesPIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="VehiclePerformanceType">
<xs:sequence>
<xs:element name="AverageSpeed">
@@ -204,6 +542,38 @@
</xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="VehiclePIFType">
+ <xs:complexContent>
+ <xs:extension base="AbstractVehiclePIFType">
+ <xs:sequence>
+ <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/>
+ <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/>
+ <xs:element name="Model" type="v1.0:ModelType"/>
+ <xs:element name="VIN" type="v1.0:VINType"/>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
+ <xs:element name="VehicleCategory" type="v2.6:VehicleCategoryDeclarationType"/>
+ <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/>
+ <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
+ <xs:element name="RetarderType" type="v1.0:RetarderTypeType"/>
+ <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P053 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:annotation>
+ <xs:documentation>P180 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
+ <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="Components" type="AbstractVehicleComponentsPIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:simpleType name="AccelerationUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="m/s²"/>
@@ -269,352 +639,9 @@
<xs:enumeration value="km/h"/>
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="PrimaryVehicleHeavyBusType">
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Vehicle">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/>
- <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/>
- <xs:element name="Model" type="v1.0:ModelType"/>
- <xs:element name="VIN" type="v1.0:VINType"/>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
- <xs:element name="VehicleCategory" type="v2.6:VehicleCategoryDeclarationType"/>
- <xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/>
- <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType"/>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
- <xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
- <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
- <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Engine" type="EngineComponentPIFType"/>
- <xs:element name="Transmission" type="TransmissionComponentPIFType"/>
- <xs:element name="Axlegear" type="AxlegearType"/>
- <xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="v2.0:AbstractAxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries" type="v2.6:AbstractAuxiliaryDataHeavyBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ResultDataSignature" type="v1.0:SignatureType"/>
- <xs:element name="Results">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Status"/>
- <xs:element name="Result" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Mission" type="MissionTypeType">
- <xs:annotation>
- <xs:documentation>I.2.1.1 / #56</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SimulationParameters" type="SimulationParametersType"/>
- <xs:choice>
- <xs:sequence>
- <xs:element name="Fuel" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:sequence>
- <xs:element name="Error" type="xs:string"/>
- <xs:element name="ErrorDetails" type="xs:string"/>
- </xs:sequence>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="status" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ApplicationInformation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SimulationToolVersion" type="xs:string">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="id" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Signature" type="v1.0:SignatureType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="EngineComponentPIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractEngineDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
- <xs:complexType name="EngineDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractEngineDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P200</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P201</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P261</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P203</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P204</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
- <xs:annotation>
- <xs:documentation>P061 - [cm³]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P249 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
- <xs:annotation>
- <xs:documentation>P250 - [W]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
- <xs:annotation>
- <xs:documentation>P259 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHRType" type="v2.3:WHRTypeType"/>
- <xs:element name="Mode" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="FullLoadAndDragCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Fuels">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FuelType" type="v1.0:FuelTypeType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TransmissionComponentPIFType">
+ <xs:complexType name="AuxiliariesPIFType">
<xs:sequence>
- <xs:element name="Data" type="AbstractTransmissionDataPIFType"/>
+ <xs:element name="Data" type="v2.6:AbstractAuxiliaryDataHeavyBusDeclarationType"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AxlegearType">
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P215</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P216</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P264</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P218</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P219</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LineType"/>
- <xs:element name="Ratio"/>
- <xs:element name="CertificationMethod" type="v1.0:AxlegearCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P256 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AngledriveType">
- <xs:sequence>
- <xs:element name="Data">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P220</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P221</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P265</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P223</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P224</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Ratio"/>
- <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P258 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransmissionDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractTransmissionDataPIFType">
- <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"/>
- <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Gears">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Gear">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Ratio"/>
- <xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P157 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxSpeed" type="v1.0:GearboxGearMaxSpeedType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P194 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="number" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AbstractTransmissionDataPIFType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd
index cfcc9ce699..4f8d03f692 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd
@@ -1,10 +1,17 @@
<?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:tns="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" targetNamespace="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="VectoOutputPrimaryVehicle" type="tns:AbstractPrimaryVehicleInformationType">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+ <xs:element name="VectoOutputPrimaryVehicle" type="tns:PrimaryVehicleHeavyBusType">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:complexType name="AbstractPrimaryVehicleInformationType" abstract="true"/>
+ <xs:complexType name="AbstractPrimaryVehicleDataPIFType" abstract="true"/>
+ <xs:complexType name="PrimaryVehicleHeavyBusType">
+ <xs:sequence>
+ <xs:element name="Data" type="tns:AbstractPrimaryVehicleDataPIFType"/>
+ <xs:element name="Signature" type="v1.0:SignatureType"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
new file mode 100644
index 0000000000..7aff8d16b3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" xmlns:tns="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:pif="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation" xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformation:HeavyBus:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformation:HeavyBus:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryBus.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationDefinitions E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.xsd
+urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd">
+ <tns:Data id="PIFHB-VEH-1234567890" xsi:type="pbus:PrimaryVehicleHeavyBusDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryBusInformation:HeavyBus:v0.1">
+
+ <Vehicle xsi:type="VehiclePIFType">
+ <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <VehicleCategory>Bus</VehicleCategory>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <pbus:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </pbus:ADAS>
+ <pbus: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"/>
+ </pbus:TorqueLimits>
+ <Components xsi:type="pbus:VehicleComponentsPIFType">
+ <Engine>
+ <Data xsi:type="pbus:EngineDataPIFType">
+ <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>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2400</MaxEngineTorque>
+ <WHRType>
+ <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
+ <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
+ <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>560</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="600.00" maxTorque="1282.00" dragTorque="-148.00"/>
+ <Entry engineSpeed="800.00" maxTorque="1791.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1000.00" maxTorque="2300.00" dragTorque="-160.00"/>
+ <Entry engineSpeed="1200.00" maxTorque="2300.00" dragTorque="-179.00"/>
+ <Entry engineSpeed="1400.00" maxTorque="2300.00" dragTorque="-203.00"/>
+ <Entry engineSpeed="1600.00" maxTorque="2079.00" dragTorque="-235.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1857.00" dragTorque="-264.00"/>
+ <Entry engineSpeed="2000.00" maxTorque="1352.00" dragTorque="-301.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ <Fuels>
+ <FuelType>Diesel CI</FuelType>
+ </Fuels>
+ </Mode>
+ </Data>
+ </Engine>
+ <Transmission>
+ <Data xsi:type="pbus:TransmissionDataPIFType">
+ <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="TransmissionGearsPIFType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.020</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="4">
+ <Ratio>7.040</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="5">
+ <Ratio>5.640</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="6">
+ <Ratio>4.400</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="7">
+ <Ratio>3.390</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="8">
+ <Ratio>2.650</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="9">
+ <Ratio>2.050</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="10">
+ <Ratio>1.600</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="11">
+ <Ratio>1.280</Ratio>
+ <MaxSpeed>2000</MaxSpeed>
+ </Gear>
+ <Gear number="12">
+ <Ratio>1.000</Ratio>
+ </Gear>
+ </Gears>
+ </Data>
+ </Transmission>
+ <!-- Torque Converter -->
+ <Angledrive>
+ <Data xsi:type="pbus:AngledriveDataPIFType">
+ <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>
+ </Data>
+ </Angledrive>
+ <!-- Retarder -->
+ <Axlegear>
+ <Data xsi:type="pbus:AxlegearDataPIFType">
+ <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>
+ </Data>
+ </Axlegear>
+ <AxleWheels xsi:type="v2.0:AxleWheelsComponentDeclarationType">
+ <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>
+ <pbus:Data xsi:type="v2.6:AuxiliaryDataHeavyBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology ratio="1.000">Standard technology - LED headlights, all</AlternatorTechnology>
+ <SmartElectrics>false</SmartElectrics>
+ <ResultCards/>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <AirsuspensionControl>mechanically</AirsuspensionControl>
+ <AdBlueDosing>true</AdBlueDosing>
+ <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </pbus:Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <ResultDataSignature>
+ <di:Reference URI="#MRF-VEH-1234567890">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="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>
+ </ResultDataSignature>
+ <Results>
+ <Status>success</Status>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Regional Delivery</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">8810</TotalVehicleMass>
+ <Payload unit="kg">920</Payload>
+ <PassengerCount>20</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <FuelConsumption unit="g/km">210.5</FuelConsumption>
+ <FuelConsumption unit="g/t-km">228.8</FuelConsumption>
+ <FuelConsumption unit="g/m³-km">4.41</FuelConsumption>
+ <FuelConsumption unit="MJ/km">8.99</FuelConsumption>
+ <FuelConsumption unit="MJ/t-km">9.77</FuelConsumption>
+ <FuelConsumption unit="MJ/m³-km">0.188</FuelConsumption>
+ <FuelConsumption unit="l/100km">25.2</FuelConsumption>
+ <FuelConsumption unit="l/t-km">0.274</FuelConsumption>
+ <FuelConsumption unit="l/m³-km">0.00528</FuelConsumption>
+ </Fuel>
+ <CO2 unit="g/km">658.9</CO2>
+ <CO2 unit="g/t-km">716.2</CO2>
+ <CO2 unit="g/m³-km">13.8</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Regional Delivery</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">12490</TotalVehicleMass>
+ <Payload unit="kg">4600</Payload>
+ <PassengerCount>80</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <FuelConsumption unit="g/km">231.4</FuelConsumption>
+ <FuelConsumption unit="g/t-km">50.3</FuelConsumption>
+ <FuelConsumption unit="g/m³-km">4.85</FuelConsumption>
+ <FuelConsumption unit="MJ/km">9.88</FuelConsumption>
+ <FuelConsumption unit="MJ/t-km">2.15</FuelConsumption>
+ <FuelConsumption unit="MJ/m³-km">0.207</FuelConsumption>
+ <FuelConsumption unit="l/100km">27.7</FuelConsumption>
+ <FuelConsumption unit="l/t-km">0.0602</FuelConsumption>
+ <FuelConsumption unit="l/m³-km">0.00580</FuelConsumption>
+ </Fuel>
+ <CO2 unit="g/km">724.4</CO2>
+ <CO2 unit="g/t-km">157.5</CO2>
+ <CO2 unit="g/m³-km">15.2</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban Delivery</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">8810</TotalVehicleMass>
+ <Payload unit="kg">920</Payload>
+ <PassengerCount>20</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <FuelConsumption unit="g/km">244.1</FuelConsumption>
+ <FuelConsumption unit="g/t-km">265.3</FuelConsumption>
+ <FuelConsumption unit="g/m³-km">5.12</FuelConsumption>
+ <FuelConsumption unit="MJ/km">10.4</FuelConsumption>
+ <FuelConsumption unit="MJ/t-km">11.3</FuelConsumption>
+ <FuelConsumption unit="MJ/m³-km">0.218</FuelConsumption>
+ <FuelConsumption unit="l/100km">29.2</FuelConsumption>
+ <FuelConsumption unit="l/t-km">0.317</FuelConsumption>
+ <FuelConsumption unit="l/m³-km">0.00612</FuelConsumption>
+ </Fuel>
+ <CO2 unit="g/km">763.9</CO2>
+ <CO2 unit="g/t-km">830.3</CO2>
+ <CO2 unit="g/m³-km">16.0</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban Delivery</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">12490</TotalVehicleMass>
+ <Payload unit="kg">4600</Payload>
+ <PassengerCount>80</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <FuelConsumption unit="g/km">296.4</FuelConsumption>
+ <FuelConsumption unit="g/t-km">64.4</FuelConsumption>
+ <FuelConsumption unit="g/m³-km">6.21</FuelConsumption>
+ <FuelConsumption unit="MJ/km">12.7</FuelConsumption>
+ <FuelConsumption unit="MJ/t-km">2.75</FuelConsumption>
+ <FuelConsumption unit="MJ/m³-km">0.265</FuelConsumption>
+ <FuelConsumption unit="l/100km">35.5</FuelConsumption>
+ <FuelConsumption unit="l/t-km">0.0771</FuelConsumption>
+ <FuelConsumption unit="l/m³-km">0.00743</FuelConsumption>
+ </Fuel>
+ <CO2 unit="g/km">927.7</CO2>
+ <CO2 unit="g/t-km">201.7</CO2>
+ <CO2 unit="g/m³-km">19.4</CO2>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>Sample File Generator</SimulationToolVersion>
+ <Date>2017-01-01T00:00:00Z</Date>
+ </ApplicationInformation>
+ </tns:Data>
+ <Signature>
+ <di:Reference URI="#PIFHB-VEH-1234567890">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="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>
+</tns:VectoOutputPrimaryVehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
index 5242cd7fac..7e51f92aa3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
@@ -8,8 +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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd
-urn:tugraz:ivt:VectoAPI:DeclarationDefinitions E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="v2.6:HeavyBusPrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
@@ -17,7 +16,6 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions E:\QUAM\Workspace\VECTO_DEV_Buses
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
- <LegislativeClass>N3</LegislativeClass>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 670232c6c4..9e9a2a1c63 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -51,6 +51,7 @@
<File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.0.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.1.xml" HomeFolder="Yes"/>
</Folder>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\example_heavyBus_PIF.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
<File FilePath="E:\QUAM\Workspace\VECTO_quam\Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/>
@@ -69,9 +70,7 @@
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.0.xsd" HomeFolder="Yes"/>
<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.2.3_DEV.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.6_Buses.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoDeclarationJob.xsd" HomeFolder="Yes"/>
@@ -109,6 +108,8 @@
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.8.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryBus.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryVehicleInformation.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
--
GitLab