diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd index dcab80c7a92aed5f62f03acf266e7f42be7f356e..cd1b99f2fb584c3cff67ce7f978a59101e467f45 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd @@ -1,7 +1,7 @@ <?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) --> <!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)--> -<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.5"> +<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7"> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> <xs:element name="VectoCustomerInformation"> <xs:annotation> @@ -89,7 +89,12 @@ </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="Result" type="ResultType" maxOccurs="unbounded"/> + <xs:choice> + <xs:element name="Result" type="ResultType" maxOccurs="unbounded"/> + <xs:element name="ExemptedVehicle"> + <xs:complexType/> + </xs:element> + </xs:choice> </xs:sequence> </xs:complexType> </xs:element> @@ -122,16 +127,6 @@ <xs:documentation>P251</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="VehicleGroup" type="VehicleGroupType"> - <xs:annotation> - <xs:documentation>VECTO</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType"> - <xs:annotation> - <xs:documentation>P037</xs:documentation> - </xs:annotation> - </xs:element> <xs:element name="GrossVehicleMass"> <xs:annotation> <xs:documentation>P041</xs:documentation> @@ -156,66 +151,121 @@ </xs:simpleContent> </xs:complexType> </xs:element> - <xs:element name="EngineRatedPower"> + <xs:element name="ZeroEmissionVehicle" type="xs:boolean"> <xs:annotation> - <xs:documentation>P250</xs:documentation> + <xs:documentation>P269</xs:documentation> </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="vdecdef:EngineRatedPower"> - <xs:attribute name="unit" type="PowerUnitType" use="required"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> </xs:element> - <xs:element name="EngineDisplacement"> - <xs:annotation> - <xs:documentation>P061</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:double"> - <xs:attribute name="unit" type="DisplacementType" use="required"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:element name="FuelType" type="vdecdef:FuelTypeType"> - <xs:annotation> - <xs:documentation>P193</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="TransmissionMainCertificationMethod" type="vdecdef:GearboxCertificationOptionType"> - <xs:annotation> - <xs:documentation>P154</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType"> - <xs:annotation> - <xs:documentation>P076</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="GearsCount"> - <xs:annotation> - <xs:documentation>P199</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:int"> - <xs:minInclusive value="1"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="Retarder" type="xs:boolean"> - <xs:annotation> - <xs:documentation>P052</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AxleRatio" type="vdecdef:AxlegearRatioType"> - <xs:annotation> - <xs:documentation>P150</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AverageRRC" type="vdecdef:TyreRRCISOType"/> + <xs:choice> + <xs:sequence> + <xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType"> + <xs:annotation> + <xs:documentation>P037</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="VehicleGroup" type="VehicleGroupType"> + <xs:annotation> + <xs:documentation>VECTO</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="EngineRatedPower"> + <xs:annotation> + <xs:documentation>P250</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="vdecdef:EngineRatedPower"> + <xs:attribute name="unit" type="PowerUnitType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="EngineDisplacement"> + <xs:annotation> + <xs:documentation>P061</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:double"> + <xs:attribute name="unit" type="DisplacementType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="FuelType" type="vdecdef:FuelTypeType"> + <xs:annotation> + <xs:documentation>P193</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TransmissionMainCertificationMethod" type="vdecdef:GearboxCertificationOptionType"> + <xs:annotation> + <xs:documentation>P154</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType"> + <xs:annotation> + <xs:documentation>P076</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="GearsCount"> + <xs:annotation> + <xs:documentation>P199</xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:int"> + <xs:minInclusive value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="Retarder" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P052</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AxleRatio" type="vdecdef:AxlegearRatioType"> + <xs:annotation> + <xs:documentation>P150</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AverageRRC" type="vdecdef:TyreRRCISOType"/> + </xs:sequence> + <xs:sequence> + <xs:element name="HybridElectricHDV" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P279</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="DualFuelVehicle" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P280</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="MaxNetPower1" minOccurs="0"> + <xs:annotation> + <xs:documentation>P277</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:double"> + <xs:attribute name="unit" type="PowerUnitType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="MaxNetPower2" minOccurs="0"> + <xs:annotation> + <xs:documentation>P278</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:double"> + <xs:attribute name="unit" type="PowerUnitType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:choice> <xs:element name="InputDataSignature" type="vdecdef:SignatureType"/> </xs:sequence> </xs:complexType> @@ -287,6 +337,7 @@ <xs:simpleType name="PowerUnitType"> <xs:restriction base="xs:string"> <xs:enumeration value="kW"/> + <xs:enumeration value="W"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="DisplacementType"> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd index d336b6f6fdd080c1e5ee3378d904f646effa4a7c..d30e741431b970d7bf77e684f70a22c63a00ab81 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd @@ -1,7 +1,7 @@ <?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) --> <!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)--> -<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.6"> +<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7"> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> <xs:element name="VectoOutput"> <xs:annotation> @@ -399,7 +399,12 @@ </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="Result" type="ResultType" maxOccurs="unbounded"/> + <xs:choice> + <xs:element name="Result" type="ResultType" maxOccurs="unbounded"/> + <xs:element name="ExemptedVehicle"> + <xs:complexType/> + </xs:element> + </xs:choice> </xs:sequence> </xs:complexType> </xs:element> @@ -529,16 +534,6 @@ <xs:documentation>P251</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="VehicleGroup" type="VehicleGroupType"> - <xs:annotation> - <xs:documentation>VECTO</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType"> - <xs:annotation> - <xs:documentation>P037</xs:documentation> - </xs:annotation> - </xs:element> <xs:element name="GrossVehicleMass"> <xs:annotation> <xs:documentation>P041</xs:documentation> @@ -563,27 +558,82 @@ </xs:simpleContent> </xs:complexType> </xs:element> - <xs:element name="PTO" type="xs:boolean"> + <xs:element name="ZeroEmissionVehicle" type="xs:boolean"> <xs:annotation> - <xs:documentation>P247</xs:documentation> + <xs:documentation>P269</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="TorqueLimits" type="TorqueLimitsType" minOccurs="0"/> - <xs:element name="Components"> - <xs:complexType> - <xs:sequence> - <xs:element name="Engine" type="EngineType"/> - <xs:element name="Gearbox" type="GearboxType"/> - <xs:element name="TorqueConverter" type="TorqueconverterType" minOccurs="0"/> - <xs:element name="Retarder" type="RetarderType"/> - <xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/> - <xs:element name="Axlegear" type="AxlegearType"/> - <xs:element name="AirDrag" type="AirdragType"/> - <xs:element name="AxleWheels" type="AxleWheelsType"/> - <xs:element name="Auxiliaries" type="AuxiliariesType"/> - </xs:sequence> - </xs:complexType> - </xs:element> + <xs:choice> + <xs:sequence> + <xs:element name="VehicleGroup" type="VehicleGroupType"> + <xs:annotation> + <xs:documentation>VECTO</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType"> + <xs:annotation> + <xs:documentation>P037</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="PTO" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P247</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TorqueLimits" type="TorqueLimitsType" minOccurs="0"/> + <xs:element name="Components"> + <xs:complexType> + <xs:sequence> + <xs:element name="Engine" type="EngineType"/> + <xs:element name="Gearbox" type="GearboxType"/> + <xs:element name="TorqueConverter" type="TorqueconverterType" minOccurs="0"/> + <xs:element name="Retarder" type="RetarderType"/> + <xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/> + <xs:element name="Axlegear" type="AxlegearType"/> + <xs:element name="AirDrag" type="AirdragType"/> + <xs:element name="AxleWheels" type="AxleWheelsType"/> + <xs:element name="Auxiliaries" type="AuxiliariesType"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:sequence> + <xs:element name="HybridElectricHDV" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P279</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="DualFuelVehicle" type="xs:boolean"> + <xs:annotation> + <xs:documentation>P280</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="MaxNetPower1" minOccurs="0"> + <xs:annotation> + <xs:documentation>P277</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:double"> + <xs:attribute name="unit" type="PowerUnitType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="MaxNetPower2" minOccurs="0"> + <xs:annotation> + <xs:documentation>P278</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:double"> + <xs:attribute name="unit" type="PowerUnitType" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:choice> <xs:element name="InputDataSignature" type="vdecdef:SignatureType"/> </xs:sequence> </xs:complexType> @@ -662,6 +712,7 @@ <xs:simpleType name="PowerUnitType"> <xs:restriction base="xs:string"> <xs:enumeration value="kW"/> + <xs:enumeration value="W"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="DisplacementType">