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 8d93aad851c7d29011bf895d226cc7d029f47800..91d1eca96e8e3dfb710f2aa03b8f657ba725a89a 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,14 +1,18 @@
<?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:v2.3"
-xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="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"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -22,12 +26,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
+ <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </vif:ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
@@ -35,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -46,9 +50,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
- <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
- <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -71,14 +75,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -132,7 +136,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -143,12 +147,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<!-- <AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
<Data xsi:type="AxleWheelsDataDeclarationType">
-->
<Axles>
- <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <vif:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
@@ -174,8 +178,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
@@ -201,8 +205,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
@@ -228,12 +232,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
+ </vif:Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -285,7 +289,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -296,10 +300,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -310,10 +313,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -324,10 +326,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -338,10 +339,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -352,10 +352,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -366,10 +365,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -380,10 +378,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -394,10 +391,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -408,10 +404,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -422,10 +417,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -436,10 +430,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -450,10 +443,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
@@ -464,10 +456,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -478,10 +469,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
@@ -492,10 +482,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
@@ -506,10 +495,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
@@ -520,10 +508,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">985.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -534,10 +521,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
@@ -548,10 +534,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
@@ -562,7 +547,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
@@ -582,14 +566,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Signature>
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
+ <Data xsi:type="BusManufacturingStepDataType" id="asdf">
<HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</HashPreviousStep>
- <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -665,7 +649,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</Auxiliaries>
</Components>
- </vif0.1:Vehicle>
+ </vif:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
<Date>2020-05-27T08:16:48.0278823Z</Date>
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 6a587688490a2f7a3b6d136bf63e19de42075882..fcc061ae8b16686cda3f7de55f9c53973fe2f9f9 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
@@ -3,14 +3,13 @@
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:v2.3"
-
-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/VectoOutputMultistep.0.1.xsd">
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -24,19 +23,19 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
+ <vif:ADAS xsi:type="ADAS_Conventional_Type" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" >
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </vif:ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -47,9 +46,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<RatedPower>220000</RatedPower>
<MaxEngineTorque>1100</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>700</IdlingSpeed>
@@ -74,14 +73,14 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>APT-S</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>3.364</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -112,7 +111,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -123,9 +122,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
- <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <vif:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
@@ -151,8 +150,8 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </vif:Axle>
+ <vif:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
@@ -178,12 +177,12 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
</di:Reference>
</Signature>
</Tyre>
- </vif0.1:Axle>
+ </vif:Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -235,7 +234,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -246,10 +245,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1520.18</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -260,10 +258,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1828.60</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -274,10 +271,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1241.44</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -288,10 +284,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1493.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -302,10 +297,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1102.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -316,10 +310,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1330.13</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
@@ -330,10 +323,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">12.90679</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">946.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
@@ -344,10 +336,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34621</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1051.61</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -358,10 +349,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1599.38</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -372,10 +362,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1949.71</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -386,10 +375,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1306.47</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -400,10 +388,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1590.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -414,10 +401,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1154.46</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -428,10 +414,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1405.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
@@ -442,10 +427,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.19757</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">967.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
@@ -456,10 +440,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1066.11</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
@@ -470,10 +453,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">816.49</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
@@ -484,10 +466,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">849.31</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
@@ -498,10 +479,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.62230</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">998.54</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
@@ -512,10 +492,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1115.67</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
@@ -526,10 +505,9 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">851.63</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
@@ -540,7 +518,6 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">890.63</CO2>
</Result>
</Results>
<ApplicationInformation>
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 6705787dfde9bb453036f6c3410b59645f40bc9c..65e0097fe1b5ddf4cc66a9dba38794c2838219c9 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
@@ -28,7 +28,7 @@
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
</TorqueLimits>
- <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
+ <Components xsi:type="VehicleComponentsPIFType">
<Engine>
<Data xsi:type="EngineDataPIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
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 885a68d120869ff7139f0beb4ce399def5396f12..d16ce1bf321ff8070095cc4415f3fca9faca71e6 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,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -31,7 +31,7 @@
</vif0.1:TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -42,9 +42,9 @@
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -67,14 +67,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -128,7 +128,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -139,7 +139,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -226,7 +226,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -277,7 +277,7 @@
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -288,10 +288,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.18710</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1553.06</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -302,10 +301,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.36235</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1859.11</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -316,10 +314,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.73089</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1226.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -330,10 +327,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.22898</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1482.83</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
@@ -344,10 +340,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.37825</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1053.96</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
@@ -358,10 +353,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.62230</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1291.75</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -372,10 +366,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.83195</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">867.31</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -386,10 +379,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.25049</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">971.29</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -400,10 +392,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.69048</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1663.26</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -414,10 +405,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.91380</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2046.14</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -428,10 +418,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.89886</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1312.02</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -442,10 +431,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.22866</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1629.41</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -456,10 +444,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.31725</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1122.79</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
@@ -470,10 +457,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.28148</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1413.37</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
@@ -484,10 +470,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.94624</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.68</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -498,10 +483,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32545</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">976.78</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
@@ -512,10 +496,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71857</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">639.09</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
@@ -526,10 +509,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20204</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">674.53</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
@@ -540,10 +522,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58782</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">996.02</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -554,10 +535,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.57745</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1141.86</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
@@ -568,10 +548,9 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82883</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">720.47</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
@@ -582,7 +561,6 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56696</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">774.58</CO2>
</Result>
</Results>
<ApplicationInformation>