Pull request #892: Update XML Schema to allow WHTC Correction factors <1 (but...

Pull request #892: Update XML Schema to allow WHTC Correction factors <1 (but has to be >0) - necessary for DF engines

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:develop to develop

* commit 'f5cd585a':
  Update XML Schema to allow WHTC Correction factors <1 (but has to be >0) - necessary for DF engines

VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd

@@ -5,10 +5,11 @@
 	<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"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-<!--
+	<!--
 Changelog:
 	03.02.2022: First official version uploaded to CITnet
 	04.04.2022: Changes in 'TyreDimensionType': remove space between tyre design code and rim diameter (205/70 R15, 205/80 R15) 
+    01.06.2022: Change type of WHTC Correction factors, CFRegPer, BFColdHot: constraint > 0.0
 -->
 	<xs:complexType name="AbstractADCDataDeclarationType" abstract="true">
 		<xs:complexContent>
@@ -928,27 +929,27 @@ Changelog:
 	</xs:complexType>
 	<xs:complexType name="EngineFuelType">
 		<xs:sequence>
-			<xs:element name="WHTCUrban" type="v1.0:EngineWHTCType">
+			<xs:element name="WHTCUrban" type="v2.3:EngineWHTCType">
 				<xs:annotation>
 					<xs:documentation>P109 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="WHTCRural" type="v1.0:EngineWHTCType">
+			<xs:element name="WHTCRural" type="v2.3:EngineWHTCType">
 				<xs:annotation>
 					<xs:documentation>P110 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType">
+			<xs:element name="WHTCMotorway" type="v2.3:EngineWHTCType">
 				<xs:annotation>
 					<xs:documentation>P111 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType">
+			<xs:element name="BFColdHot" type="v2.3:EngineColdHotBalancingFactorType">
 				<xs:annotation>
 					<xs:documentation>P159 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType">
+			<xs:element name="CFRegPer" type="v2.3:EngineCFRegPerType">
 				<xs:annotation>
 					<xs:documentation>P192 [-]</xs:documentation>
 				</xs:annotation>
@@ -1852,6 +1853,49 @@ Changelog:
 			<xs:enumeration value="RM"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="EngineWHTCType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Engine">109</vectoParam:parameterId>
+					<vectoParam:parameterId component="Engine">110</vectoParam:parameterId>
+					<vectoParam:parameterId component="Engine">111</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+			<xs:documentation>P109 - [-]</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double4">
+			<xs:minInclusive value="0.0000"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="EngineCFRegPerType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Engine">192</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double4">
+			<xs:minInclusive value="0.0000"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="EngineColdHotBalancingFactorType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Engine">159</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+			<xs:documentation>P159 - [-]</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double4">
+			<xs:minInclusive value="0.0000"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:simpleType name="GearboxTransmissionTypeType">
 		<xs:annotation>
 			<xs:appinfo>