adapting xml schema for primary vehicle so that it can be used in vecto (avoid...

adapting xml schema for primary vehicle so that it can be used in vecto (avoid loading the same file multiple times)

VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd

@@ -299,7 +299,11 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="SizeOfAirSupply" type="xs:string"/>
+								<xs:element name="SizeOfAirSupply" type="tns:PneumaticSystemTechnologyType"/>
+								<xs:element name="Clutch" type="tns:PneumaticSystemClutchTypeType"/>
+								<xs:element name="CompressorRatio" type="v1.0:Double3"/>
+								<xs:element name="SmartCompressionSystem" type="xs:boolean"/>
+								<xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
 								<xs:element name="AirsuspensionControl">
 									<xs:simpleType>
 										<xs:restriction base="xs:string">
@@ -609,7 +613,23 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="ResultCardEntryType">
-		<xs:attribute name="current" use="required"/>
-		<xs:attribute name="smartCurrent" use="required"/>
+		<xs:attribute name="current" type="v1.0:Double2" use="required"/>
+		<xs:attribute name="smartCurrent" type="v1.0:Double2" use="required"/>
 	</xs:complexType>
+	<xs:simpleType name="PneumaticSystemTechnologyType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Small"/>
+			<xs:enumeration value="Medium Supply 1-stage"/>
+			<xs:enumeration value="Medium Supply 2-stage"/>
+			<xs:enumeration value="Large Supply 1-stage"/>
+			<xs:enumeration value="Large Supply 2-stage"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PneumaticSystemClutchTypeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none"/>
+			<xs:enumeration value="visco"/>
+			<xs:enumeration value="mechanically"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>

VectoCore/VectoCore/Resources/XSD/VectoOutputDefinitions.xsd

 <?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" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+	<xs:complexType name="AbstractPrimaryVehicleDataPIFType" abstract="true"/>
 	<xs:complexType name="AbstractVectoOutputManufacturerDataType" abstract="true"/>
 </xs:schema>

VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd

 <?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:PrimaryVehicleInformation: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:DeclarationOutput:PrimaryVehicleInformation" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" schemaLocation="VectoOutputPrimaryVehicleInformation.xsd"/>
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation: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:DeclarationOutput:PrimaryVehicleInformation" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.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"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
@@ -236,7 +236,7 @@
 	</xs:complexType>
 	<xs:complexType name="PrimaryVehicleHeavyBusDataType">
 		<xs:complexContent>
-			<xs:extension base="pif:AbstractPrimaryVehicleDataPIFType">
+			<xs:extension base="out:AbstractPrimaryVehicleDataPIFType">
 				<xs:sequence>
 					<xs:element name="Vehicle" type="AbstractVehiclePIFType"/>
 					<xs:element name="ResultDataSignature" type="v1.0:SignatureType"/>

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoOutputPrimaryVehicle 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" 
-	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput: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:PrimaryVehicleInformation:HeavyBus:v0.1" 
-	xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
-
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation: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:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput: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:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation: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">
 	<!-- 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryBus.xsd"
 -->
 	<tns:Data id="PIFHB-VEH-1234567890" xsi:type="pbus:PrimaryVehicleHeavyBusDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1">
-	
 		<Vehicle xsi:type="VehiclePIFType">
 			<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
 			<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -236,12 +222,29 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation E:\QUAM\Wo
 							<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 						</SteeringPump>
 						<ElectricSystem>
-							<AlternatorTechnology ratio="1.000">Sample Alternator Technology 1</AlternatorTechnology>
+							<AlternatorTechnology ratio="1.000">default</AlternatorTechnology>
 							<SmartElectrics>false</SmartElectrics>
-							<ResultCards/>
+							<ResultCards>
+								<Idle>
+									<Entry current="0.00" smartCurrent="0.00"/>
+									<Entry current="100.00" smartCurrent="120.00"/>
+								</Idle>
+								<Traction>
+									<Entry current="0.00" smartCurrent="0.00"/>
+									<Entry current="100.00" smartCurrent="120.00"/>
+								</Traction>
+								<Overrun>
+									<Entry current="0.00" smartCurrent="0.00"/>
+									<Entry current="100.00" smartCurrent="120.00"/>
+								</Overrun>
+							</ResultCards>
 						</ElectricSystem>
 						<PneumaticSystem>
-							<SizeOfAirSupply>500</SizeOfAirSupply>
+							<SizeOfAirSupply>Small</SizeOfAirSupply>
+							<Clutch>none</Clutch>
+							<CompressorRatio>1.000</CompressorRatio>
+							<SmartCompressionSystem>false</SmartCompressionSystem>
+							<SmartRegenerationSystem>false</SmartRegenerationSystem>
 							<AirsuspensionControl>mechanically</AirsuspensionControl>
 							<AdBlueDosing>true</AdBlueDosing>
 							<DoorDriveTechnology>pneumatic</DoorDriveTechnology>

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml

@@ -3268,22 +3268,26 @@
 						<SmartElectrics>false</SmartElectrics>
 						<ResultCards>
 							<Idle>
-								<Entry current="0" smartCurrent="0"/>
-								<Entry current="100" smartCurrent="120"/>
+								<Entry current="0.00" smartCurrent="0.00"/>
+								<Entry current="100.00" smartCurrent="120.00"/>
 							</Idle>
 							<Traction>
-								<Entry current="0" smartCurrent="1"/>
-								<Entry current="100" smartCurrent="120"/>
+								<Entry current="0.00" smartCurrent="1.00"/>
+								<Entry current="100.00" smartCurrent="120.00"/>
 							</Traction>
 							<Overrun>
-								<Entry current="0" smartCurrent="0"/>
-								<Entry current="100" smartCurrent="120"/>
+								<Entry current="0.00" smartCurrent="0.00"/>
+								<Entry current="100.00" smartCurrent="120.00"/>
 							</Overrun>
 						</ResultCards>
 					</ElectricSystem>
 					<PneumaticSystem>
-						<SizeOfAirSupply>500</SizeOfAirSupply>
-						<AirsuspensionControl>mechanically</AirsuspensionControl>
+						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<Clutch>none</Clutch>
+						<CompressorRatio>1.000</CompressorRatio>
+						<SmartCompressionSystem>false</SmartCompressionSystem>
+						<SmartRegenerationSystem>false</SmartRegenerationSystem>
+						<AirsuspensionControl>electronically</AirsuspensionControl>
 						<AdBlueDosing>true</AdBlueDosing>
 						<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 					</PneumaticSystem>