diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs index 9ed931ed641ea5d07aeac33aacc63f135df45cf8..b394e0ac4078b29355b851a54f936b1533e7a708 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs +++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs @@ -2535,6 +2535,15 @@ namespace TUGraz.VectoCommon.Resources { } } + /// <summary> + /// Looks up a localized string similar to ATEcoRollReleaseLockupClutch. + /// </summary> + public static string Vehicle_ADAS_ATEcoRollReleaseLockupClutch { + get { + return ResourceManager.GetString("Vehicle_ADAS_ATEcoRollReleaseLockupClutch", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to EcoRoll. /// </summary> diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx index c11ef150edc6729a877a846d55005e7bdf66758f..e8ab16bd278584016af0b3993db476359ca7fac8 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.resx +++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx @@ -1128,4 +1128,7 @@ <data name="DriverModel_EngineStopStartParameters" xml:space="preserve"> <value>EngineStopStartParameters</value> </data> + <data name="Vehicle_ADAS_ATEcoRollReleaseLockupClutch" xml:space="preserve"> + <value>ATEcoRollReleaseLockupClutch</value> + </data> </root> \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs index 70de2322d2c841a72295ca5c0e8af8a89f36b404..db9998e603e0c962bbf0836a2ece60749325bf40 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs @@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public override bool? ATEcoRollReleaseLockupClutch { get { - var node = GetNode("ATEcoRollReleaseLockupClutch", required:false); + var node = GetNode(XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, required:false); if (node == null) { return null; } diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs index 5d341f9ea999ee134fba1bf29c7e3722494c3726..c7b028d4db844181c472ad627dd61a9b5326de2d 100644 --- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs +++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs @@ -79,6 +79,8 @@ namespace TUGraz.VectoCore.Models.Declaration public static readonly PTOTransmission PTOTransmission = new PTOTransmission(); public const double LossMapExtrapolationFactor = 6; + public static readonly ADASCombinations ADASCombinations = new ADASCombinations(); + public static readonly WeightingGroups WeightingGroup = new WeightingGroups(); public static readonly WeightingFactors WeightingFactors = new WeightingFactors(); diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd index dfed1f3c8a622991dba6ea95dc6b3841291b3070..e8f2e7b3cfe5964573e2f657cc22b678125c54f7 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd @@ -9,6 +9,7 @@ <xs:complexType name="AbstractAxleWheelsComponentDeclarationType" abstract="true"/> <xs:complexType name="AbstractAxleWheelsDataDeclarationType"/> <xs:complexType name="AbstractGearEntryType" abstract="true"/> + <xs:complexType name="AbstractGearsDeclarationType" abstract="true"/> <xs:complexType name="AbstractPTODataType" abstract="true"/> <xs:complexType name="AbstractTorqueLimitsType"/> <xs:complexType name="AbstractVehicleComponentsDeclarationType" abstract="true"/> @@ -579,13 +580,7 @@ <xs:documentation>P254 - [-]</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="Gears"> - <xs:complexType> - <xs:sequence> - <xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/> - </xs:sequence> - </xs:complexType> - </xs:element> + <xs:element name="Gears" type="tns:AbstractGearsDeclarationType"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -619,6 +614,15 @@ </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="GearsDeclarationType"> + <xs:complexContent> + <xs:extension base="tns:AbstractGearsDeclarationType"> + <xs:sequence> + <xs:element name="Gear" type="tns:GearDeclarationType" maxOccurs="99"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="PTOType"> <xs:complexContent> <xs:extension base="tns:AbstractPTODataType"> @@ -894,6 +898,49 @@ </xs:simpleType> </xs:attribute> </xs:complexType> + <xs:complexType name="VehicleBaseType" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:AbstractVehicleDeclarationType"> + <xs:sequence> + <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> + <xs:annotation> + <xs:documentation>P235</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType"> + <xs:annotation> + <xs:documentation>P252</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Model" type="v1.0:ModelType"> + <xs:annotation> + <xs:documentation>P236</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="VIN" type="v1.0:VINType"> + <xs:annotation> + <xs:documentation>P238</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> + <xs:annotation> + <xs:documentation>P239</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType"> + <xs:annotation> + <xs:documentation>P251 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType"> + <xs:annotation> + <xs:documentation>P036 - enum</xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="VehicleComponentsType"> <xs:complexContent> <xs:extension base="tns:AbstractVehicleComponentsDeclarationType"> @@ -957,47 +1004,4 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="VehicleBaseType" abstract="true"> - <xs:complexContent> - <xs:extension base="tns:AbstractVehicleDeclarationType"> - <xs:sequence> - <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> - <xs:annotation> - <xs:documentation>P235</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType"> - <xs:annotation> - <xs:documentation>P252</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Model" type="v1.0:ModelType"> - <xs:annotation> - <xs:documentation>P236</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="VIN" type="v1.0:VINType"> - <xs:annotation> - <xs:documentation>P238</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> - <xs:annotation> - <xs:documentation>P239</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="LegislativeClass" type="v1.0:LegislativeClassDeclarationType"> - <xs:annotation> - <xs:documentation>P251 - enum</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="VehicleCategory" type="v1.0:VehicleCategoryDeclarationType"> - <xs:annotation> - <xs:documentation>P036 - enum</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> </xs:schema> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd new file mode 100644 index 0000000000000000000000000000000000000000..a464689d986e4f0599b28abdfb4c333963e8a23d --- /dev/null +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd @@ -0,0 +1,466 @@ +<?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:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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:di="http://www.w3.org/2000/09/xmldsig#" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> + <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.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"/> + <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/> + <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/> + <xs:complexType name="EngineDataDeclarationType"> + <xs:complexContent> + <xs:extension base="v1.0:AbstractCombustionEngineDataDeclarationType"> + <xs:sequence> + <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> + <xs:annotation> + <xs:documentation>P200</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Model" type="v1.0:ModelType"> + <xs:annotation> + <xs:documentation>P201</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType"> + <xs:annotation> + <xs:documentation>P261</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> + <xs:annotation> + <xs:documentation>P203</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AppVersion" type="v1.0:AppVersionType"> + <xs:annotation> + <xs:documentation>P204</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false"> + <xs:annotation> + <xs:documentation>P061 - [cm³]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType"> + <xs:annotation> + <xs:documentation>P249 - [1/min]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="RatedPower" type="v1.0:EngineRatedPower"> + <xs:annotation> + <xs:documentation>P250 - [W]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque"> + <xs:annotation> + <xs:documentation>P259 - [Nm]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="WHRType" type="tns:WHRTypeType"/> + <xs:element name="Mode" type="tns:EngineFuelModeType" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="EngineFuelModeType"> + <xs:sequence> + <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"> + <xs:annotation> + <xs:documentation>P063 - [1/min]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="FullLoadAndDragCurve"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="Fuel" type="tns:EngineFuelType" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="EngineFuelType"> + <xs:sequence> + <xs:element name="WHTCUrban" type="v1.0:EngineWHTCType"> + <xs:annotation> + <xs:documentation>P109 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="WHTCRural" type="v1.0:EngineWHTCType"> + <xs:annotation> + <xs:documentation>P110 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType"> + <xs:annotation> + <xs:documentation>P111 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType"> + <xs:annotation> + <xs:documentation>P159 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType"> + <xs:annotation> + <xs:documentation>P192 [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="CFNCV" type="v1.0:EngineNCVCFType"> + <xs:annotation> + <xs:documentation>P260 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="WHRCorrectionFactors" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="Electrical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/> + <xs:element name="Mechanical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="FuelConsumptionMap"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="tns:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="type" type="v1.0:FuelTypeType" use="required"> + <xs:annotation> + <xs:documentation>P193 [enum]</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + <xs:complexType name="FuelConsumptionEntryType"> + <xs:attribute name="engineSpeed" type="v1.0:EngineSpeedType" use="required"> + <xs:annotation> + <xs:documentation>P072 - [1/min]</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="torque" type="v1.0:EngineFuelConsumptionMapTorqueType" use="required"> + <xs:annotation> + <xs:documentation>P073 - [Nm]</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="fuelConsumption" type="v1.0:EngineFuelConsumptionMapFuelConsumptionType" use="required"> + <xs:annotation> + <xs:documentation>P074 - [g/h]</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="electricPower" type="v1.0:Double2"> + <xs:annotation> + <xs:documentation>Pxxx - [W]</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="mechanicalPower" type="v1.0:Double2"> + <xs:annotation> + <xs:documentation>Pxxx - [W]</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + <xs:complexType name="GearboxDataDeclarationType"> + <xs:annotation> + <xs:documentation>Gearbox Component</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="v1.0:AbstractTransmissionDataDeclarationType"> + <xs:sequence> + <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> + <xs:annotation> + <xs:documentation>P205</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Model" type="v1.0:ModelType"> + <xs:annotation> + <xs:documentation>P206</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType"> + <xs:annotation> + <xs:documentation>P262</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> + <xs:annotation> + <xs:documentation>P208</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AppVersion" type="v1.0:AppVersionType"> + <xs:annotation> + <xs:documentation>P209</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType"> + <xs:annotation> + <xs:documentation>P076 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType"> + <xs:annotation> + <xs:documentation>P254 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="DifferentialIncluded" type="xs:boolean"> + <xs:annotation> + <xs:documentation>Pxxx - [bool[</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="TyreDataDeclarationType"> + <xs:complexContent> + <xs:extension base="v1.0:AbstractTyreDataDeclarationType"> + <xs:sequence> + <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> + <xs:annotation> + <xs:documentation>P230</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Model" type="v1.0:ModelType"> + <xs:annotation> + <xs:documentation>P231</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType"> + <xs:annotation> + <xs:documentation>P267</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> + <xs:annotation> + <xs:documentation>P233</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="AppVersion" type="v1.0:AppVersionType"> + <xs:annotation> + <xs:documentation>P234</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="Dimension" type="tns:TyreDimensionType"> + <xs:annotation> + <xs:documentation>P108 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="TyreClass"> + <xs:annotation> + <xs:documentation>Pxxx - enum</xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="C1"/> + <xs:enumeration value="C2"/> + <xs:enumeration value="C3"/> + <xs:enumeration value="N/A"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="FuelEfficiencyClass"> + <xs:annotation> + <xs:documentation>Pxxx - enum</xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="A"/> + <xs:enumeration value="B"/> + <xs:enumeration value="C"/> + <xs:enumeration value="D"/> + <xs:enumeration value="E"/> + <xs:enumeration value="F"/> + <xs:enumeration value="G"/> + <xs:enumeration value="N/A"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="RRCDeclared" type="v1.0:TyreRRCISOType"> + <xs:annotation> + <xs:documentation>P046 - [-]</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="FzISO" type="v1.0:TyreFzISOType"> + <xs:annotation> + <xs:documentation>P047 - [N]</xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="WHRCorrectionFactorsType"> + <xs:sequence> + <xs:element name="Urban"> + <xs:simpleType> + <xs:restriction base="v1.0:Double4"> + <xs:minExclusive value="0.0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="Rural"> + <xs:simpleType> + <xs:restriction base="v1.0:Double4"> + <xs:minExclusive value="0.0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="Motorway"> + <xs:simpleType> + <xs:restriction base="v1.0:Double4"> + <xs:minExclusive value="0.0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="BFColdHot"> + <xs:simpleType> + <xs:restriction base="v1.0:Double4"> + <xs:minExclusive value="0.0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="CFRegPer"> + <xs:simpleType> + <xs:restriction base="v1.0:Double4"> + <xs:minExclusive value="0.0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="WHRTypeType"> + <xs:sequence> + <xs:element name="MechanicalOutputICE" type="xs:boolean"/> + <xs:element name="MechanicalOutputDrivetrain" type="xs:boolean"/> + <xs:element name="ElectricalOutput" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + <xs:simpleType name="TyreDimensionType"> + <xs:annotation> + <xs:appinfo> + <vectoParam:description> + <vectoParam:parameterId component="Tyre">108</vectoParam:parameterId> + <vectoParam:unit>-</vectoParam:unit> + </vectoParam:description> + </xs:appinfo> + <xs:documentation>P108 - enum</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="9 R22.5"/> + <xs:enumeration value="9.00 R20"/> + <xs:enumeration value="9.5 R17.5"/> + <xs:enumeration value="10 R17.5"/> + <xs:enumeration value="10 R22.5"/> + <xs:enumeration value="10.00 R20"/> + <xs:enumeration value="11 R22.5"/> + <xs:enumeration value="11.00 R20"/> + <xs:enumeration value="12 R22.5"/> + <xs:enumeration value="12.00 R20"/> + <xs:enumeration value="12.00 R24"/> + <xs:enumeration value="12.5 R20"/> + <xs:enumeration value="13 R22.5"/> + <xs:enumeration value="14.00 R20"/> + <xs:enumeration value="14.5 R20"/> + <xs:enumeration value="16.00 R20"/> + <xs:enumeration value="205/75 R17.5"/> + <xs:enumeration value="215/75 R17.5"/> + <xs:enumeration value="225/70 R17.5"/> + <xs:enumeration value="225/75 R17.5"/> + <xs:enumeration value="235/75 R17.5"/> + <xs:enumeration value="245/70 R17.5"/> + <xs:enumeration value="245/70 R19.5"/> + <xs:enumeration value="255/70 R22.5"/> + <xs:enumeration value="265/70 R17.5"/> + <xs:enumeration value="265/70 R19.5"/> + <xs:enumeration value="275/70 R22.5"/> + <xs:enumeration value="275/80 R22.5"/> + <xs:enumeration value="285/60 R22.5"/> + <xs:enumeration value="285/70 R19.5"/> + <xs:enumeration value="295/55 R22.5"/> + <xs:enumeration value="295/60 R22.5"/> + <xs:enumeration value="295/80 R22.5"/> + <xs:enumeration value="305/60 R22.5"/> + <xs:enumeration value="305/70 R19.5"/> + <xs:enumeration value="305/70 R22.5"/> + <xs:enumeration value="305/75 R24.5"/> + <xs:enumeration value="315/45 R22.5"/> + <xs:enumeration value="315/60 R22.5"/> + <xs:enumeration value="315/70 R22.5"/> + <xs:enumeration value="315/80 R22.5"/> + <xs:enumeration value="325/95 R24"/> + <xs:enumeration value="335/80 R20"/> + <xs:enumeration value="355/50 R22.5"/> + <xs:enumeration value="365/70 R22.5"/> + <xs:enumeration value="365/80 R20"/> + <xs:enumeration value="365/85 R20"/> + <xs:enumeration value="375/45 R22.5"/> + <xs:enumeration value="375/50 R22.5"/> + <xs:enumeration value="375/90 R22.5"/> + <xs:enumeration value="385/55 R22.5"/> + <xs:enumeration value="385/65 R22.5"/> + <xs:enumeration value="395/85 R20"/> + <xs:enumeration value="425/65 R22.5"/> + <xs:enumeration value="495/45 R22.5"/> + <xs:enumeration value="525/65 R20.5"/> + <xs:enumeration value="11.00 R16"/> + <xs:enumeration value="6.00 R9"/> + <xs:enumeration value="205/65 R17.5"/> + <xs:enumeration value="225/75 R16C"/> + <xs:enumeration value="255/100 R16"/> + <xs:enumeration value="255/60 R19.5"/> + <xs:enumeration value="265/55 R19.5"/> + <xs:enumeration value="275/60 R19.5"/> + <xs:enumeration value="275/80 R20"/> + <xs:enumeration value="285/65 R16C"/> + <xs:enumeration value="295/75 R22.5"/> + <xs:enumeration value="325/85 R16"/> + <xs:enumeration value="435/50 R19.5"/> + <xs:enumeration value="435/50 R22.5"/> + <xs:enumeration value="445/40 R22.5"/> + <xs:enumeration value="445/45 R19.5"/> + <xs:enumeration value="445/65 R22.5"/> + <xs:enumeration value="445/75 R22.5"/> + <xs:enumeration value="455/40 R22.5"/> + <xs:enumeration value="455/45 R22.5"/> + <xs:enumeration value="475/80 R20"/> + <xs:enumeration value="7.00 R16C"/> + <xs:enumeration value="7.50 R15"/> + <xs:enumeration value="7.50 R16"/> + <xs:enumeration value="7.50 R16C"/> + <xs:enumeration value="8.25 R15"/> + <xs:enumeration value="8.25 R16C"/> + <xs:enumeration value="8.5 R17.5"/> + <xs:enumeration value="8 R17.5"/> + <xs:enumeration value="LT265/75 R16"/> + <xs:enumeration value="385/55 R19.5"/> + <xs:enumeration value="24 R21"/> + <xs:enumeration value="205/70 R15C"/> + <xs:enumeration value="215/70 R15C"/> + <xs:enumeration value="225/70 R15C"/> + <xs:enumeration value="185/75 R16C"/> + <xs:enumeration value="195/65 R16C"/> + <xs:enumeration value="195/75 R16C"/> + <xs:enumeration value="205/65 R16C"/> + <xs:enumeration value="205/75 R16C"/> + <xs:enumeration value="215/65 R16C"/> + <xs:enumeration value="215/75 R16C"/> + <xs:enumeration value="225/65 R16C"/> + <xs:enumeration value="235/65 R16C"/> + <xs:enumeration value="215/60 R17C"/> + <xs:enumeration value="235/60 R17C"/> + </xs:restriction> + </xs:simpleType> + <xs:complexType name="AdvancedDriverAssistantSystemsType"> + <xs:complexContent> + <xs:extension base="v2.1:AbstractAdvancedDriverAssistantSystemsType"> + <xs:sequence> + <xs:element name="EngineStopStart" type="v2.1:EngineStopStartType"/> + <xs:element name="EcoRollWithoutEngineStop" type="v2.1:EcoRollWithoutEngineStopType"/> + <xs:element name="EcoRollWithEngineStop" type="v2.1:EcoRollWithEngineStopType"/> + <xs:element name="PredictiveCruiseControl" type="v2.1:PredictiveCruiseControlType"/> + <xs:element name="ATEcoRollReleaseLockupClutch" type="xs:boolean" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> +</xs:schema> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd deleted file mode 100644 index ddf0a16b6db125743199231fe040e9e914aab64f..0000000000000000000000000000000000000000 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd +++ /dev/null @@ -1,194 +0,0 @@ -<?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:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" 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:di="http://www.w3.org/2000/09/xmldsig#" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> - <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.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"/> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/> - <xs:complexType name="EngineDataDeclarationType"> - <xs:complexContent> - <xs:extension base="v1.0:AbstractCombustionEngineDataDeclarationType"> - <xs:sequence> - <xs:element name="Manufacturer" type="v1.0:ManufacturerType"> - <xs:annotation> - <xs:documentation>P200</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Model" type="v1.0:ModelType"> - <xs:annotation> - <xs:documentation>P201</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType"> - <xs:annotation> - <xs:documentation>P261</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Date" type="v1.0:DateTimeWithTimezone"> - <xs:annotation> - <xs:documentation>P203</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="AppVersion" type="v1.0:AppVersionType"> - <xs:annotation> - <xs:documentation>P204</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false"> - <xs:annotation> - <xs:documentation>P061 - [cm³]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType"> - <xs:annotation> - <xs:documentation>P249 - [1/min]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="RatedPower" type="v1.0:EngineRatedPower"> - <xs:annotation> - <xs:documentation>P250 - [W]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque"> - <xs:annotation> - <xs:documentation>P259 - [Nm]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="WHRType"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="none"/> - <xs:enumeration value="mechanical only"/> - <xs:enumeration value="electrical only"/> - <xs:enumeration value="mechanical and electrical"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="Mode" type="tns:EngineFuelModeType" maxOccurs="unbounded"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="FuelConsumptionEntryType"> - <xs:attribute name="engineSpeed" type="v1.0:EngineSpeedType" use="required"> - <xs:annotation> - <xs:documentation>P072 - [1/min]</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="torque" type="v1.0:EngineFuelConsumptionMapTorqueType" use="required"> - <xs:annotation> - <xs:documentation>P073 - [Nm]</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="fuelConsumption" type="v1.0:EngineFuelConsumptionMapFuelConsumptionType" use="required"> - <xs:annotation> - <xs:documentation>P074 - [g/h]</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="electricPower" type="v1.0:Double2"/> - </xs:complexType> - <xs:complexType name="EngineFuelModeType"> - <xs:sequence> - <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"> - <xs:annotation> - <xs:documentation>P063 - [1/min]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="FullLoadAndDragCurve"> - <xs:complexType> - <xs:sequence> - <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Fuel" type="tns:EngineFuelType" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="EngineFuelType"> - <xs:sequence> - <xs:element name="WHTCUrban" type="v1.0:EngineWHTCType"> - <xs:annotation> - <xs:documentation>P109 - [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="WHTCRural" type="v1.0:EngineWHTCType"> - <xs:annotation> - <xs:documentation>P110 - [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType"> - <xs:annotation> - <xs:documentation>P111 - [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType"> - <xs:annotation> - <xs:documentation>P159 - [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType"> - <xs:annotation> - <xs:documentation>P192 [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="CFNCV" type="v1.0:EngineNCVCFType"> - <xs:annotation> - <xs:documentation>P260 - [-]</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="WHRCorrectionFactors" type="tns:WHRCorrectionFactorsType" minOccurs="0"/> - <xs:element name="FuelConsumptionMap"> - <xs:complexType> - <xs:sequence> - <xs:element name="Entry" type="tns:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - <xs:attribute name="type" type="v1.0:FuelTypeType" use="required"> - <xs:annotation> - <xs:documentation>P193 [enum]</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="WHRCorrectionFactorsType"> - <xs:sequence> - <xs:element name="Urban"> - <xs:simpleType> - <xs:restriction base="v1.0:Double4"> - <xs:minExclusive value="0.0"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="Rural"> - <xs:simpleType> - <xs:restriction base="v1.0:Double4"> - <xs:minExclusive value="0.0"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="Motorway"> - <xs:simpleType> - <xs:restriction base="v1.0:Double4"> - <xs:minExclusive value="0.0"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="BFColdHot"> - <xs:simpleType> - <xs:restriction base="v1.0:Double4"> - <xs:minExclusive value="0.0"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="CFRegPer"> - <xs:simpleType> - <xs:restriction base="v1.0:Double4"> - <xs:minExclusive value="0.0"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - </xs:sequence> - </xs:complexType> -</xs:schema> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd index 4f6104f07a7a161d4f5578295a0c8e38d0af86c2..110173ba69d9574e6c79f186098c05b78e0eac85 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd @@ -1,6 +1,6 @@ <?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:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd"> <!-- This is a convienience file that imports all supported declaration definitions @@ -10,6 +10,6 @@ <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"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" schemaLocation="VectoDeclarationDefinitions.2.3_DF.xsd"/> + <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/> <xs:complexType name="AbstractVectoOutputManufacturerType" abstract="true"/> </xs:schema> diff --git a/VectoCore/VectoCore/Utils/XMLDefinitions.cs b/VectoCore/VectoCore/Utils/XMLDefinitions.cs index 7a5b6b67823b8cbf565486455d4989ac196e23af..62cc302200e4c468418900a0739dce917f90fa5e 100644 --- a/VectoCore/VectoCore/Utils/XMLDefinitions.cs +++ b/VectoCore/VectoCore/Utils/XMLDefinitions.cs @@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Utils public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V22 = DECLARATION_NAMESPACE + ":v2.2"; - public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":v2.3_DF"; + public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":DEV:v2.3"; public const string DECLARATION_INPUT_NAMESPACE = "urn:tugraz:ivt:VectoAPI:DeclarationInput"; diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index 53ff77fef783918acabd3085e1d7eff12c37b06d..647d05b835c10577e563ae6767e803203018db8b 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -259,6 +259,7 @@ <Compile Include="InputData\FileIO\XML\Declaration\IXMLDeclarationInputDataReader.cs" /> <Compile Include="InputData\FileIO\XML\IXMLInputDataReader.cs" /> <Compile Include="InputData\FileIO\XML\XMLInputDataNinjectModule.cs" /> + <Compile Include="Models\Declaration\ADASCombination.cs" /> <Compile Include="Models\SimulationComponent\Data\Engine\WHRPowerMap.cs" /> <Compile Include="InputData\Reader\ComponentData\WHRPowerReader.cs" /> <Compile Include="Models\SimulationComponent\Impl\StopStartCombustionEngine.cs" /> @@ -688,9 +689,6 @@ <EmbeddedResource Include="Resources\XSD\VectoMonitoring.xsd"> <SubType>Designer</SubType> </EmbeddedResource> - <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3_DF.xsd"> - <SubType>Designer</SubType> - </EmbeddedResource> <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.0.8.xsd"> <SubType>Designer</SubType> </EmbeddedResource> @@ -703,6 +701,10 @@ <EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.1.1.xsd"> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="Resources\Declaration\ADAS\ADAS_Combinations.csv" /> + <None Include="Resources\XSD\VectoDeclarationDefinitions.2.3_DEV.xsd"> + <SubType>Designer</SubType> + </None> <None Include="Utils\VectoVersionCore.tt"> <Generator>TextTemplatingFileGenerator</Generator> <LastGenOutput>VectoVersionCore.cs</LastGenOutput>