From 306d9abbe4565ba5bafe9cf7643926fa50a379c8 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 16 Mar 2022 15:52:12 +0100
Subject: [PATCH] applied namespace_adaptions.diff
---
.../XML/Sort/Component/Sorted/ADC.xml | 80 +++++++++---------
.../XML/Sort/Component/Sorted/Angledrive.xml | 68 +++++++--------
.../XML/Sort/Component/Sorted/Axlegear.xml | 82 +++++++++----------
.../Sort/Component/Sorted/BatterySystem_1.xml | 13 +--
.../Component/Sorted/CapacitorSystem_1.xml | 13 +--
.../Sorted/ElectricMachineSystem-IHPC_1.xml | 13 +--
.../Sorted/ElectricMachineSystem_1.xml | 13 +--
.../ElectricMachineSystem_StdValues.xml | 13 +--
.../XML/Sort/Component/Sorted/Engine.xml | 6 +-
.../Sort/Component/Sorted/Gearbox_APT-N.xml | 13 +--
.../XML/Sort/Component/Sorted/Gearbox_FWD.xml | 11 ++-
.../Sort/Component/Sorted/Gearbox_IHPC.xml | 13 +--
.../XML/Sort/Component/Sorted/IEPC_1.xml | 15 ++--
.../Sort/Component/Sorted/IEPC_StdValues.xml | 15 ++--
.../XML/Sort/Component/Sorted/Retarder.xml | 5 +-
.../Sort/Component/Sorted/TorqueConverter.xml | 5 +-
.../XML/Sort/Component/Unsorted/ADC.xml | 13 +--
.../Sort/Component/Unsorted/Angledrive.xml | 9 +-
.../XML/Sort/Component/Unsorted/Axlegear.xml | 9 +-
.../Component/Unsorted/BatterySystem_1.xml | 13 +--
.../Component/Unsorted/CapacitorSystem_1.xml | 13 +--
.../Unsorted/ElectricMachineSystem-IHPC_1.xml | 13 +--
.../Unsorted/ElectricMachineSystem_1.xml | 13 +--
.../ElectricMachineSystem_StdValues.xml | 13 +--
.../XML/Sort/Component/Unsorted/Engine.xml | 15 ++--
.../Sort/Component/Unsorted/Gearbox_APT-N.xml | 15 ++--
.../Sort/Component/Unsorted/Gearbox_FWD.xml | 13 +--
.../Sort/Component/Unsorted/Gearbox_IHPC.xml | 15 ++--
.../XML/Sort/Component/Unsorted/IEPC_1.xml | 15 ++--
.../Component/Unsorted/IEPC_StdValues.xml | 15 ++--
.../XML/Sort/Component/Unsorted/Retarder.xml | 5 +-
.../Component/Unsorted/TorqueConverter.xml | 5 +-
.../XSD/VectoDeclarationComponent.xsd | 2 +-
.../XSD/VectoDeclarationDefinitions.xsd | 4 +-
34 files changed, 328 insertions(+), 250 deletions(-)
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
index ee84f94747..5142f0fa55 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:ADC xsi:type="v2.10.1:ADCComponentDeclarationType" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
- <Data xsi:type="v2.10.1:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>ADC 20</Model>
- <CertificationNumber>ADC-20-CERT</CertificationNumber>
- <Date>2021-11-18T14:09:17.2810263Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <Ratio>0.035</Ratio>
- <CertificationMethod>Option 1</CertificationMethod>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
- <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
- <Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
- <Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
- <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
- <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
- </TorqueLossMap>
- </Data>
- <v2.10.1:Signature>
- <di:Reference URI="#ADC-123">
- <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>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
- </di:Reference>
- </v2.10.1:Signature>
- </tns:ADC>
-</tns:VectoInputDeclaration>
\ No newline at end of file
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 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:ADC>
+ <Data xsi:type="ADCDataDeclarationType" id="ADC-123">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>ADC 20</Model>
+ <CertificationNumber>ADC-20-CERT</CertificationNumber>
+ <Date>2021-11-18T14:09:17.2810263Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <Ratio>0.035</Ratio>
+ <CertificationMethod>Option 1</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+ </TorqueLossMap>
+ </Data>
+ <v2.3:Signature>
+ <di:Reference URI="#ADC-123">
+ <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>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </tns:ADC>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
index 39e854c73a..96bb94f5bc 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Angledrive xsi:type="v2.0:AngledriveComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>Generic Model</Model>
- <CertificationNumber>ANGL-1234</CertificationNumber>
- <Date>2021-11-18T14:09:17.2810263Z</Date>
- <AppVersion>aaaaa</AppVersion>
- <Ratio>1.123</Ratio>
- <CertificationMethod>Option 1</CertificationMethod>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
- <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
- <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
- <Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
- <Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
- <Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
- <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
- <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
- <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
- </TorqueLossMap>
- </v2.0:Data>
- <v2.0:Signature>
- <di:Reference URI="#ANGL-asdf">
- <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>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
- </di:Reference>
- </v2.0:Signature>
- </tns:Angledrive>
-</tns:VectoInputDeclaration>
\ No newline at end of file
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 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:Angledrive>
+ <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>ANGL-1234</CertificationNumber>
+ <Date>2021-11-18T14:09:17.2810263Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <Ratio>1.123</Ratio>
+ <CertificationMethod>Option 1</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ANGL-asdf">
+ <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>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </tns:Angledrive>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
index da6c072281..cf8c8b8002 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
@@ -1,42 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Axlegear xsi:type="v2.0:AxlegearComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxlegearDataDeclarationType" id="AXL-asdf">
- <Manufacturer>Generic Vendor</Manufacturer>
- <Model>Generic Model</Model>
- <CertificationNumber>AXL-AXL_12</CertificationNumber>
- <Date>2021-11-18T14:23:31.4958567Z</Date>
- <AppVersion>VectoCore</AppVersion>
- <LineType>Single portal axle</LineType>
- <Ratio>1.000</Ratio>
- <CertificationMethod>Measured</CertificationMethod>
- <TorqueLossMap>
- <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
- <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
- <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
- <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
- <Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
- <Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
- <Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
- <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
- <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
- <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
- <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
- </TorqueLossMap>
- </v2.0:Data>
- <v2.0:Signature>
- <di:Reference URI="#AXL-asdf">
- <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>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
- </di:Reference>
- </v2.0:Signature>
- </tns:Axlegear>
-</tns:VectoInputDeclaration>
\ No newline at end of file
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 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:Axlegear>
+ <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxlegearDataDeclarationType" id="AXL-asdf">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>AXL-AXL_12</CertificationNumber>
+ <Date>2021-11-18T14:23:31.4958567Z</Date>
+ <AppVersion>VectoCore</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>1.000</Ratio>
+ <CertificationMethod>Measured</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10"/>
+ <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10"/>
+ <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10"/>
+ <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10"/>
+ <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10"/>
+ <Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10"/>
+ <Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10"/>
+ <Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10"/>
+ <Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10"/>
+ <Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10"/>
+ <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10"/>
+ <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10"/>
+ <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10"/>
+ <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10"/>
+ <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-asdf">
+ <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>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </tns:Axlegear>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
index 3fd85377df..fd7cbcec65 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:BatterySystem xsi:type="v2.10.1:BatteryComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:BatterySystem>
+ <Data xsi:type="BatterySystemDataType" id="BAT-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -32,7 +35,7 @@
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
</CurrentLimits>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -41,6 +44,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:BatterySystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
index b321bdf540..c4ce096b91 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:CapacitorSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorSystemDataType" id="CAP-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="CapacitorSystemDataType" id="CAP-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -16,7 +19,7 @@
<MaxDischargingCurrent>99.45</MaxDischargingCurrent>
<TestingTemperature>30</TestingTemperature>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#CAP-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -25,6 +28,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:CapacitorSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
index 104df07c85..a24ceee877 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -135,7 +138,7 @@
<Entry coolantTempInlet="60" coolingPower="5000" />
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -144,6 +147,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
index 36faf7068f..792032d4c9 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -58,7 +61,7 @@
<Entry coolantTempInlet="60" coolingPower="6000"/>
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -67,6 +70,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
index f6bcf41ea7..e3b4a1e203 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -36,7 +39,7 @@
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -45,6 +48,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
index ee055d98ca..8a9435fef7 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Engine.xml
@@ -2,12 +2,12 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
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:Engine xsi:type="v2.0:EngineComponentDeclarationType">
- <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+ <tns:Engine>
+ <v2.0:Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
index d1e371dbad..4641569136 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_APT-N.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+ <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +12,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>APT-N</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -70,7 +73,7 @@
<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
index 0a7b582ec0..1958726849 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+ <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -11,7 +14,7 @@
<MainCertificationMethod>Standard values</MainCertificationMethod>
<DifferentialIncluded>true</DifferentialIncluded>
<AxlegearRatio>1.000</AxlegearRatio>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1000</MaxTorque>
@@ -78,7 +81,7 @@
<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
index 39a56cce34..3a97e70ea4 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_IHPC.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+ <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +12,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>IHPC Type 1</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -250,7 +253,7 @@
<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Gear>
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_1.xml
index fc7fd19717..f544437776 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:IEPCComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -13,7 +16,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
</Gear>
@@ -82,7 +85,7 @@
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -91,6 +94,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:IEPC>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_StdValues.xml
index d6bf3f3942..ef23096e37 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/IEPC_StdValues.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:IEPCComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -13,7 +16,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
</Gear>
@@ -44,7 +47,7 @@
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -53,6 +56,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:IEPC>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
index 8169afd313..1d80652030 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Retarder.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Retarder xsi:type="v2.0:RetarderComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderDataDeclarationType" id="RET-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
index 53ad316a1e..b35d1a2d46 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/TorqueConverter.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:TorqueConverter xsi:type="v2.0:TorqueConverterComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterDataDeclarationType" id="TC-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
index 8329c44b0b..82a85cb32a 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ADC.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:ADC xsi:type="v2.10.1:ADCComponentDeclarationType" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
- <Data xsi:type="v2.10.1:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:ADC>
+ <Data xsi:type="ADCDataDeclarationType" id="ADC-123">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>ADC 20</Model>
<CertificationNumber>ADC-20-CERT</CertificationNumber>
@@ -29,7 +32,7 @@
</TorqueLossMap>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#ADC-123">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -38,6 +41,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ADC>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
index 49b50bef46..552f22c2f7 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Angledrive xsi:type="v2.0:AngledriveComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Angledrive>
+ <v2.0:Data xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>ANGL-1234</CertificationNumber>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
index b62817b034..c426734c7d 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Axlegear.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Axlegear xsi:type="v2.0:AxlegearComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxlegearDataDeclarationType" id="AXL-asdf">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Axlegear>
+ <v2.0:Data xsi:type="AxlegearDataDeclarationType" id="AXL-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>AXL-AXL_12</CertificationNumber>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
index 49a8f85063..fcd0472874 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/BatterySystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:BatterySystem xsi:type="v2.10.1:BatteryComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:BatterySystem>
+ <Data xsi:type="BatterySystemDataType" id="BAT-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -33,7 +36,7 @@
</CurrentLimits>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -42,6 +45,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:BatterySystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/CapacitorSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/CapacitorSystem_1.xml
index b321bdf540..21b148cbb7 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/CapacitorSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/CapacitorSystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:CapacitorSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorSystemDataType" id="CAP-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="v2.3:CapacitorSystemDataType" id="CAP-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -16,7 +19,7 @@
<MaxDischargingCurrent>99.45</MaxDischargingCurrent>
<TestingTemperature>30</TestingTemperature>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#CAP-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -25,6 +28,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:CapacitorSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
index b2b7884b82..06324d4a11 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem-IHPC_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -150,7 +153,7 @@
<Entry coolantTempInlet="60" coolingPower="5000" />
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -159,6 +162,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
index 78ed082cfd..ec9d91255f 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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 >
+ <Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -60,7 +63,7 @@
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -69,6 +72,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
index 3fa78fe52d..548fda231c 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/ElectricMachineSystem_StdValues.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:ElectricMachineSystemComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -37,7 +40,7 @@
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
</DragCurve>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#EM-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -46,6 +49,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
index bfdfe35bbc..3d4ed867a6 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Engine.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
- 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:Engine xsi:type="v2.0:EngineComponentDeclarationType">
- <v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Engine>
+ <v2.0:Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
index 0f8d9961b6..e5a0aba1cf 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_APT-N.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox>
+ <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +12,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>APT-N</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -72,7 +75,7 @@
</TorqueLossMap>
</Gear>
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
index c253040d7f..0d30c4996a 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox>
+ <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -11,7 +14,7 @@
<MainCertificationMethod>Standard values</MainCertificationMethod>
<DifferentialIncluded>true</DifferentialIncluded>
<AxlegearRatio>1.000</AxlegearRatio>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="3">
<Ratio>9.020</Ratio>
<MaxTorque>1300</MaxTorque>
@@ -84,7 +87,7 @@
</TorqueLossMap>
</Gear>
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
index 300c2a12b4..bb5bb7730a 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_IHPC.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
- <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Gearbox>
+ <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>GB_12-gear</Model>
<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +12,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>IHPC Type 1</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -271,7 +274,7 @@
- </v2.10.1:Gears>
+ </v2.3:Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#GBX-asdf">
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_1.xml
index f539f7dcc3..43d0f8bdfe 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_1.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:IEPCComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -13,7 +16,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="IEPCGearsDeclarationType">
<Gear number="2">
<Ratio>1.000</Ratio>
<MaxOutShaftTorque>2000</MaxOutShaftTorque>
@@ -82,7 +85,7 @@
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -91,6 +94,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:IEPC>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_StdValues.xml
index 5b450a5298..ad911922da 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/IEPC_StdValues.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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.10.1:IEPCComponentDeclarationType">
- <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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>
+ <Data xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" >
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
@@ -13,7 +16,7 @@
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
- <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+ <Gears xsi:type="IEPCGearsDeclarationType">
<Gear number="2">
<Ratio>1.000</Ratio>
<MaxOutShaftTorque>2000</MaxOutShaftTorque>
@@ -45,7 +48,7 @@
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
</DragCurve>
</Data>
- <v2.10.1:Signature>
+ <Signature>
<di:Reference URI="#IEPC-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -54,6 +57,6 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=</di:DigestValue>
</di:Reference>
- </v2.10.1:Signature>
+ </Signature>
</tns:IEPC>
</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
index db417aa852..963ec79d30 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Retarder.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:Retarder xsi:type="v2.0:RetarderComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderDataDeclarationType" id="RET-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
index 43c7c70df4..66cc7ffe38 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/TorqueConverter.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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: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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+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:TorqueConverter xsi:type="v2.0:TorqueConverterComponentDeclarationType">
<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterDataDeclarationType" id="TC-asdf">
<Manufacturer>Generic Vendor</Manufacturer>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index f29249611a..0d565973a9 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" 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">
+<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">
<!--
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/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index 617872a0bd..8c17183962 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:v2.10c="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10j="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<!-- 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: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:v2.3" xmlns:v2.2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1" 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
--
GitLab