From 15862a62b304e5cd5521117af000e3f558191140 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 15 Apr 2019 10:42:40 +0200
Subject: [PATCH] removing old xmlspy project file, sorting datatypes in xsd,
---
VECTO_XML-Schema.spp | 32 -----
.../XSD/VectoDeclarationComponent.xsd | 4 +-
.../XSD/VectoDeclarationDefinitions.1.0.xsd | 118 +++++++++---------
.../XSD/VectoEngineeringDefinitions.0.7.xsd | 1 -
.../Resources/XSD/VectoEngineeringInput.xsd | 15 ---
.../Resources/XSD/VectoEngineeringJob.xsd | 12 ++
...engineering_torqueconverter-sample_ref.xml | 19 +++
7 files changed, 92 insertions(+), 109 deletions(-)
delete mode 100644 VECTO_XML-Schema.spp
delete mode 100644 VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.xsd
create mode 100644 VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
diff --git a/VECTO_XML-Schema.spp b/VECTO_XML-Schema.spp
deleted file mode 100644
index ac1cd50ce1..0000000000
--- a/VECTO_XML-Schema.spp
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project>
- <Folder FolderName="XML Files" ExtStr="xml;cml;math;rdf;smil;svg;wml">
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_engine-sample.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_gearbox-sample.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_certificationOptions.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_FULL.xml" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_noAirdrag.xml" HomeFolder="Yes"/>
- </Folder>
- <Folder FolderName="XSL Files" ExtStr="xsl;xslt">
- <File FilePath="Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/>
- </Folder>
- <Folder FolderName="XQuery Files" ExtStr="xq;xql;xquery;xqu"/>
- <Folder FolderName="HTML Files" ExtStr="html;htm;xhtml;asp"/>
- <Folder FolderName="DTD/Schemas" ExtStr="dtd;dcd;xdr;biz;xsd">
- <File FilePath="VectoCore\VectoCore\Resources\XSD\ParameterDocumentation.xsd" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoComponent.1.0.xsd" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoDeclarationDefinitions.1.0.xsd" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoDefinitions.xsd" HomeFolder="Yes"/>
- <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoEngineeringDefinitions.0.7.xsd" HomeFolder="Yes"/>
- <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"/>
- <File FilePath="VectoCore\VectoCore\Resources\XSD\xmldsig-core-schema.xsd" HomeFolder="Yes"/>
- </Folder>
- <Folder FolderName="Entities" ExtStr="ent"/>
-</Project>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 3fd2fcee95..7052c4d1ab 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -1,12 +1,12 @@
<?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:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" 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:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for declaration input (i.e., job data) and all supported declaration definitions
-->
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" schemaLocation="VectoComponent.1.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" schemaLocation="VectoComponent.1.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" schemaLocation="VectoComponent.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
index aea1dba8e2..9fd6562e50 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
@@ -51,6 +51,33 @@
<xs:extension base="tns:VectoSimulationComponent"/>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="ADASType">
+ <xs:sequence>
+ <xs:element name="EngineStopStart" type="tns:EngineStopStartType">
+ <xs:annotation>
+ <xs:documentation>P271 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="EcoRollWithoutEngineStop" type="tns:EcoRollWithoutEngineStopType">
+ <xs:annotation>
+ <xs:documentation>P272 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="EcoRollWithEngineStop" type="tns:EcoRollWithEngineStopType">
+ <xs:annotation>
+ <xs:documentation>P273 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PredictiveCruiseControl">
+ <xs:annotation>
+ <xs:documentation>P274 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="tns:PredictiveCruiseControlType"/>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="AirDragComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="tns:AirDragDataDeclarationType"/>
@@ -639,6 +666,20 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="PTOType">
+ <xs:sequence>
+ <xs:element name="PTOShaftsGearWheels" type="tns:PTOShaftsGearWheelsType">
+ <xs:annotation>
+ <xs:documentation>P247 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PTOOtherElements" type="tns:PTOOtherElementsType">
+ <xs:annotation>
+ <xs:documentation>P248 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="RetarderComponentDeclarationType">
<xs:sequence>
<xs:element name="Data" type="tns:RetarderDataDeclarationType"/>
@@ -816,6 +857,12 @@
</xs:attribute>
</xs:complexType>
<xs:complexType name="TorqueLossMapType"/>
+ <xs:complexType name="TyreComponentDeclarationType">
+ <xs:sequence>
+ <xs:element name="Data" type="tns:TyreDataDeclarationType"/>
+ <xs:element name="Signature" type="tns:SignatureType"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="TyreDataDeclarationType">
<xs:complexContent>
<xs:extension base="tns:AbstractTyreDataDeclarationType">
@@ -864,12 +911,6 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="TyreComponentDeclarationType">
- <xs:sequence>
- <xs:element name="Data" type="tns:TyreDataDeclarationType"/>
- <xs:element name="Signature" type="tns:SignatureType"/>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="VectoDeclarationJobType">
<xs:sequence>
<xs:element name="Vehicle" type="tns:VehicleDeclarationType"/>
@@ -950,6 +991,18 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="VehicleComponentsType">
+ <xs:sequence>
+ <xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
+ <xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
+ <xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
+ <xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
+ <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
+ <xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="VehicleDeclarationType">
<xs:complexContent>
<xs:extension base="tns:VehicleBaseType">
@@ -2652,57 +2705,4 @@ ToDo: -0.00
</xs:annotation>
<xs:restriction base="xs:boolean"/>
</xs:simpleType>
- <xs:complexType name="VehicleComponentsType">
- <xs:sequence>
- <xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
- <xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
- <xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
- <xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
- <xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PTOType">
- <xs:sequence>
- <xs:element name="PTOShaftsGearWheels" type="tns:PTOShaftsGearWheelsType">
- <xs:annotation>
- <xs:documentation>P247 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PTOOtherElements" type="tns:PTOOtherElementsType">
- <xs:annotation>
- <xs:documentation>P248 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ADASType">
- <xs:sequence>
- <xs:element name="EngineStopStart" type="tns:EngineStopStartType">
- <xs:annotation>
- <xs:documentation>P271 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EcoRollWithoutEngineStop" type="tns:EcoRollWithoutEngineStopType">
- <xs:annotation>
- <xs:documentation>P272 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EcoRollWithEngineStop" type="tns:EcoRollWithEngineStopType">
- <xs:annotation>
- <xs:documentation>P273 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PredictiveCruiseControl">
- <xs:annotation>
- <xs:documentation>P274 - enum</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="tns:PredictiveCruiseControlType"/>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.0.7.xsd
index 91c97f17ab..5078d5e108 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.0.7.xsd
@@ -1819,5 +1819,4 @@
<xs:element name="Resource" type="tns:ExtResourceEngineeringType"/>
</xs:choice>
</xs:complexType>
- <xs:complexType name="VehicleDataEngineeringType"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.xsd
deleted file mode 100644
index 9737f6812b..0000000000
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringInput.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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) -->
-<xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" 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:vengdef="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" targetNamespace="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" schemaLocation="VectoEngineeringDefinitions.0.7.xsd"/>
- <xs:element name="VectoComponentEngineering" type="vengdef:VectoComponentEngineeringType">
- <xs:annotation>
- <xs:documentation>Root Node Engineering Component Data</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="VectoInputEngineering" type="vengdef:VectoJobEngineeringType">
- <xs:annotation>
- <xs:documentation>Root Node Engineering Job</xs:documentation>
- </xs:annotation>
- </xs:element>
-</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
new file mode 100644
index 0000000000..70b6898157
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
@@ -0,0 +1,12 @@
+<?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:ns1="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:ns2="urn:tugraz:ivt:VectoAPI:EngineeringInput:v1.0" xmlns:ns3="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <!--
+
+ This is a convienience file that imports the schema for engineering input (i.e., job data) and all supported declaration definitions
+
+ -->
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" schemaLocation="VectoEngineeringInput.0.7.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:EngineeringInput:v1.0" schemaLocation="VectoEngineeringInput.1.0.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions" schemaLocation="VectoEngineeringDefinitions.xsd"/>
+</xs:schema>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
new file mode 100644
index 0000000000..a061b4141e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_torqueconverter-sample_ref.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoComponentEngineering xmlns="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions:v0.7" xmlns:tns="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.6" schemaVersion="0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoEngineeringInput.0.7.xsd">
+ <TorqueConverter>
+ <Data>
+ <Manufacturer>Generic Torqueconverter Manufacturer</Manufacturer>
+ <Model>Generic Torqueconverter</Model>
+ <Creator>Markus Quaritsch, TUG ITI</Creator>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <ReferenceRPM>1000</ReferenceRPM>
+ <Characteristics>
+ <Resource type="csv" file="tc_data.vtcc"/>
+ </Characteristics>
+ <Inertia>1.234</Inertia>
+ <ShiftPolygon>
+ <Resource type="csv" file="GBX_ShiftPolygons.vgbs"/>
+ </ShiftPolygon>
+ </Data>
+ </TorqueConverter>
+</tns:VectoComponentEngineering>
--
GitLab