diff --git a/VECTO_XML-Schema.spp b/VECTO_XML-Schema.spp
index 8b84fe0f81feecf7dbd5aef5393dc5669f2bb5ee..ac1cd50ce1e11e1539d2f66f15ba33b1bd16d570 100644
--- a/VECTO_XML-Schema.spp
+++ b/VECTO_XML-Schema.spp
@@ -22,6 +22,7 @@
<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoEngineeringInput.0.7.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/>
+ <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.5.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.4.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.5.xsd" HomeFolder="Yes"/>
<File FilePath="VectoCore\VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs
index 1e56a67ce8d50b22bbff2b4ebe6835c1d0383e19..ac8b26677b19ce5bcc56fcae3afbdf9931af7de9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs
@@ -29,33 +29,33 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Resources;
-using TUGraz.VectoCommon.Utils;
-
-namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
-{
- public class XMLDeclarationAirdragDataProvider : AbstractDeclarationXMLComponentDataProvider,
- IAirdragDeclarationInputData
- {
- public XMLDeclarationAirdragDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider)
- : base(xmlInputDataProvider)
- {
- XBasePath = Helper.Query(VehiclePath,
- XMLNames.Vehicle_Components,
- XMLNames.Component_AirDrag,
- XMLNames.ComponentDataWrapper);
- }
-
- public new CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.Measured; }
- }
-
- public SquareMeter AirDragArea
- {
- get { return ElementExists(XMLNames.AirDrag_DeclaredCdxA) ? GetDoubleElementValue(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>() : null; }
- }
- }
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
+{
+ public class XMLDeclarationAirdragDataProvider : AbstractDeclarationXMLComponentDataProvider,
+ IAirdragDeclarationInputData
+ {
+ public XMLDeclarationAirdragDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider)
+ : base(xmlInputDataProvider)
+ {
+ XBasePath = Helper.Query(VehiclePath,
+ XMLNames.Vehicle_Components,
+ XMLNames.Component_AirDrag,
+ XMLNames.ComponentDataWrapper);
+ }
+
+ public new CertificationMethod CertificationMethod
+ {
+ get { return CertificationMethod.Measured; }
+ }
+
+ public SquareMeter AirDragArea
+ {
+ get { return ElementExists(XMLNames.AirDrag_DeclaredCdxA) ? GetDoubleElementValue(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>() : null; }
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.4.xsd
index 79393a75b6829cf913625c1964d90837b8d62828..3dbeffccbb6b89f90df61c5f72de7e49f654cf62 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.4.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.4.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- 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.4" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.4" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.4">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -96,8 +96,8 @@
<xs:element name="ApplicationInformation">
<xs:complexType>
<xs:sequence>
- <xs:element name="SimulationToolVersion"/>
- <xs:element name="Date"/>
+ <xs:element name="SimulationToolVersion" type="xs:string"/>
+ <xs:element name="Date" type="vdecdef:DateTimeWithTimezone"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -112,7 +112,7 @@
<xs:element name="Model" type="vdecdef:ModelType"/>
<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
- <xs:element name="VIN">
+ <xs:element name="VIN" type="vdecdef:VINType">
<xs:annotation>
<xs:documentation>P238</xs:documentation>
</xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd
index e5953441947a35adc5a141d98ab84b8343b9599c..dcab80c7a92aed5f62f03acf266e7f42be7f356e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd
@@ -62,7 +62,7 @@
<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded"/>
<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:element name="Error"/>
+ <xs:element name="Error" type="xs:string"/>
</xs:choice>
</xs:sequence>
<xs:attribute name="status" use="required">
@@ -96,8 +96,8 @@
<xs:element name="ApplicationInformation">
<xs:complexType>
<xs:sequence>
- <xs:element name="SimulationToolVersion"/>
- <xs:element name="Date"/>
+ <xs:element name="SimulationToolVersion" type="xs:string"/>
+ <xs:element name="Date" type="vdecdef:DateTimeWithTimezone"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -112,7 +112,7 @@
<xs:element name="Model" type="vdecdef:ModelType"/>
<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
- <xs:element name="VIN">
+ <xs:element name="VIN" type="vdecdef:VINType">
<xs:annotation>
<xs:documentation>P238</xs:documentation>
</xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd
index 54f7fe161bd33a74fc08663c6cf2308ec3cbd92e..b310b61a34f443d48a887f62e3aecb525e1ddbd8 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd
@@ -23,10 +23,10 @@
</xs:element>
<xs:complexType name="AirdragType">
<xs:sequence>
- <xs:element name="Model" minOccurs="0"/>
+ <xs:element name="Model" type="vdecdef:ModelType" minOccurs="0"/>
<xs:element name="CertificationMethod" type="AirdragCertificationOptionType"/>
- <xs:element name="CertificationNumber" minOccurs="0"/>
- <xs:element name="DigestValue" minOccurs="0"/>
+ <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
+ <xs:element name="DigestValue" type="xs:token" minOccurs="0"/>
<xs:element name="CdxA" type="vdecdef:AirdragCdxAType">
<xs:annotation>
<xs:documentation>P245</xs:documentation>
@@ -361,7 +361,7 @@
</xs:complexType>
<xs:complexType name="TorqueLimitsType">
<xs:sequence>
- <xs:element name="Entry" type="TorqueLimitsEntryType"/>
+ <xs:element name="Entry" type="TorqueLimitsEntryType" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VectoOutputDataType">
@@ -385,8 +385,8 @@
<xs:element name="ApplicationInformation">
<xs:complexType>
<xs:sequence>
- <xs:element name="SimulationToolVersion"/>
- <xs:element name="Date"/>
+ <xs:element name="SimulationToolVersion" type="xs:string"/>
+ <xs:element name="Date" type="vdecdef:DateTimeWithTimezone"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -495,7 +495,7 @@
</xs:complexType>
<xs:complexType name="VehicleType">
<xs:sequence>
- <xs:element name="VIN">
+ <xs:element name="VIN" type="vdecdef:VINType">
<xs:annotation>
<xs:documentation>P238</xs:documentation>
</xs:annotation>