From 6052f120092b3384cee8249b0e428daa632c269d Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 16 Mar 2022 17:27:59 +0100
Subject: [PATCH] Job test files adapted to schema changes
---
.../Job/Sorted/HEV-S_heavyLorry_IEPC-S.xml | 93 ++++++------------
.../Job/Unsorted/HEV-S_heavyLorry_IEPC-S.xml | 97 ++++++-------------
.../VectoHashingTest/VectoJobHashSortTest.cs | 4 +-
.../XSD/VectoDeclarationComponent.xsd | 2 +-
VectoCore/VectoCore/VectoCore.csproj | 6 ++
5 files changed, 67 insertions(+), 135 deletions(-)
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Sorted/HEV-S_heavyLorry_IEPC-S.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Sorted/HEV-S_heavyLorry_IEPC-S.xml
index b114547014..479c338972 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Sorted/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Sorted/HEV-S_heavyLorry_IEPC-S.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
- xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" 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:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -17,9 +14,9 @@
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
- <v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
- <v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
+ <PTO xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="v2.4:PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
@@ -30,8 +27,8 @@
<ArchitectureID>S-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
- <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
- <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
@@ -46,54 +43,20 @@
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.01" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1001.00" maxTorque="300.00" minTorque="-300.00"/>
+ <v2.3:Entry outShaftSpeed="0.01" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1001.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.02" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1002.00" maxTorque="300.00" minTorque="-300.00"/>
+ <v2.3:Entry outShaftSpeed="0.02" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1002.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
- <ElectricMachine>
- <Position>2</Position>
- <VoltageLevel>
- <Voltage>200</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.03" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1003.00" maxTorque="300.00" minTorque="-300.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- <VoltageLevel>
- <Voltage>500</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.04" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1004.00" maxTorque="300.00" minTorque="-300.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- </ElectricMachine>
- <ElectricMachine>
- <Position>GEN</Position>
- <VoltageLevel>
- <Voltage>100</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- <VoltageLevel>
- <Voltage>500</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- </ElectricMachine>
</ElectricMotorTorqueLimits>
- <BoostingLimitations xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:BoostingLimitationsType">
+ <BoostingLimitations xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="v2.4:BoostingLimitationsType">
<Entry rotationalSpeed="0.10" boostingTorque="0.30"/>
<Entry rotationalSpeed="0.12" boostingTorque="0.40"/>
<Entry rotationalSpeed="1.30" boostingTorque="0.60"/>
@@ -146,7 +109,7 @@
<PowertrainPosition>GEN</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
- <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -202,8 +165,8 @@
<Entry coolantTempInlet="30" coolingPower="5000"/>
<Entry coolantTempInlet="40" coolingPower="5000"/>
</Conditioning>
- </v2.10.1:Data>
- <v2.10.1:Signature>
+ </v2.3:Data>
+ <v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -212,14 +175,14 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>gFUN+RoDzgSrZHc2r7bYZzaKgnqU9VWVbD2H0NeUqWc=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </v2.3:Signature>
</ElectricMachineSystem>
</ElectricMachineGEN>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
- <v2.10.2:Data xsi:type="BatterySystemDataType" id="REESS-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.4:Data xsi:type="BatterySystemDataType" id="REESS-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -243,8 +206,8 @@
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
- </v2.10.2:Data>
- <v2.10.2:Signature>
+ </v2.4:Data>
+ <Signature>
<di:Reference URI="#REESS-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -253,7 +216,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>1oSQlI5CZcN9ZgLkGNofXP4z7jld9gAIDGlsXryqoMM=</di:DigestValue>
</di:Reference>
- </v2.10.2:Signature>
+ </Signature>
</REESS>
<SOCmin>21</SOCmin>
<SOCmax>80</SOCmax>
@@ -261,7 +224,7 @@
<Battery>
<StringID>1</StringID>
<REESS>
- <v2.10.2:Data xsi:type="BatterySystemDataType" id="REESS-asdfg" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.4:Data xsi:type="BatterySystemDataType" id="REESS-asdfg" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -285,8 +248,8 @@
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
- </v2.10.2:Data>
- <v2.10.2:Signature>
+ </v2.4:Data>
+ <Signature>
<di:Reference URI="#REESS-asdfg">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -295,12 +258,12 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>vm6ZSTyOqaxiB7x+T3vpvFIMeM8wDIDiSta6JDI101k=</di:DigestValue>
</di:Reference>
- </v2.10.2:Signature>
+ </Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<IEPC>
- <v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -312,7 +275,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
</Gear>
@@ -380,8 +343,8 @@
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
- </v2.10.1:Data>
- <v2.10.1:Signature>
+ </v2.3:Data>
+ <v2.3:Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -390,7 +353,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>PwNmfGr07RNTd9qsy6Av/jl9rRCtve4sBrcqf9zDFU0=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </v2.3:Signature>
</IEPC>
<Retarder>
<!-- optional -->
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Unsorted/HEV-S_heavyLorry_IEPC-S.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Unsorted/HEV-S_heavyLorry_IEPC-S.xml
index da16aa272c..3a4e5c0f95 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Unsorted/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Job/Unsorted/HEV-S_heavyLorry_IEPC-S.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
- xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" 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:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+
<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -17,9 +15,9 @@
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
- <v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
- <v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
+ <PTO xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="v2.4:PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
@@ -30,8 +28,8 @@
<ArchitectureID>S-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
- <v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
- <v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
@@ -41,60 +39,25 @@
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
-
- <ElectricMachine>
- <Position>GEN</Position>
- <VoltageLevel>
- <Voltage>500</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
- <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- <VoltageLevel>
- <Voltage>100</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
- <v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- </ElectricMachine>
<ElectricMachine>
<Position>1</Position>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.02" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1002.00" maxTorque="300.00" minTorque="-300.00"/>
+ <v2.3:Entry outShaftSpeed="0.02" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1002.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="1001.00" maxTorque="300.00" minTorque="-300.00"/>
- <v2.10.1:Entry outShaftSpeed="0.01" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1001.00" maxTorque="300.00" minTorque="-300.00"/>
+ <v2.3:Entry outShaftSpeed="0.01" maxTorque="200.00" minTorque="-200.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
- <ElectricMachine>
- <Position>2</Position>
- <VoltageLevel>
- <Voltage>200</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="0.03" maxTorque="200.00" minTorque="-200.00"/>
- <v2.10.1:Entry outShaftSpeed="1003.00" maxTorque="300.00" minTorque="-300.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- <VoltageLevel>
- <Voltage>500</Voltage>
- <MaxTorqueCurve>
- <v2.10.1:Entry outShaftSpeed="1004.00" maxTorque="300.00" minTorque="-300.00"/>
- <v2.10.1:Entry outShaftSpeed="0.04" maxTorque="200.00" minTorque="-200.00"/>
- </MaxTorqueCurve>
- </VoltageLevel>
- </ElectricMachine>
- </ElectricMotorTorqueLimits>
- <BoostingLimitations xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:BoostingLimitationsType">
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="v2.4:BoostingLimitationsType">
<Entry rotationalSpeed="0.12" boostingTorque="0.40"/>
<Entry rotationalSpeed="0.10" boostingTorque="0.30"/>
<Entry rotationalSpeed="1.40" boostingTorque="0.60"/>
@@ -147,7 +110,7 @@
<PowertrainPosition>GEN</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
- <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -203,8 +166,8 @@
<Entry coolantTempInlet="40" coolingPower="5000"/>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
- </v2.10.1:Data>
- <v2.10.1:Signature>
+ </v2.3:Data>
+ <v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -213,14 +176,14 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>gFUN+RoDzgSrZHc2r7bYZzaKgnqU9VWVbD2H0NeUqWc=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </v2.3:Signature>
</ElectricMachineSystem>
</ElectricMachineGEN>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
- <v2.10.2:Data xsi:type="BatterySystemDataType" id="REESS-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.4:Data xsi:type="BatterySystemDataType" id="REESS-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -244,8 +207,8 @@
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
</CurrentLimits>
- </v2.10.2:Data>
- <v2.10.2:Signature>
+ </v2.4:Data>
+ <Signature>
<di:Reference URI="#REESS-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -254,7 +217,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>1oSQlI5CZcN9ZgLkGNofXP4z7jld9gAIDGlsXryqoMM=</di:DigestValue>
</di:Reference>
- </v2.10.2:Signature>
+ </Signature>
</REESS>
<SOCmin>21</SOCmin>
<SOCmax>80</SOCmax>
@@ -262,7 +225,7 @@
<Battery>
<StringID>1</StringID>
<REESS>
- <v2.10.2:Data xsi:type="BatterySystemDataType" id="REESS-asdfg" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.4:Data xsi:type="BatterySystemDataType" id="REESS-asdfg" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -286,8 +249,8 @@
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
</CurrentLimits>
- </v2.10.2:Data>
- <v2.10.2:Signature>
+ </v2.4:Data>
+ <Signature>
<di:Reference URI="#REESS-asdfg">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -296,12 +259,12 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>vm6ZSTyOqaxiB7x+T3vpvFIMeM8wDIDiSta6JDI101k=</di:DigestValue>
</di:Reference>
- </v2.10.2:Signature>
+ </Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<IEPC>
- <v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -313,7 +276,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
<Gear number="2">
<Ratio>1.000</Ratio>
<MaxOutShaftTorque>2000</MaxOutShaftTorque>
@@ -382,8 +345,8 @@
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
- </v2.10.1:Data>
- <v2.10.1:Signature>
+ </v2.3:Data>
+ <v2.3:Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -392,7 +355,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>PwNmfGr07RNTd9qsy6Av/jl9rRCtve4sBrcqf9zDFU0=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </v2.3:Signature>
</IEPC>
<Retarder>
<!-- optional -->
diff --git a/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs b/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
index 158c30237d..54137d9860 100644
--- a/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
@@ -17,8 +17,8 @@ namespace VectoHashingTest
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- [TestCase("NBawT5DzeZHW9gIupRB8uNtII+JYLP/JxgiMKMaskpg=", SortedComponentPath + "HEV-S_heavyLorry_IEPC-S.xml")]
- [TestCase("NBawT5DzeZHW9gIupRB8uNtII+JYLP/JxgiMKMaskpg=", UnsortedComponentPath + "HEV-S_heavyLorry_IEPC-S.xml")]
+ [TestCase("HpFMjk3vmSp7FuZD6FEyBmDyrix7ifdcrKI26a5qEiw=", SortedComponentPath + "HEV-S_heavyLorry_IEPC-S.xml")]
+ [TestCase("HpFMjk3vmSp7FuZD6FEyBmDyrix7ifdcrKI26a5qEiw=", UnsortedComponentPath + "HEV-S_heavyLorry_IEPC-S.xml")]
public void TestJobHashSort(string expectedJobHash, string filePath)
{
var loadedFile = VectoHash.Load(filePath);
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 0d565973a9..f29249611a 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:ns2="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for declaration input (i.e., job data) and all supported declaration definitions
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 29e9fae06c..d3772e735d 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -5,6 +5,10 @@
<TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
+ <ItemGroup>
+ <None Remove="Resources\XSD\VectoDeclarationDefinitions.2.2.1.xsd" />
+ <None Remove="Resources\XSD\VectoOutputPrimaryBus.xsd" />
+ </ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -53,6 +57,7 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
+ <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.2.1.xsd" />
<EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.0.6.xsd">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -64,6 +69,7 @@
<EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Resources\XSD\VectoOutputPrimaryBus.xsd" />
<EmbeddedResource Include="Resources\XSD\xmldsig-core-schema.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
--
GitLab