diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
index f0adb5118159115cf53072f43ace7fff54a83f0b..401a69fedb1d10b79c98e8821c607e81221f2506 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
@@ -491,7 +491,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
}
mode = ExecutionMode.Declaration;
- } else if (XMLNames.VectoOutputMultistage.Equals(rootNode,
+ } else if (XMLNames.VectoOutputMultistep.Equals(rootNode,
StringComparison.InvariantCultureIgnoreCase)) {
using (var reader = XmlReader.Create(fullFileName)) {
input = new XMLDeclarationVIFInputData(xmlReader.Create(fullFileName) as IMultistageBusInputDataProvider, null);
diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
index 763bdcdb28383b04847b2be23018462e0cea6601..84ab012b9aa631e457782a9d876f8b703504fc97 100644
--- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
@@ -92,9 +92,8 @@
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.2" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Ninject" Version="3.3.4" />
- <PackageReference Include="NUnit" Version="3.12.0" />
- <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+ <PackageReference Include="NUnit" Version="3.11.0" />
+ <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
</ItemGroup>
<ItemGroup>
@@ -103,9 +102,6 @@
</ItemGroup>
<ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
- <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
- </Reference>
<Reference Include="PresentationFramework" />
</ItemGroup>
diff --git a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
index c9e480966fd5307e3873dd36de3b0b7f1a5c6eb4..5c59c3435d8a97fcc5c65fc631d244dab1ca12d8 100644
--- a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
+++ b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
@@ -48,7 +48,7 @@ namespace TUGraz.VectoCommon.Hashing
VectoOutput,
VectoCustomerInformation,
VectoPrimaryVehicleInformation,
- VectoManufacturingStage
+ VectoManufacturingStep
}
public static class VectoComponentsExtensionMethods
@@ -80,8 +80,8 @@ namespace TUGraz.VectoCommon.Hashing
return "VectoCustomerInformation";
case VectoComponents.VectoPrimaryVehicleInformation:
return "PrimaryVehicle";
- case VectoComponents.VectoManufacturingStage:
- return "ManufacturingStage";
+ case VectoComponents.VectoManufacturingStep:
+ return "ManufacturingStep";
default:
throw new ArgumentOutOfRangeException("VectoComponents", component, null);
}
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCommon.Hashing
return "PIF-";
case VectoComponents.Vehicle:
return "VEH-";
- case VectoComponents.VectoManufacturingStage:
+ case VectoComponents.VectoManufacturingStep:
return "MST-";
default:
throw new ArgumentOutOfRangeException("VectoComponents", component, null);
@@ -127,7 +127,7 @@ namespace TUGraz.VectoCommon.Hashing
case VectoComponents.VectoCustomerInformation:
case VectoComponents.VectoOutput:
case VectoComponents.VectoPrimaryVehicleInformation:
- case VectoComponents.VectoManufacturingStage:
+ case VectoComponents.VectoManufacturingStep:
return true;
default:
return false;
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index c6fcdf5e48e16127c60c10b7845fbc4050fe479a..f3546c1a059f8c71ec8548fb8646d12f7eb1d0dc 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -2662,20 +2662,47 @@ namespace TUGraz.VectoCommon.Resources {
}
/// <summary>
- /// Looks up a localized string similar to ManufacturingStage.
+ /// Looks up a localized string similar to ManufacturingStep.
/// </summary>
- public static string ManufacturingStage {
+ public static string ManufacturingStep {
get {
- return ResourceManager.GetString("ManufacturingStage", resourceCulture);
+ return ResourceManager.GetString("ManufacturingStep", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to stageCount.
+ /// Looks up a localized string similar to BusManufacturingStepDataType.
/// </summary>
- public static string ManufacturingStage_StageCount {
+ public static string ManufacturingStep_Bus_DataType {
get {
- return ResourceManager.GetString("ManufacturingStage_StageCount", resourceCulture);
+ return ResourceManager.GetString("ManufacturingStep_Bus_DataType", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to HashPreviousStep.
+ /// </summary>
+ public static string ManufacturingStep_HashPreviousStep {
+ get {
+ return ResourceManager.GetString("ManufacturingStep_HashPreviousStep", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to stepCount.
+ /// </summary>
+ public static string ManufacturingStep_StepCount {
+ get {
+ return ResourceManager.GetString("ManufacturingStep_StepCount", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to stepCount.
+ /// </summary>
+ public static string ManufacturingStep_stepCount_Attr {
+ get {
+ return ResourceManager.GetString("ManufacturingStep_stepCount_Attr", resourceCulture);
}
}
@@ -3760,11 +3787,11 @@ namespace TUGraz.VectoCommon.Resources {
}
/// <summary>
- /// Looks up a localized string similar to VectoOutputMultistage.
+ /// Looks up a localized string similar to VectoOutputMultistep.
/// </summary>
- public static string VectoOutputMultistage {
+ public static string VectoOutputMultistep {
get {
- return ResourceManager.GetString("VectoOutputMultistage", resourceCulture);
+ return ResourceManager.GetString("VectoOutputMultistep", resourceCulture);
}
}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 80d1724a7d4cfbdef3bb6da37249538e0263654f..1aa19eb2b02cfa2996130d45191120e241165445 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1416,17 +1416,17 @@
<data name="Bus_WaterElectricHeater" xml:space="preserve">
<value>WaterElectricHeater</value>
</data>
- <data name="VectoOutputMultistage" xml:space="preserve">
- <value>VectoOutputMultistage</value>
+ <data name="VectoOutputMultistep" xml:space="preserve">
+ <value>VectoOutputMultistep</value>
</data>
<data name="Bus_PrimaryVehicle" xml:space="preserve">
<value>PrimaryVehicle</value>
</data>
- <data name="ManufacturingStage" xml:space="preserve">
- <value>ManufacturingStage</value>
+ <data name="ManufacturingStep" xml:space="preserve">
+ <value>ManufacturingStep</value>
</data>
- <data name="ManufacturingStage_StageCount" xml:space="preserve">
- <value>stageCount</value>
+ <data name="ManufacturingStep_StepCount" xml:space="preserve">
+ <value>stepCount</value>
</data>
<data name="Bus_DeclarationType" xml:space="preserve">
<value>DeclarationType</value>
@@ -1572,12 +1572,12 @@
<data name="BusAux_Technology" xml:space="preserve">
<value>Technology</value>
</data>
-<data name="BusHVACHeatPumpCooling" xml:space="preserve">
- <value>Cooling</value>
-</data>
-<data name="BusHVACHeatPumpHeating" xml:space="preserve">
- <value>Heating</value>
-</data>
+ <data name="BusHVACHeatPumpCooling" xml:space="preserve">
+ <value>Cooling</value>
+ </data>
+ <data name="BusHVACHeatPumpHeating" xml:space="preserve">
+ <value>Heating</value>
+ </data>
<data name="Exempted_SumNetPower" xml:space="preserve">
<value>SumNetPower</value>
</data>
@@ -1587,4 +1587,13 @@
<data name="VehicleTypeApprovalNumber" xml:space="preserve">
<value>VehicleTypeApprovalNumber</value>
</data>
+ <data name="ManufacturingStep_HashPreviousStep" xml:space="preserve">
+ <value>HashPreviousStep</value>
+ </data>
+ <data name="ManufacturingStep_stepCount_Attr" xml:space="preserve">
+ <value>stepCount</value>
+ </data>
+ <data name="ManufacturingStep_Bus_DataType" xml:space="preserve">
+ <value>BusManufacturingStepDataType</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index f7e9cbaf24a0c5bf918d264651141ec90e61e144..743eb743896abae20140ac657423dc16f507ec5e 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -292,8 +292,8 @@ namespace TUGraz.VectoHashing
if (Document.DocumentElement.LocalName.Equals("VectoOutputPrimaryVehicle")) {
return VectoComponents.VectoPrimaryVehicleInformation;
}
- if (Document.DocumentElement.LocalName.Equals(XMLNames.ManufacturingStage)) {
- return VectoComponents.VectoManufacturingStage;
+ if (Document.DocumentElement.LocalName.Equals(XMLNames.ManufacturingStep)) {
+ return VectoComponents.VectoManufacturingStep;
}
throw new Exception("unknown document structure! neither input data nor output data format");
}
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/final.VIF_Report_5.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/final.VIF_Report_5.xml
index 22abd19676c4ad6431007b2975b21b056211ab81..5a89f405dae41ad73da95c3142075e0998a539d2 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/final.VIF_Report_5.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/final.VIF_Report_5.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.10="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">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-88dcf76d37a64b5eaf70" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -571,9 +572,9 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-bdbd4d15937b460bac07">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-bdbd4d15937b460bac07">
+ <HashPreviousStep>
<di:Reference URI="#VEH-88dcf76d37a64b5eaf70">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -582,34 +583,38 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>4MFxDdYDnYyRrUdyIPFhEYwbyqqJl3MlYtXMaB/RQis=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-75e3023cd8384f3c9895">
- <v2.8:Manufacturer>IVT</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>Inffeldgasse 19</v2.8:ManufacturerAddress>
- <v2.8:VIN>VIN-1234</v2.8:VIN>
- <v2.8:Date>2021-06-07T22:00:00Z</v2.8:Date>
- <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
- <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
- <v2.8:Auxiliaries>
- <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
- <v2.8:ElectricSystem>
- <v2.8:LEDLights>
- <v2.8:Interiorlights>false</v2.8:Interiorlights>
- <v2.8:Positionlights>false</v2.8:Positionlights>
- <v2.8:Headlights>false</v2.8:Headlights>
- </v2.8:LEDLights>
- </v2.8:ElectricSystem>
- <v2.8:HVAC>
- <v2.8:SystemConfiguration>0</v2.8:SystemConfiguration>
- <v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
- <v2.8:HeatPumpModeDriverCompartment>cooling</v2.8:HeatPumpModeDriverCompartment>
- <v2.8:HeatPumpTypePassengerCompartment>non R-744 4-stage</v2.8:HeatPumpTypePassengerCompartment>
- <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
- </v2.8:HVAC>
- </v2.8:Data>
- </v2.8:Auxiliaries>
- </v2.8:Components>
- </Vehicle>
+ </HashPreviousStep>
+ <vif:Vehicle xsi:type="v2.10:Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-75e3023cd8384f3c9895" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <Manufacturer>IVT</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <VIN>VIN-1234</VIN>
+ <Date>2021-06-07T22:00:00Z</Date>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Positionlights>false</Positionlights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>0</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
<Date>2021-06-08T19:16:37.2732909Z</Date>
@@ -622,34 +627,34 @@
<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>Gf8zuIFbnoV0Uu7vMHJNxr7tiV12rS/TdX0+WzDS8z8=</di:DigestValue>
+ <di:DigestValue>ZwduOHBrWk8hYhDvEzXNmjr/nWhhdx98Gl7a2qhYmFk=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-853f372b8a2f4acaa8d2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-853f372b8a2f4acaa8d2">
+ <HashPreviousStep>
<di:Reference URI="#MST-bdbd4d15937b460bac07">
<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>Gf8zuIFbnoV0Uu7vMHJNxr7tiV12rS/TdX0+WzDS8z8=</di:DigestValue>
+ <di:DigestValue>ZwduOHBrWk8hYhDvEzXNmjr/nWhhdx98Gl7a2qhYmFk=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-3a0b04069aee4b10b8dd">
- <v2.8:Manufacturer>TUG</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>Inffeldgasse 19</v2.8:ManufacturerAddress>
- <v2.8:VIN>VIN-1234</v2.8:VIN>
- <v2.8:Date>2021-06-07T22:00:00Z</v2.8:Date>
- <v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
- <v2.8:VehicleLength>12000</v2.8:VehicleLength>
- <v2.8:VehicleWidth>2550</v2.8:VehicleWidth>
- <v2.8:EntranceHeight>250</v2.8:EntranceHeight>
- <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
- <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag>
+ </HashPreviousStep>
+ <vif:Vehicle xsi:type="v2.10:Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-3a0b04069aee4b10b8dd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <Manufacturer>TUG</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <VIN>VIN-1234</VIN>
+ <Date>2021-06-07T22:00:00Z</Date>
+ <HeightIntegratedBody>3000</HeightIntegratedBody>
+ <VehicleLength>12000</VehicleLength>
+ <VehicleWidth>2550</VehicleWidth>
+ <EntranceHeight>250</EntranceHeight>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
@@ -670,9 +675,9 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
- </v2.8:AirDrag>
- </v2.8:Components>
- </Vehicle>
+ </AirDrag>
+ </Components>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
<Date>2021-06-08T19:17:10.0533609Z</Date>
@@ -685,47 +690,47 @@
<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>8SinxaBKYPZvF7ntzAqO1EdTE/QiWp+yr8/e0wUO/DA=</di:DigestValue>
+ <di:DigestValue>uNSPX5uJ1VVA/5aaibqX/S+yeMthh5Fbq73kCNi8b5E=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-4e4b3629643e459d9c2c">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-4e4b3629643e459d9c2c">
+ <HashPreviousStep>
<di:Reference URI="#MST-853f372b8a2f4acaa8d2">
<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>8SinxaBKYPZvF7ntzAqO1EdTE/QiWp+yr8/e0wUO/DA=</di:DigestValue>
+ <di:DigestValue>uNSPX5uJ1VVA/5aaibqX/S+yeMthh5Fbq73kCNi8b5E=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-5a6a0d735e1d4eb88b87">
- <v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>Infinite Loop 1</v2.8:ManufacturerAddress>
- <v2.8:VIN>VEH-1234567890</v2.8:VIN>
- <v2.8:Date>2021-06-07T22:00:00Z</v2.8:Date>
- <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
- <v2.8:CorrectedActualMass>10680</v2.8:CorrectedActualMass>
- <v2.8:TechnicalPermissibleMaximumLadenMass>18000</v2.8:TechnicalPermissibleMaximumLadenMass>
- <v2.8:AirdragModifiedMultistage>true</v2.8:AirdragModifiedMultistage>
- <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
- <v2.8:ClassBus>II</v2.8:ClassBus>
- <v2.8:NumberPassengerSeatsLowerDeck>86</v2.8:NumberPassengerSeatsLowerDeck>
- <v2.8:NumberPassengersStandingLowerDeck>0</v2.8:NumberPassengersStandingLowerDeck>
- <v2.8:NumberPassengerSeatsUpperDeck>0</v2.8:NumberPassengerSeatsUpperDeck>
- <v2.8:NumberPassengersStandingUpperDeck>0</v2.8:NumberPassengersStandingUpperDeck>
- <v2.8:BodyworkCode>CE</v2.8:BodyworkCode>
- <v2.8:LowEntry>true</v2.8:LowEntry>
- <v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
- <v2.8:VehicleLength>10633</v2.8:VehicleLength>
- <v2.8:VehicleWidth>2550</v2.8:VehicleWidth>
- <v2.8:EntranceHeight>270</v2.8:EntranceHeight>
- <v2.8:DoorDriveTechnology>pneumatic</v2.8:DoorDriveTechnology>
- <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
- <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag>
+ </HashPreviousStep>
+ <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-5a6a0d735e1d4eb88b87" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-07T22:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>10680</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <ClassBus>II</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem>
+ <NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CE</BodyworkCode>
+ <LowEntry>true</LowEntry>
+ <HeightIntegratedBody>3000</HeightIntegratedBody>
+ <VehicleLength>10633</VehicleLength>
+ <VehicleWidth>2550</VehicleWidth>
+ <EntranceHeight>270</EntranceHeight>
+ <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType" >
+ <AirDrag>
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -746,33 +751,37 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
- </v2.8:AirDrag>
- <v2.8:Auxiliaries>
- <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
- <v2.8:ElectricSystem>
- <v2.8:LEDLights>
- <v2.8:Interiorlights>true</v2.8:Interiorlights>
- <v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
- <v2.8:Positionlights>true</v2.8:Positionlights>
- <v2.8:Brakelights>true</v2.8:Brakelights>
- <v2.8:Headlights>true</v2.8:Headlights>
- </v2.8:LEDLights>
- </v2.8:ElectricSystem>
- <v2.8:HVAC>
- <v2.8:SystemConfiguration>6</v2.8:SystemConfiguration>
- <v2.8:HeatPumpTypeDriverCompartment>none</v2.8:HeatPumpTypeDriverCompartment>
- <v2.8:HeatPumpModeDriverCompartment>N.A.</v2.8:HeatPumpModeDriverCompartment>
- <v2.8:HeatPumpTypePassengerCompartment>non R-744 2-stage</v2.8:HeatPumpTypePassengerCompartment>
- <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
- <v2.8:AuxiliaryHeaterPower>15000</v2.8:AuxiliaryHeaterPower>
- <v2.8:DoubleGlazing>true</v2.8:DoubleGlazing>
- <v2.8:AdjustableAuxiliaryHeater>false</v2.8:AdjustableAuxiliaryHeater>
- <v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
- </v2.8:HVAC>
- </v2.8:Data>
- </v2.8:Auxiliaries>
- </v2.8:Components>
- </Vehicle>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>true</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>true</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>6</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>none</Cooling>
+ <Heating>not applicable</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
+ <DoubleGlazing>true</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
<Date>2021-06-08T19:17:34.7076217Z</Date>
@@ -785,31 +794,31 @@
<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>tFVU88I1bcALZmtSUnTM5c9ue8L1NstlboChNj2NBOc=</di:DigestValue>
+ <di:DigestValue>HLykOvb1YHr6fg3CpZLY9TuJhyT6xiRO8WhjdWITnBk=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="5">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-67c850fef6ac40c8be1f">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="5">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-67c850fef6ac40c8be1f">
+ <HashPreviousStep>
<di:Reference URI="#MST-4e4b3629643e459d9c2c">
<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>tFVU88I1bcALZmtSUnTM5c9ue8L1NstlboChNj2NBOc=</di:DigestValue>
+ <di:DigestValue>HLykOvb1YHr6fg3CpZLY9TuJhyT6xiRO8WhjdWITnBk=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-2d3ccda8f72345568864">
- <v2.8:Manufacturer>Somebody</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>Address</v2.8:ManufacturerAddress>
- <v2.8:VIN>VIN-1234</v2.8:VIN>
- <v2.8:Date>2021-06-07T22:00:00Z</v2.8:Date>
- <v2.8:AirdragModifiedMultistage>true</v2.8:AirdragModifiedMultistage>
- <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
- <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag>
+ </HashPreviousStep>
+ <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-2d3ccda8f72345568864" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <Manufacturer>Somebody</Manufacturer>
+ <ManufacturerAddress>Address</ManufacturerAddress>
+ <VIN>VIN-1234</VIN>
+ <Date>2021-06-07T22:00:00Z</Date>
+ <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
<v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
@@ -830,9 +839,9 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
- </v2.8:AirDrag>
- </v2.8:Components>
- </Vehicle>
+ </AirDrag>
+ </Components>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
<Date>2021-06-08T19:18:29.4586936Z</Date>
@@ -845,8 +854,8 @@
<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>UgLuCebJJ9KWYO9tDVVuLjlGRvC5qfsZudmyZQWJiic=</di:DigestValue>
+ <di:DigestValue>XaMrkmy7yiWYS1BSOtq5UulfM+7c70oCyWi4oasX8Pw=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
\ No newline at end of file
+ </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 25f603ea99e35ce43fd01a44b2bf8917aa71a3d8..162dae3689fd9f8892ec59e3c8f5f2b391c4047d 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
@@ -572,9 +572,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -583,7 +583,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>VTu71FU/Sijqk2Z8sScROGolObZK/UNTycf4K2CAgEs=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
@@ -606,10 +606,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>Muaefd8RS+EjtmMVbSejxbSy5Tgcpm/WqnoLk+YH8ho=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#MSTG-1">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -618,7 +618,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Muaefd8RS+EjtmMVbSejxbSy5Tgcpm/WqnoLk+YH8ho=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
<v2.8:ManufacturerAddress></v2.8:ManufacturerAddress>
@@ -641,5 +641,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>l7Z22F1bPMaAD4+0WNY+cahbjDKE80gxYv6K91YTMcU=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs
index 3609921c551eeb4a2dd52b52707941a2df7db10b..7166eb4ed1b14e10ec8c82458ca885475ee7f172 100644
--- a/VectoCommon/VectoHashingTest/VectoHashTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs
@@ -569,9 +569,9 @@ namespace VectoHashingTest
{
var h = VectoHash.Load(file);
- var primaryHash = h.ComputeHash(VectoComponents.VectoManufacturingStage, 0);
+ var primaryHash = h.ComputeHash(VectoComponents.VectoManufacturingStep, 0);
- Assert.AreEqual("Muaefd8RS+EjtmMVbSejxbSy5Tgcpm/WqnoLk+YH8ho=", primaryHash);
+ Assert.AreEqual("Ce88HeMkWznnWAYoilvoYNbzrALiWyImvTVsW9Myno0=", primaryHash);
}
@@ -580,9 +580,9 @@ namespace VectoHashingTest
{
var h = VectoHash.Load(file);
- var primaryHash = h.ComputeHash(VectoComponents.VectoManufacturingStage, 1);
+ var primaryHash = h.ComputeHash(VectoComponents.VectoManufacturingStep, 1);
- Assert.AreEqual("l7Z22F1bPMaAD4+0WNY+cahbjDKE80gxYv6K91YTMcU=", primaryHash);
+ Assert.AreEqual("ErE9njkgNIeg+SaPkbvpLfBQSTmw/WTDvmirEmzll2s=", primaryHash);
}
@@ -591,7 +591,7 @@ namespace VectoHashingTest
{
var h = VectoHash.Load(file);
- var primaryHash = h.ReadHash(VectoComponents.VectoManufacturingStage, 0);
+ var primaryHash = h.ReadHash(VectoComponents.VectoManufacturingStep, 0);
Assert.AreEqual("Muaefd8RS+EjtmMVbSejxbSy5Tgcpm/WqnoLk+YH8ho=", primaryHash);
}
@@ -602,7 +602,7 @@ namespace VectoHashingTest
{
var h = VectoHash.Load(file);
- var primaryHash = h.ReadHash(VectoComponents.VectoManufacturingStage, 1);
+ var primaryHash = h.ReadHash(VectoComponents.VectoManufacturingStep, 1);
Assert.AreEqual("l7Z22F1bPMaAD4+0WNY+cahbjDKE80gxYv6K91YTMcU=", primaryHash);
}
@@ -618,23 +618,23 @@ namespace VectoHashingTest
Assert.AreEqual(hashReadPrimary, hashCalcPrimary);
- var hashCalcInterim1 = h.ComputeHash(VectoComponents.VectoManufacturingStage, 0);
- var hashReadInterim1 = h.ReadHash(VectoComponents.VectoManufacturingStage, 0);
+ var hashCalcInterim1 = h.ComputeHash(VectoComponents.VectoManufacturingStep, 0);
+ var hashReadInterim1 = h.ReadHash(VectoComponents.VectoManufacturingStep, 0);
Assert.AreEqual(hashReadInterim1, hashCalcInterim1);
- var hashCalcInterim2 = h.ComputeHash(VectoComponents.VectoManufacturingStage, 1);
- var hashReadInterim2 = h.ReadHash(VectoComponents.VectoManufacturingStage, 1);
+ var hashCalcInterim2 = h.ComputeHash(VectoComponents.VectoManufacturingStep, 1);
+ var hashReadInterim2 = h.ReadHash(VectoComponents.VectoManufacturingStep, 1);
Assert.AreEqual(hashReadInterim2, hashCalcInterim2);
- var hashCalcInterim3 = h.ComputeHash(VectoComponents.VectoManufacturingStage, 2);
- var hashReadInterim3 = h.ReadHash(VectoComponents.VectoManufacturingStage, 2);
+ var hashCalcInterim3 = h.ComputeHash(VectoComponents.VectoManufacturingStep, 2);
+ var hashReadInterim3 = h.ReadHash(VectoComponents.VectoManufacturingStep, 2);
Assert.AreEqual(hashReadInterim3, hashCalcInterim3);
- var hashCalcInterim4 = h.ComputeHash(VectoComponents.VectoManufacturingStage, 3);
- var hashReadInterim4 = h.ReadHash(VectoComponents.VectoManufacturingStage, 3);
+ var hashCalcInterim4 = h.ComputeHash(VectoComponents.VectoManufacturingStep, 3);
+ var hashReadInterim4 = h.ReadHash(VectoComponents.VectoManufacturingStep, 3);
Assert.AreEqual(hashReadInterim4, hashCalcInterim4);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index e65ddef508ad1f130fa9d3a3b00ecb82d12257c0..78890a6d9bfa1975e4c02a588ae88fce3061143d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public static readonly XNamespace NAMESPACE_URI =
XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "VectoOutputMultistageType";
+ public const string XSD_TYPE = "VectoOutputMultistepType";
public static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public static readonly XNamespace NAMESPACE_URI =
XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "VectoOutputMultistageType";
+ public const string XSD_TYPE = "VectoOutputMultistepType";
public static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -176,7 +176,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "ManufacturingStageType";
+ public const string XSD_TYPE = "ManufacturingStepType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -199,9 +199,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public DigestData HashPreviousStage =>
_hashPreviousStage ??
- (_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
+ (_hashPreviousStage = Reader.GetDigestData(GetNode(XMLNames.ManufacturingStep_HashPreviousStep)));
- public int StageCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_StageCount));
+ public int StageCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStep_StepCount));
public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.Vehicle);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 7b5f2623a832e5b08d785f6a6f44857ec5b3af10..b27a3256933be8e91b6d72a990ffbc6281b04027 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "VectoOutputMultistageType";
+ public const string XSD_TYPE = "VectoOutputMultistepType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -44,7 +44,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
InputData = inputData;
}
- public IDeclarationMultistageJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOutputMultistage, JobCreator));
+ public IDeclarationMultistageJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOutputMultistep, JobCreator));
protected virtual IDeclarationMultistageJobInputData JobCreator(string version, XmlNode node, string arg3)
{
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "VectoOutputMultistageType";
+ public const string XSD_TYPE = "VectoOutputMultistepType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
private void SetManufacturingStageNodes()
{
- _manufacturingNodeStages = BaseNode.SelectNodes(XMLHelper.QueryLocalName(XMLNames.ManufacturingStage));
+ _manufacturingNodeStages = BaseNode.SelectNodes(XMLHelper.QueryLocalName(XMLNames.ManufacturingStep));
}
}
@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "ManufacturingStageType";
+ public const string XSD_TYPE = "ManufacturingStepType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 46971eb66c3f9ea5b4688c75b48bb5e848af4ed8..7191f161ded579977ca24be61dc16682e8246e3c 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
{
if(xElement.Name.LocalName == XMLNames.Bus_PrimaryVehicle)
_primaryVehicle = xElement;
- else if (xElement.Name.LocalName == XMLNames.ManufacturingStage)
+ else if (xElement.Name.LocalName == XMLNames.ManufacturingStep)
_manufacturingStages.Add(xElement);
}
@@ -140,7 +140,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return;
XmlAttributeCollection namespaceAttributes = null;
foreach (var node in nodes) {
- if (node.LocalName == XMLNames.VectoOutputMultistage) {
+ if (node.LocalName == XMLNames.VectoOutputMultistep) {
namespaceAttributes = node.Attributes;
break;
}
@@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
_namespaceAttributes.Add(new XAttribute(XNamespace.Xmlns + "tns", tns));
var retVal = new XDocument();
retVal.Add(
- new XElement(tns + XMLNames.VectoOutputMultistage,
+ new XElement(tns + XMLNames.VectoOutputMultistep,
_namespaceAttributes,
//new XAttribute(XNamespace.Xmlns + "tns", tns),
_primaryVehicle,
@@ -207,13 +207,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
private XElement GenerateInputManufacturingStage()
{
- var multistageId = $"{VectoComponents.VectoManufacturingStage.HashIdPrefix()}{GetGUID()}";
+ var multistageId = $"{VectoComponents.VectoManufacturingStep.HashIdPrefix()}{GetGUID()}";
var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
- var stage = new XElement(tns + XMLNames.ManufacturingStage,
- new XAttribute("stageCount", GetStageNumber()),
+ var stage = new XElement(tns + XMLNames.ManufacturingStep,
+ new XAttribute(XMLNames.ManufacturingStep_stepCount_Attr, GetStageNumber()),
new XElement(tns + XMLNames.Report_DataWrap,
- new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStageDataType"),
+ new XAttribute(xsi + XMLNames.Attr_Type, XMLNames.ManufacturingStep_Bus_DataType),
new XAttribute(XMLNames.Component_ID_Attr, multistageId),
new XAttribute("xmlns", tns),
GetHashPreviousStageElement(),
@@ -243,7 +243,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
digitData = _manufacturingStageInputData.Last().Signature;
}
- return new XElement(tns + "HashPreviousStage",
+ return new XElement(tns + "HashPreviousStep",
digitData.ToXML(di));
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
index 17fc8e93280cc2741ae97eebdbf7770a24f543de..1de246e4ae77686e7a8acc8836134bebb3b73c37 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
{
var retVal = new XDocument();
retVal.Add(
- new XElement(tns + XMLNames.VectoOutputMultistage,
+ new XElement(tns + XMLNames.VectoOutputMultistep,
new XAttribute(XNamespace.Xmlns + "di", di),
new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
new XAttribute(XNamespace.Xmlns + "vif0.1", tns),
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index 0af141c2e7e605b874ffdc4476c836980289f902..8edb3bc791fb4f0132d9f139acf2b7106e350b9e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -8,7 +8,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaLocation="VectoDeclarationDefinitions.2.10.2_JobInputData.xsd"/>
- <xs:element name="VectoOutputMultistage" type="vif:VectoOutputMultistageType">
+ <xs:element name="VectoOutputMultistep" type="vif:VectoOutputMultistepType">
<xs:annotation>
<xs:documentation>Comment describing your root element</xs:documentation>
</xs:annotation>
@@ -19,7 +19,7 @@
<xs:complexType name="AbstractAxleWheelsComponentPIFType" abstract="true"/>
<xs:complexType name="AbstractAxleWheelsDataPIFType" abstract="true"/>
<xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractManufacturingStageDataType" abstract="true">
+ <xs:complexType name="AbstractManufacturingStepDataType" abstract="true">
<xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:complexType>
<xs:complexType name="AbstractPrimaryVehicleType" abstract="true"/>
@@ -105,13 +105,13 @@
<xs:restriction base="xs:string">
<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
<xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
- <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 stages"/>
- <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 stages"/>
+ <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 steps"/>
+ <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 steps"/>
<xs:enumeration value="Crankshaft mounted - On/off clutch"/>
<xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
<xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
- <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 stages"/>
- <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 stages"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 steps"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 steps"/>
<xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/>
<xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
<xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
@@ -366,11 +366,11 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="BusManufacturingStageDataType">
+ <xs:complexType name="BusManufacturingStepDataType">
<xs:complexContent>
- <xs:extension base="vif:AbstractManufacturingStageDataType">
+ <xs:extension base="vif:AbstractManufacturingStepDataType">
<xs:sequence>
- <xs:element name="HashPreviousStage" type="v1.0:SignatureType"/>
+ <xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
<xs:element name="Vehicle" type="v2.10.2:AbstractCompletedBusVehicleType"/>
<xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
</xs:sequence>
@@ -471,12 +471,12 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
- <xs:complexType name="ManufacturingStageType">
+ <xs:complexType name="ManufacturingStepType">
<xs:sequence>
- <xs:element name="Data" type="vif:AbstractManufacturingStageDataType"/>
+ <xs:element name="Data" type="vif:AbstractManufacturingStepDataType"/>
<xs:element name="Signature" type="v1.0:SignatureType"/>
</xs:sequence>
- <xs:attribute name="stageCount" use="required">
+ <xs:attribute name="stepCount" use="required">
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="2"/>
@@ -721,10 +721,10 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="VectoOutputMultistageType">
+ <xs:complexType name="VectoOutputMultistepType">
<xs:sequence>
<xs:element name="PrimaryVehicle" type="vif:PrimaryVehicleType"/>
- <xs:element name="ManufacturingStage" type="vif:ManufacturingStageType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="ManufacturingStep" type="vif:ManufacturingStepType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VehicleComponentsPIFType">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
index cd3ff1b79fcba880420809855d0a7678992b8652..9ba5e496bdee0b24f9ff5ca7327129af5da8a128 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Kober (Technische Universität Graz) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs
index a8719f08c930acb47c812d60eb2bf051bd805afc..a521516e7f6851236701827190c0d206cc42f8a8 100644
--- a/VectoCore/VectoCore/Utils/XMLHelper.cs
+++ b/VectoCore/VectoCore/Utils/XMLHelper.cs
@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Utils
case "VectoInputEngineering": return XmlDocumentType.EngineeringJobData;
case "VectoComponentEngineering": return XmlDocumentType.EngineeringComponentData;
//case "VectoOutputPrimaryVehicle": return XmlDocumentType.PrimaryVehicleBusOutputData;
- case "VectoOutputMultistage": return XmlDocumentType.MultistageOutputData;
+ case "VectoOutputMultistep": return XmlDocumentType.MultistageOutputData;
}
return null;
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 4bbd3da184097a875552d5c8a3e2ceb4280d1dd5..6a306896bb740660d975faa9ece01ac5a50c1d68 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -242,7 +242,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
- <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <SizeOfAirSupply>Large Supply 2-step</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
@@ -578,15 +578,15 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
+ </HashPreviousStep>
+ <vif0.1:Vehicle xsi:type="v2.10:Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -595,7 +595,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>8300</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
- <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
<ClassBus>I+II</ClassBus>
<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
@@ -609,8 +609,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <v2.10:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -631,9 +631,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</Signature>
- </v2.8:AirDrag>
+ </v2.10:AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -645,10 +645,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-step</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 4-step</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
@@ -669,5 +673,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue></di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
\ No newline at end of file
+ </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index edac9d402239cda727e06804182bcdf5881eb98f..77bda4483f730628bf86098e0807819051ea81cc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
<Vehicle xsi:type="VehiclePIFType">
@@ -553,4 +553,4 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
+</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index 2e2d5f6e986c980bc220fdd7a75b63ec16449af7..60fcb794c71022fe28474e60c9ee160c287396a8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-04fd187f166a4d89aa84">
<Vehicle xsi:type="VehiclePIFType">
@@ -540,4 +540,4 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
+</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 8280da3de3b4f002e45489138af883e7966cdf0c..e739eba4afaac6f9290c34e18f627c1c3fbfcc84 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -574,4 +574,4 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
+</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index b2eb57ba5297be0c47006675b087f065cf2720e9..096d60420b94e01f2924240df869c76faf568169 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-65de7efe65ee4b4cac4c">
<Vehicle xsi:type="VehiclePIFType">
@@ -547,4 +547,4 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
+</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
index 717a41fa2eafe06876394e4ec2aa32e4ec4d5e88..1b5c83118864612bdb7ee6ee0621c7b1ab20f6c4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -64,4 +64,4 @@ xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:s
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
\ No newline at end of file
+</VectoOutputMultistep>
\ No newline at end of file
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 a325b76a0a4f9fda653473c9d39ac500f6557f13..528b815a29c31842e349ce040d5ba3227066c52d 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -686,10 +686,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -757,10 +757,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-3">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
@@ -817,5 +817,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 d16619dab4bf384ab3be4da2c7a7e7a22927a1d1..e1894ce3306d3c2a4e216f8a798d6f5f35e4b2fc 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -640,9 +640,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,10 +689,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -701,7 +701,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,10 +760,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-3">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -772,7 +772,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
@@ -822,5 +822,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 0d851eb8384b543cefd12d2dca688d42e92c1270..f57fa13dd79b56e7de8cc4a9eb0b9b1296264364 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -730,10 +730,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -742,7 +742,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -802,10 +802,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-3">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -814,7 +814,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
@@ -863,5 +863,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 379d96b39e4f3630f43420483e40e6deff027fe7..e9c9e6bb99e99d01b3a10508e19dc07e2df8ee15 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -686,10 +686,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -757,10 +757,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-3">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
@@ -817,5 +817,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 6c2f9bbd4081b8c1efc3358e39c3ef5178dc931c..e234ce5f55f46e624ec71d0c13d0823ff4e93e93 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -686,10 +686,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -757,10 +757,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="4">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="4">
+ <Data xsi:type="BusManufacturingStepDataType" id="MST-3">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
@@ -816,5 +816,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 02fc55554ce9506fca4478c9e633d6b156dfeccf..f76c99bb931a36c4f3bfc468d2f7985fa3391b7f 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -684,10 +684,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -755,5 +755,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 2566c5713dfa9c84758dffe1b197ada3480ed5f2..361ae20e5757304ccf351666b2f4e85cc985dca3 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -678,5 +678,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 38f9eea853ac0a54c8d2a4563ab274eda2af2a79..c2737773b25846f1a296b794f486c425bbac01c5 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -684,10 +684,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -740,5 +740,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 5b898a5eee14f45559c3ad3395ccfd262e97c0b9..a6b0c06efc723a30e9b235d5c3f78fec97e3f136 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoOutputMultistage xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<tns:VectoOutputMultistep xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
@@ -652,4 +652,4 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</tns:PrimaryVehicle>
-</tns:VectoOutputMultistage>
+</tns:VectoOutputMultistep>
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 5c9f0960a006e5eb7ce855e2c77fd55f2cbfdea7..3b8014176b492adb26913d1681bdb1ce83303506 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
<v2.10.2:Manufacturer>Intermediate Manufacturer 1</v2.10.2:Manufacturer>
<v2.10.2:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.10.2:ManufacturerAddress>
@@ -673,10 +673,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -685,7 +685,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -744,5 +744,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 d5df6890b211e8dbd8695d19b536bf6f4959ffe1..4d91d0a8d2321c56099daa15265a157895d943ff 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -572,9 +572,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -583,7 +583,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -606,10 +606,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
- <ManufacturingStage stageCount="3">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
- <HashPreviousStage>
+ </ManufacturingStep>
+ <ManufacturingStep stepCount="3">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -618,7 +618,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress></ManufacturerAddress>
@@ -641,5 +641,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 300c02d16d0f0e0cad1e1fa98aaad28a0f78a618..5daaa73aef5a86ac6d85518efec7942eb7a0a629 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d11aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -749,5 +749,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
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 9ff878fa3eda3ade66d240c726940ad1a6216edd..dfd1792f3178407af38fd7786193f85cb21de642 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
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
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"
@@ -639,9 +639,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -673,5 +673,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
+ </ManufacturingStep>
+</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 294f405059e86b5ba703be51006e5dc0c05cd5e2..e9fede38965ac6607e145487c9704eabbd96e5d0 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -5710,7 +5710,6 @@
<Content Include="TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\Integration\Buses\vecto_vehicle-stage_input_full-sample_final_noNG.xml" />
<Content Include="TestData\Integration\DeclarationMode\Class4_Vocational\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 4bbd3da184097a875552d5c8a3e2ceb4280d1dd5..6a306896bb740660d975faa9ece01ac5a50c1d68 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -242,7 +242,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
- <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <SizeOfAirSupply>Large Supply 2-step</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
@@ -578,15 +578,15 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</PrimaryVehicle>
- <ManufacturingStage stageCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
- <HashPreviousStage>
+ <ManufacturingStep stepCount="2">
+ <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
- <vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
+ </HashPreviousStep>
+ <vif0.1:Vehicle xsi:type="v2.10:Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -595,7 +595,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>8300</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
- <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
<ClassBus>I+II</ClassBus>
<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
@@ -609,8 +609,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
- <Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <v2.10:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -631,9 +631,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</Signature>
- </v2.8:AirDrag>
+ </v2.10:AirDrag>
<Auxiliaries>
- <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
@@ -645,10 +645,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
- <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
- <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-step</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 4-step</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
@@ -669,5 +673,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue></di:DigestValue>
</di:Reference>
</Signature>
- </ManufacturingStage>
-</VectoOutputMultistage>
\ No newline at end of file
+ </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 8280da3de3b4f002e45489138af883e7966cdf0c..e739eba4afaac6f9290c34e18f627c1c3fbfcc84 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -574,4 +574,4 @@
</di:Reference>
</Signature>
</PrimaryVehicle>
-</VectoOutputMultistage>
+</VectoOutputMultistep>