From 9f4588368f4d1e897720d400474454e3b640d182 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 28 Jul 2021 16:08:28 +0200 Subject: [PATCH] introducing separate XML types for measured and stanard values components, adding more sample files --- ...larationDefinitions.2.9_xEV_Components.xsd | 251 ++++++++++++++++-- .../SchemaVersion2.9/BatterySystem_1.xml | 12 +- .../SchemaVersion2.9/CapacitorSystem_1.xml | 32 +-- .../ElectricMachineSystem_1.xml | 6 +- .../ElectricMachineSystem_StdValues.xml | 49 ++++ .../SchemaVersion2.9/IEPC_1.xml | 2 +- .../SchemaVersion2.9/IEPC_StdValues.xml | 1 + VectoCore/VectoXML.spp | 2 + 8 files changed, 298 insertions(+), 57 deletions(-) create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_StdValues.xml create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_StdValues.xml diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.9_xEV_Components.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.9_xEV_Components.xsd index 1a3a238555..4d86d09650 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.9_xEV_Components.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.9_xEV_Components.xsd @@ -27,9 +27,9 @@ <xs:complexType name="BatterySystemCurrentLimitsEntryType"> <xs:attribute name="SoC" use="required"> <xs:simpleType> - <xs:restriction base="v1.0:Double2"> - <xs:minInclusive value="0.00"/> - <xs:maxInclusive value="100.00"/> + <xs:restriction base="xs:int"> + <xs:minInclusive value="0"/> + <xs:maxInclusive value="100"/> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -87,7 +87,7 @@ </xs:element> <xs:element name="ConnectorsSubsystemsIncluded" type="xs:boolean"/> <xs:element name="JunctionboxIncluded" type="xs:boolean"/> - <xs:element name="TestingTemperature" type="xs:int"/> + <xs:element name="TestingTemperature" type="xs:int" minOccurs="0"/> <xs:element name="OCV"> <xs:complexType> <xs:sequence> @@ -116,9 +116,9 @@ <xs:complexType name="BatterySystemInternalResistanceEntryType"> <xs:attribute name="SoC" use="required"> <xs:simpleType> - <xs:restriction base="v1.0:Double2"> - <xs:minInclusive value="0.00"/> - <xs:maxInclusive value="100.00"/> + <xs:restriction base="xs:int"> + <xs:minInclusive value="0"/> + <xs:maxInclusive value="100"/> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -154,9 +154,9 @@ <xs:complexType name="BatterySystemOCVEntryType"> <xs:attribute name="SoC" use="required"> <xs:simpleType> - <xs:restriction base="v1.0:Double2"> - <xs:minInclusive value="0.00"/> - <xs:maxInclusive value="100.00"/> + <xs:restriction base="xs:int"> + <xs:minInclusive value="0"/> + <xs:maxInclusive value="100"/> </xs:restriction> </xs:simpleType> </xs:attribute> @@ -240,7 +240,7 @@ </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="TestingTemperature" type="xs:int"/> + <xs:element name="TestingTemperature" type="xs:int" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -255,7 +255,101 @@ <xs:attribute name="coolantTempInlet" type="xs:int" use="required"/> <xs:attribute name="coolingPower" type="xs:int" use="required"/> </xs:complexType> - <xs:complexType name="ElectricMachineSystemDataDeclarationType"> + <xs:complexType name="ElectricMachineSystemStandardValuesDataDeclarationType"> + <xs:complexContent> + <xs:extension base="v2.9:AbstractElectricMachineSystemDataType"> + <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="ElectricMachineType" type="v2.9:ElectricMachineTypeType"/> + <xs:element name="CertificationMethod" type="v2.9:CertificationMethodType"/> + <xs:element name="R85RatedPower"> + <xs:simpleType> + <xs:restriction base="xs:int"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="RotationalInertia"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="ContinuousTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="TestSpeedContinuousTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="OverloadTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="TestSpeedOverloadTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="OverloadDuration"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="DcDcConverterIncluded" type="xs:boolean"/> + <xs:element name="IHPCType" type="v2.9:IHPCTypeType"/> + <xs:element name="VoltageLevel" type="v2.9:ElectricMachineSystemVoltageLevelStandardValuesType"/> + <xs:element name="DragCurve"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="v2.9:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="ElectricMachineSystemMeasuredDataDeclarationType"> <xs:complexContent> <xs:extension base="v2.9:AbstractElectricMachineSystemDataType"> <xs:sequence> @@ -344,7 +438,7 @@ </xs:element> <xs:element name="DcDcConverterIncluded" type="xs:boolean"/> <xs:element name="IHPCType" type="v2.9:IHPCTypeType"/> - <xs:element name="VoltageLevel" type="v2.9:AbstractElectricMachineSystemVoltageLevelType" minOccurs="2" maxOccurs="unbounded"/> + <xs:element name="VoltageLevel" type="v2.9:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/> <xs:element name="DragCurve"> <xs:complexType> <xs:sequence> @@ -414,7 +508,7 @@ <xs:attribute name="torque" type="v1.0:Double2" use="required"/> <xs:attribute name="electricPower" type="v1.0:Double2" use="required"/> </xs:complexType> - <xs:complexType name="ElectricMachineSystemVoltageLevelType"> + <xs:complexType name="ElectricMachineSystemVoltageLevelMeasuredType"> <xs:complexContent> <xs:extension base="v2.9:AbstractElectricMachineSystemVoltageLevelType"> <xs:sequence> @@ -443,13 +537,138 @@ </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="ElectricMachineSystemVoltageLevelStandardValuesType"> + <xs:complexContent> + <xs:extension base="v2.9:AbstractElectricMachineSystemVoltageLevelType"> + <xs:sequence> + <xs:element name="MaxTorqueCurve"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="v2.9:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="PowerMap"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="v2.9:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="IEPCComponentDeclarationType"> <xs:sequence> <xs:element name="Data" type="v2.9:AbstractIEPCDataType"/> <xs:element name="Signature" type="v2.0:SignatureType"/> </xs:sequence> </xs:complexType> - <xs:complexType name="IEPCDataDeclarationType"> + <xs:complexType name="IEPCStandardValuesDataDeclarationType"> + <xs:complexContent> + <xs:extension base="v2.9:AbstractIEPCDataType"> + <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="ElectricMachineType" type="v2.9:ElectricMachineTypeType"/> + <xs:element name="CertificationMethod" type="v2.9:IEPCCertificationMethodType"/> + <xs:element name="R85RatedPower"> + <xs:simpleType> + <xs:restriction base="xs:int"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="RotationalInertia"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="ContinuousTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="TestSpeedContinuousTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="OverloadTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="TestSpeedOverloadTorque"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="OverloadDuration"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minExclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="DifferentialIncluded" type="xs:boolean"/> + <xs:element name="DesignTypeWheelMotor" type="xs:boolean"/> + <xs:element name="NrOfDesignTypeWheelMotorMeasured" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:int"> + <xs:enumeration value="1"/> + <xs:enumeration value="2"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="Gears" type="v2.9:AbstractIEPCGearsDeclarationType"/> + <xs:element name="VoltageLevel" type="v2.9:ElectricMachineSystemVoltageLevelStandardValuesType"/> + <xs:element name="DragCurve"> + <xs:complexType> + <xs:sequence> + <xs:element name="Entry" type="v2.9:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="IEPCMeasuredDataDeclarationType"> <xs:complexContent> <xs:extension base="v2.9:AbstractIEPCDataType"> <xs:sequence> @@ -547,7 +766,7 @@ </xs:simpleType> </xs:element> <xs:element name="Gears" type="v2.9:AbstractIEPCGearsDeclarationType"/> - <xs:element name="VoltageLevel" type="v2.9:AbstractElectricMachineSystemVoltageLevelType" minOccurs="2" maxOccurs="unbounded"/> + <xs:element name="VoltageLevel" type="v2.9:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/> <xs:element name="DragCurve"> <xs:complexType> <xs:sequence> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/BatterySystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/BatterySystem_1.xml index 9b18a6e959..67b8d1107a 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/BatterySystem_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/BatterySystem_1.xml @@ -13,16 +13,16 @@ <JunctionboxIncluded>true</JunctionboxIncluded> <TestingTemperature>20</TestingTemperature> <OCV> - <Entry SoC="0.00" OCV="620.00"/> - <Entry SoC="100.00" OCV="640.00"/> + <Entry SoC="0" OCV="620.00"/> + <Entry SoC="100" OCV="640.00"/> </OCV> <InternalResistance> - <Entry SoC="0.00" R_2="10.00" R_10="11.00" R_20="12.00"/> - <Entry SoC="100.00" R_2="12.00" R_10="14.00" R_20="16.00"/> + <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/> + <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/> </InternalResistance> <CurrentLimits> - <Entry SoC="0.00" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/> - <Entry SoC="100.00" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/> + <Entry SoC="0" maxChagingCurrent="50.00" maxDischargingCurrent="0.00"/> + <Entry SoC="100" maxChagingCurrent="0.00" maxDischargingCurrent="50.00"/> </CurrentLimits> </v2.9:Data> <v2.9:Signature> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/CapacitorSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/CapacitorSystem_1.xml index b734b5fc33..c3c71d5ed1 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/CapacitorSystem_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/CapacitorSystem_1.xml @@ -1,31 +1 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> - <tns:CapacitorSystem xsi:type="v2.9:REESSComponentDeclarationType"> - <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="CapacitorDataType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> - <Manufacturer>a</Manufacturer> - <Model>a</Model> - <CertificationNumber>token</CertificationNumber> - <Date>2017-01-01T00:00:00Z</Date> - <AppVersion>aaaaa</AppVersion> - - <CertificationMethod>Measurement</CertificationMethod> - <Capacitance>1</Capacitance> - <InternalResistance>23.45</InternalResistance> - <MinVoltage>3.55</MinVoltage> - <MaxVoltage>30.45</MaxVoltage> - <MaxChargingCurrent>100.00</MaxChargingCurrent> - <MaxDischargingCurrent>99.45</MaxDischargingCurrent> - <TestingTemperature>30</TestingTemperature> - </v2.9:Data> - <v2.9:Signature> - <di:Reference URI="#ENG-gooZah3D"> - <di:Transforms> - <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> - <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> - </di:Transforms> - <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> - <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> - </di:Reference> - </v2.9:Signature> - </tns:CapacitorSystem> -</tns:VectoInputDeclaration> +<?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> <tns:CapacitorSystem xsi:type="v2.9:REESSComponentDeclarationType"> <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="CapacitorDataType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> <Manufacturer>a</Manufacturer> <Model>a</Model> <CertificationNumber>token</CertificationNumber> <Date>2017-01-01T00:00:00Z</Date> <AppVersion>aaaaa</AppVersion> <CertificationMethod>Measurement</CertificationMethod> <Capacitance>1.00</Capacitance> <InternalResistance>23.45</InternalResistance> <MinVoltage>3.55</MinVoltage> <MaxVoltage>30.45</MaxVoltage> <MaxChargingCurrent>100.00</MaxChargingCurrent> <MaxDischargingCurrent>99.45</MaxDischargingCurrent> <TestingTemperature>30</TestingTemperature> </v2.9:Data> <v2.9:Signature> <di:Reference URI="#ENG-gooZah3D"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> </di:Transforms> <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> </di:Reference> </v2.9:Signature> </tns:CapacitorSystem> </tns:VectoInputDeclaration> \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_1.xml index 742760ee7f..f5f08b10af 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> <tns:ElectricMachineSystem xsi:type="v2.9:ElectricMachineSystemComponentDeclarationType"> - <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="v2.9:ElectricMachineSystemDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> + <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> <Manufacturer>a</Manufacturer> <Model>a</Model> <CertificationNumber>token</CertificationNumber> @@ -19,7 +19,7 @@ <TestVoltageOverload>483</TestVoltageOverload> <DcDcConverterIncluded>true</DcDcConverterIncluded> <IHPCType>None</IHPCType> - <VoltageLevel xsi:type="v2.9:ElectricMachineSystemVoltageLevelType"> + <VoltageLevel> <Voltage>400</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> @@ -32,7 +32,7 @@ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> - <VoltageLevel xsi:type="v2.9:ElectricMachineSystemVoltageLevelType"> + <VoltageLevel> <Voltage>600</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_StdValues.xml new file mode 100644 index 0000000000..3ab8d90add --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/ElectricMachineSystem_StdValues.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> + <tns:ElectricMachineSystem xsi:type="v2.9:ElectricMachineSystemComponentDeclarationType"> + <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> + <Manufacturer>a</Manufacturer> + <Model>a</Model> + <CertificationNumber>token</CertificationNumber> + <Date>2017-01-01T00:00:00Z</Date> + <AppVersion>aaaaa</AppVersion> + <ElectricMachineType>ASM</ElectricMachineType> + <CertificationMethod>Measurement</CertificationMethod> + <R85RatedPower>1</R85RatedPower> + <RotationalInertia>0.10</RotationalInertia> + <ContinuousTorque>200.00</ContinuousTorque> + <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> + <OverloadTorque>400.00</OverloadTorque> + <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque> + <OverloadDuration>30.00</OverloadDuration> + <DcDcConverterIncluded>true</DcDcConverterIncluded> + <IHPCType>None</IHPCType> + <VoltageLevel> + <MaxTorqueCurve> + <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> + <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> + </MaxTorqueCurve> + <PowerMap> + <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> + <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> + <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> + <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> + </PowerMap> + </VoltageLevel> + <DragCurve> + <Entry outShaftSpeed="0.00" dragTorque="10.00"/> + <Entry outShaftSpeed="4000.00" dragTorque="30.00"/> + </DragCurve> + </v2.9:Data> + <v2.9:Signature> + <di:Reference URI="#ENG-gooZah3D"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> + </di:Reference> + </v2.9:Signature> + </tns:ElectricMachineSystem> +</tns:VectoInputDeclaration> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_1.xml index 9cc1836d04..bf7dd056f6 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_1.xml @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> <tns:IEPC xsi:type="v2.9:IEPCComponentDeclarationType"> <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="IEPCDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> <Manufacturer>a</Manufacturer> <Model>a</Model> <CertificationNumber>token</CertificationNumber> <Date>2017-01-01T00:00:00Z</Date> <AppVersion>aaaaa</AppVersion> <ElectricMachineType>ASM</ElectricMachineType> <CertificationMethod>Measured for complete component</CertificationMethod> <R85RatedPower>1</R85RatedPower> <RotationalInertia>0.10</RotationalInertia> <ContinuousTorque>200.00</ContinuousTorque> <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> <OverloadTorque>400.00</OverloadTorque> <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque> <OverloadDuration>30.00</OverloadDuration> <TestVoltageOverload>483</TestVoltageOverload> <DifferentialIncluded>false</DifferentialIncluded> <DesignTypeWheelMotor>true</DesignTypeWheelMotor> <Gears xsi:type="v2.9:IEPCGearsDeclarationType"> <Gear number="1"> <v2.0:Ratio>3.000</v2.0:Ratio> </Gear> <Gear number="2"> <v2.0:Ratio>1.000</v2.0:Ratio> <MaxOutShaftTorque>2000.00</MaxOutShaftTorque> </Gear> </Gears> <VoltageLevel xsi:type="v2.9:ElectricMachineSystemVoltageLevelType"> <Voltage>400</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> <VoltageLevel xsi:type="v2.9:ElectricMachineSystemVoltageLevelType"> <Voltage>600</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> <DragCurve> <Entry outShaftSpeed="0.00" dragTorque="10.00"/> <Entry outShaftSpeed="4000.00" dragTorque="30.00"/> </DragCurve> <Conditioning circuitId="0"> <Entry coolantTempInlet="30" coolingPower="5000"/> </Conditioning> </v2.9:Data> <v2.9:Signature> <di:Reference URI="#ENG-gooZah3D"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> </di:Transforms> <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> </di:Reference> </v2.9:Signature> </tns:IEPC> </tns:VectoInputDeclaration> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> <tns:IEPC xsi:type="v2.9:IEPCComponentDeclarationType"> <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="IEPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> <Manufacturer>a</Manufacturer> <Model>a</Model> <CertificationNumber>token</CertificationNumber> <Date>2017-01-01T00:00:00Z</Date> <AppVersion>aaaaa</AppVersion> <ElectricMachineType>ASM</ElectricMachineType> <CertificationMethod>Measured for complete component</CertificationMethod> <R85RatedPower>1</R85RatedPower> <RotationalInertia>0.10</RotationalInertia> <ContinuousTorque>200.00</ContinuousTorque> <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> <OverloadTorque>400.00</OverloadTorque> <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque> <OverloadDuration>30.00</OverloadDuration> <TestVoltageOverload>483</TestVoltageOverload> <DifferentialIncluded>false</DifferentialIncluded> <DesignTypeWheelMotor>true</DesignTypeWheelMotor> <Gears xsi:type="v2.9:IEPCGearsDeclarationType"> <Gear number="1"> <v2.0:Ratio>3.000</v2.0:Ratio> </Gear> <Gear number="2"> <v2.0:Ratio>1.000</v2.0:Ratio> <MaxOutShaftTorque>2000.00</MaxOutShaftTorque> </Gear> </Gears> <VoltageLevel> <Voltage>400</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> <VoltageLevel> <Voltage>600</Voltage> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> <DragCurve> <Entry outShaftSpeed="0.00" dragTorque="10.00"/> <Entry outShaftSpeed="4000.00" dragTorque="30.00"/> </DragCurve> <Conditioning circuitId="0"> <Entry coolantTempInlet="30" coolingPower="5000"/> </Conditioning> </v2.9:Data> <v2.9:Signature> <di:Reference URI="#ENG-gooZah3D"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> </di:Transforms> <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> </di:Reference> </v2.9:Signature> </tns:IEPC> </tns:VectoInputDeclaration> \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_StdValues.xml new file mode 100644 index 0000000000..d0ee61d1e8 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.9/IEPC_StdValues.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?> <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.9" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.9" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd"> <tns:IEPC xsi:type="v2.9:IEPCComponentDeclarationType"> <v2.9:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9" xsi:type="IEPCStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9"> <Manufacturer>a</Manufacturer> <Model>a</Model> <CertificationNumber>token</CertificationNumber> <Date>2017-01-01T00:00:00Z</Date> <AppVersion>aaaaa</AppVersion> <ElectricMachineType>ASM</ElectricMachineType> <CertificationMethod>Measured for complete component</CertificationMethod> <R85RatedPower>1</R85RatedPower> <RotationalInertia>0.10</RotationalInertia> <ContinuousTorque>200.00</ContinuousTorque> <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> <OverloadTorque>400.00</OverloadTorque> <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque> <OverloadDuration>30.00</OverloadDuration> <DifferentialIncluded>false</DifferentialIncluded> <DesignTypeWheelMotor>true</DesignTypeWheelMotor> <Gears xsi:type="v2.9:IEPCGearsDeclarationType"> <Gear number="1"> <v2.0:Ratio>3.000</v2.0:Ratio> </Gear> <Gear number="2"> <v2.0:Ratio>1.000</v2.0:Ratio> <MaxOutShaftTorque>2000.00</MaxOutShaftTorque> </Gear> </Gears> <VoltageLevel> <MaxTorqueCurve> <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/> <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/> <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/> <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/> </PowerMap> </VoltageLevel> <DragCurve> <Entry outShaftSpeed="0.00" dragTorque="10.00"/> <Entry outShaftSpeed="4000.00" dragTorque="30.00"/> </DragCurve> </v2.9:Data> <v2.9:Signature> <di:Reference URI="#ENG-gooZah3D"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> </di:Transforms> <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> <di:DigestValue>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue> </di:Reference> </v2.9:Signature> </tns:IEPC> </tns:VectoInputDeclaration> \ No newline at end of file diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index eb69112677..788c9dad60 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -92,7 +92,9 @@ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\BatterySystem_1.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\CapacitorSystem_1.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\ElectricMachineSystem_1.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\ElectricMachineSystem_StdValues.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\IEPC_1.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.9\IEPC_StdValues.xml" HomeFolder="Yes"/> </Folder> </Folder> <Folder FolderName="XSL Files" ExtStr="xsl;xslt"> -- GitLab