From ba6bca57f45efcf5f3547de6b36f45097e427d26 Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Mon, 20 Jun 2022 09:42:47 +0200
Subject: [PATCH] updated testfiles
---
...onventional_completed_bus.VIF_Report_3.xml | 14 ++++++------
...ultistage_consolidated_multiple_stages.xml | 22 +++++++++----------
...solidated_multiple_stages_NGTankSystem.xml | 22 +++++++++----------
...e_consolidated_multiple_stages_airdrag.xml | 22 +++++++++----------
..._consolidated_multiple_stages_heatPump.xml | 22 +++++++++----------
...stage_consolidated_multiple_stages_hev.xml | 22 +++++++++----------
...stage_consolidated_multiple_stages_vif.xml | 22 +++++++++----------
...ecto_multistage_consolidated_one_stage.xml | 22 +++++++++----------
...cto_multistage_consolidated_two_stages.xml | 22 +++++++++----------
...ge_conventional_final_vif.VIF_Report_1.xml | 2 +-
.../vecto_multistage_primary_vehicle_only.xml | 20 ++++++++---------
...o_multistage_primary_vehicle_stage_2_3.xml | 22 +++++++++----------
...tage_primary_vehicle_stage_2_3_group41.xml | 18 +++++++--------
...ultistage_primary_vehicle_stage_2_full.xml | 22 +++++++++----------
...tage_primary_vehicle_stage_2_mandatory.xml | 22 +++++++++----------
15 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
index 4a5db54cda..779001dfcd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
@@ -2,7 +2,7 @@
<tns:VectoOutputMultistage xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<tns:PrimaryVehicle>
<Data id="VEH-287da6b1275749ac832d" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -31,7 +31,7 @@
</tns:TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -67,14 +67,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -128,7 +128,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -139,7 +139,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -199,7 +199,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index 7a72a1a03e..738ac530ee 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index d3212ae3ce..2b6805c520 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -78,7 +78,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -86,7 +86,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -140,7 +140,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -155,7 +155,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -166,7 +166,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -178,7 +178,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -265,7 +265,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -631,7 +631,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -644,7 +644,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index f505ceb37b..cc342b4b8c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index 5043f42e58..8ab37cc3ce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index b3394584fe..38628a09ba 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 2ba8f57a74..3ebda336e4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index 3df6a06be5..c13114a284 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels >
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index cbc4aed54e..4ab9b87ac9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index beeefd4c23..34d30f0a04 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -8,7 +8,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-622a60d3b3cf4340a362" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Vehicle xsi:type="ConventionalConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 02f8cea034..7b30f3e6d5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -644,7 +644,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 6d9d45a69c..ec705312d4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -10,7 +10,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -40,7 +40,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -76,7 +76,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -84,7 +84,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -138,7 +138,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -153,7 +153,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -164,7 +164,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -176,7 +176,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -263,7 +263,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -629,7 +629,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -642,7 +642,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 1c107e6352..cea4aaff46 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -40,7 +40,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -78,14 +78,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>APT-S</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>3.364</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -116,7 +116,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -127,7 +127,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -187,7 +187,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -564,7 +564,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -577,7 +577,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 059e53b2bc..923b07c1e3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d11aff76c5d149948046">
+ <di:Reference URI="#VIF-d11aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 8de5353110..f81b15c5c1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</TorqueConverter>
<Angledrive>
- <Data xsi:type="AngledriveDataPIFType">
+ <Data xsi:type="AngledriveDataVIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Angledrive>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels >
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
<HashPreviousStep>
- <di:Reference URI="#PIF-d10aff76c5d149948046">
+ <di:Reference URI="#VIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
--
GitLab