From 5f54478ffb558af84db1e8c7c378914a65516f70 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 14 Apr 2020 20:19:13 +0200
Subject: [PATCH] adding missing files

---
 .../VectoCore/OutputData/DeclarationReport.cs |   4 +-
 .../XML/AbstractXMLManufacturerReport.cs      |   2 +-
 .../OutputData/XML/XMLDeclarationReport.cs    |   2 +-
 .../OutputData/XML/XMLPrimaryVehicleReport.cs |   2 +-
 .../primary_heavyBus group41.RSLT_PIF.xml     | 514 ++++++++++++++++
 ...primary_heavyBus group41_AT-P.RSLT_PIF.xml | 502 ++++++++++++++++
 ...mary_heavyBus group42_SmartPS.RSLT_PIF.xml | 565 ++++++++++++++++++
 7 files changed, 1586 insertions(+), 5 deletions(-)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml

diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index 955c751c5e..3aeb1536c5 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.OutputData
 		int FuelMode { get; set; }
 		IList<IFuelProperties> FuelData { get; set; }
 		Kilogram Payload { get; set; }
-		Kilogram TotalVehicleWeight { get; set; }
+		Kilogram TotalVehicleMass { get; set; }
 		CubicMeter CargoVolume { get; set; }
 
 		double? PassengerCount { get; set; }
@@ -158,7 +158,7 @@ namespace TUGraz.VectoCore.OutputData
 					FuelMode = fuelMode,
 					FuelData = runData.EngineData.Fuels.Select(x => x.FuelData).ToList(),
 					Payload = runData.VehicleData.Loading,
-					TotalVehicleWeight = runData.VehicleData.TotalVehicleMass,
+					TotalVehicleMass = runData.VehicleData.TotalVehicleMass,
 					CargoVolume = runData.VehicleData.CargoVolume,
 					VehicleClass = runData.Mission?.BusParameter?.BusGroup ?? runData.VehicleData.VehicleClass,
 					//runData.VehicleData.VehicleClass,
diff --git a/VectoCore/VectoCore/OutputData/XML/AbstractXMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/AbstractXMLManufacturerReport.cs
index 6a86139623..d441b77113 100644
--- a/VectoCore/VectoCore/OutputData/XML/AbstractXMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/AbstractXMLManufacturerReport.cs
@@ -205,7 +205,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 				tns + XMLNames.Report_ResultEntry_SimulationParameters,
 				new XElement(
 					tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
-					XMLHelper.ValueAsUnit(result.TotalVehicleWeight, XMLNames.Unit_kg)),
+					XMLHelper.ValueAsUnit(result.TotalVehicleMass, XMLNames.Unit_kg)),
 				new XElement(tns + XMLNames.Report_ResultEntry_Payload, XMLHelper.ValueAsUnit(result.Payload, XMLNames.Unit_kg)),
 				result.PassengerCount.HasValue && result.PassengerCount.Value > 0 ? new XElement(tns + "PassengerCount", result.PassengerCount.Value.ToMinSignificantDigits(3,1)) : null,
 				new XElement(
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index f92b0737aa..8b1e8bcff5 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 
 			public Kilogram Payload { get; set; }
 
-			public Kilogram TotalVehicleWeight { get; set; }
+			public Kilogram TotalVehicleMass { get; set; }
 
 			public CubicMeter CargoVolume { get; set; }
 
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
index 64a8a72b08..4ab7de225f 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
@@ -381,7 +381,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 						tns + XMLNames.Report_ResultEntry_SimulationParameters,
 						new XElement(
 							tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
-							XMLHelper.ValueAsUnit(resultEntry.Payload, XMLNames.Unit_kg, 0)),
+							XMLHelper.ValueAsUnit(resultEntry.TotalVehicleMass, XMLNames.Unit_kg, 2)),
 						new XElement(
 							tns + XMLNames.Report_Result_Payload, XMLHelper.ValueAsUnit(resultEntry.Payload, XMLNames.Unit_kg, 2)),
 						new XElement(
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
new file mode 100644
index 0000000000..2d302f87ac
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml	
@@ -0,0 +1,514 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-63a2897a0e0247fc8a44">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+      <Model>Generic Model</Model>
+      <VIN>VEH-1234567890_nonSmart</VIN>
+      <Date>2017-02-15T11:00:00Z</Date>
+      <VehicleCategory>Bus</VehicleCategory>
+      <AxleConfiguration>4x2</AxleConfiguration>
+      <Articulated>false</Articulated>
+      <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+      <IdlingSpeed>700</IdlingSpeed>
+      <RetarderType>Transmission Output Retarder</RetarderType>
+      <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>
+      <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="VehicleComponentsPIFType">
+        <Engine>
+          <Data xsi:type="EngineDataPIFType">
+            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+            <Model>Generic primary bus 41 Engine</Model>
+            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+            <Date>2017-02-15T11:00:00Z</Date>
+            <AppVersion>VectoEngine x.y</AppVersion>
+            <Displacement>7700</Displacement>
+            <RatedSpeed>2200</RatedSpeed>
+            <RatedPower>220000</RatedPower>
+            <MaxEngineTorque>1100</MaxEngineTorque>
+            <WHRType>
+              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+            </WHRType>
+            <Mode>
+              <IdlingSpeed>700</IdlingSpeed>
+              <FullLoadAndDragCurve>
+                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
+                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
+                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
+                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
+                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
+                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
+                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
+                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
+                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
+                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
+                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
+                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
+              </FullLoadAndDragCurve>
+              <Fuels>
+                <FuelType>Diesel CI</FuelType>
+              </Fuels>
+            </Mode>
+          </Data>
+        </Engine>
+        <Transmission>
+          <Data xsi:type="TransmissionDataPIFType">
+            <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">
+              <Gear number="1">
+                <Ratio>3.364</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="2">
+                <Ratio>1.909</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="3">
+                <Ratio>1.421</Ratio>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="4">
+                <Ratio>1.000</Ratio>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="5">
+                <Ratio>0.720</Ratio>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="6">
+                <Ratio>0.615</Ratio>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+            </Gears>
+          </Data>
+        </Transmission>
+        <Axlegear>
+          <Data xsi:type="AxlegearDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>Generic primary bus 41 AxleGear</Model>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>6.500</Ratio>
+          </Data>
+        </Axlegear>
+        <pbus: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>
+              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>true</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleDriven</AxleType>
+                <TwinTyres>true</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0063</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+            </Axles>
+          </Data>
+        </pbus:AxleWheels>
+        <Auxiliaries>
+          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+            <aux:Fan>
+              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+            </aux:Fan>
+            <aux:SteeringPump>
+              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+            </aux:SteeringPump>
+            <aux:ElectricSystem>
+              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+              <aux:SmartElectrics>false</aux:SmartElectrics>
+            </aux:ElectricSystem>
+            <aux:PneumaticSystem>
+              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+              <aux:Clutch>none</aux:Clutch>
+              <aux:CompressorRatio>1.000</aux:CompressorRatio>
+              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+              <aux:AdBlueDosing>true</aux:AdBlueDosing>
+            </aux:PneumaticSystem>
+            <aux:HVAC>
+              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+            </aux:HVAC>
+          </Data>
+        </Auxiliaries>
+      </Components>
+    </Vehicle>
+    <ResultDataSignature>
+      <di:Reference URI="#RESULT-aa474f24438d4feda39d">
+        <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>fFCo+gSAhLQMxjwWKo5RWxxO1RXf4GBUfLKzc3ND1/s=</di:DigestValue>
+      </di:Reference>
+    </ResultDataSignature>
+    <Results>
+      <Status>success</Status>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1489.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1493.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">24.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1793.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">24.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1810.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1193.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1203.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">19.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1442.3</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1463.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.1</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1032.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1049.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.1</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1254.5</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1282.7</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">2021</TotalVehicleMass>
+          <Payload unit="kg">2021</Payload>
+          <PassengerCount>28.458</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.6</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">925.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1721</TotalVehicleMass>
+          <Payload unit="kg">1721</Payload>
+          <PassengerCount>24.235200000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">906.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">4302</TotalVehicleMass>
+          <Payload unit="kg">4302</Payload>
+          <PassengerCount>60.588</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1003.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5051</TotalVehicleMass>
+          <Payload unit="kg">5051</Payload>
+          <PassengerCount>71.145</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.2</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1040.3</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1347</TotalVehicleMass>
+          <Payload unit="kg">1347</Payload>
+          <PassengerCount>18.972</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">844.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1095</TotalVehicleMass>
+          <Payload unit="kg">1095</Payload>
+          <PassengerCount>15.4224</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">809.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">2737</TotalVehicleMass>
+          <Payload unit="kg">2737</Payload>
+          <PassengerCount>38.556</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">839.0</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">3368</TotalVehicleMass>
+          <Payload unit="kg">3368</Payload>
+          <PassengerCount>47.43</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">878.3</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.0.1884-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-03-12T10:12:57.0972605Z</Date>
+    </ApplicationInformation>
+  </pif:Data>
+  <pif:Signature>
+    <di:Reference URI="#PIF-63a2897a0e0247fc8a44">
+      <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>Z5Jwhy5YaaVx3/oTOyfuSIDCTYfP+EOA2nXkZy/bs4A=</di:DigestValue>
+    </di:Reference>
+  </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
new file mode 100644
index 0000000000..27f35a1d7d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml	
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-63a2897a0e0247fc8a44">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+      <Model>Generic Model</Model>
+      <VIN>VEH-1234567890_nonSmart</VIN>
+      <Date>2017-02-15T11:00:00Z</Date>
+      <VehicleCategory>Bus</VehicleCategory>
+      <AxleConfiguration>4x2</AxleConfiguration>
+      <Articulated>false</Articulated>
+      <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+      <IdlingSpeed>700</IdlingSpeed>
+      <RetarderType>Transmission Output Retarder</RetarderType>
+      <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>
+      <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="VehicleComponentsPIFType">
+        <Engine>
+          <Data xsi:type="EngineDataPIFType">
+            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+            <Model>Generic primary bus 41 Engine</Model>
+            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+            <Date>2017-02-15T11:00:00Z</Date>
+            <AppVersion>VectoEngine x.y</AppVersion>
+            <Displacement>7700</Displacement>
+            <RatedSpeed>2200</RatedSpeed>
+            <RatedPower>220000</RatedPower>
+            <MaxEngineTorque>1100</MaxEngineTorque>
+            <WHRType>
+              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+            </WHRType>
+            <Mode>
+              <IdlingSpeed>700</IdlingSpeed>
+              <FullLoadAndDragCurve>
+                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
+                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
+                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
+                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
+                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
+                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
+                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
+                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
+                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
+                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
+                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
+                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
+              </FullLoadAndDragCurve>
+              <Fuels>
+                <FuelType>Diesel CI</FuelType>
+              </Fuels>
+            </Mode>
+          </Data>
+        </Engine>
+        <Transmission>
+          <Data xsi:type="TransmissionDataPIFType">
+            <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-P</TransmissionType>
+            <Gears xsi:type="TransmissionGearsPIFType">
+              <Gear number="1">
+                <Ratio>1.350</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="2">
+                <Ratio>1.000</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+              <Gear number="3">
+                <Ratio>0.730</Ratio>
+                <MaxSpeed>2500</MaxSpeed>
+              </Gear>
+            </Gears>
+          </Data>
+        </Transmission>
+        <Axlegear>
+          <Data xsi:type="AxlegearDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>Generic primary bus 41 AxleGear</Model>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>5.800</Ratio>
+          </Data>
+        </Axlegear>
+        <pbus: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>
+              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>true</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleDriven</AxleType>
+                <TwinTyres>true</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0063</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+            </Axles>
+          </Data>
+        </pbus:AxleWheels>
+        <Auxiliaries>
+          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+            <aux:Fan>
+              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+            </aux:Fan>
+            <aux:SteeringPump>
+              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+            </aux:SteeringPump>
+            <aux:ElectricSystem>
+              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+              <aux:SmartElectrics>false</aux:SmartElectrics>
+            </aux:ElectricSystem>
+            <aux:PneumaticSystem>
+              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+              <aux:Clutch>none</aux:Clutch>
+              <aux:CompressorRatio>1.000</aux:CompressorRatio>
+              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+              <aux:AdBlueDosing>true</aux:AdBlueDosing>
+            </aux:PneumaticSystem>
+            <aux:HVAC>
+              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+            </aux:HVAC>
+          </Data>
+        </Auxiliaries>
+      </Components>
+    </Vehicle>
+    <ResultDataSignature>
+      <di:Reference URI="#RESULT-aa474f24438d4feda39d">
+        <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>fFCo+gSAhLQMxjwWKo5RWxxO1RXf4GBUfLKzc3ND1/s=</di:DigestValue>
+      </di:Reference>
+    </ResultDataSignature>
+    <Results>
+      <Status>success</Status>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1489.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1493.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">24.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1793.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">24.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1810.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1193.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1203.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">19.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1442.3</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1463.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1124</TotalVehicleMass>
+          <Payload unit="kg">1124</Payload>
+          <PassengerCount>16.524</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.1</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1032.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1193</TotalVehicleMass>
+          <Payload unit="kg">1193</Payload>
+          <PassengerCount>17.549100000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.3</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1049.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5618</TotalVehicleMass>
+          <Payload unit="kg">5618</Payload>
+          <PassengerCount>82.62</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.1</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1254.5</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5967</TotalVehicleMass>
+          <Payload unit="kg">5967</Payload>
+          <PassengerCount>87.7455</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1282.7</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">2021</TotalVehicleMass>
+          <Payload unit="kg">2021</Payload>
+          <PassengerCount>28.458</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.6</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">925.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1721</TotalVehicleMass>
+          <Payload unit="kg">1721</Payload>
+          <PassengerCount>24.235200000000003</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">906.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">4302</TotalVehicleMass>
+          <Payload unit="kg">4302</Payload>
+          <PassengerCount>60.588</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.7</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1003.4</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">5051</TotalVehicleMass>
+          <Payload unit="kg">5051</Payload>
+          <PassengerCount>71.145</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.2</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1040.3</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1347</TotalVehicleMass>
+          <Payload unit="kg">1347</Payload>
+          <PassengerCount>18.972</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.5</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">844.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">1095</TotalVehicleMass>
+          <Payload unit="kg">1095</Payload>
+          <PassengerCount>15.4224</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">809.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">2737</TotalVehicleMass>
+          <Payload unit="kg">2737</Payload>
+          <PassengerCount>38.556</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.4</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">839.0</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>PB41</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">3368</TotalVehicleMass>
+          <Payload unit="kg">3368</Payload>
+          <PassengerCount>47.43</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.0</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">878.3</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.0.1884-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-03-12T10:12:57.0972605Z</Date>
+    </ApplicationInformation>
+  </pif:Data>
+  <pif:Signature>
+    <di:Reference URI="#PIF-63a2897a0e0247fc8a44">
+      <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>Z5Jwhy5YaaVx3/oTOyfuSIDCTYfP+EOA2nXkZy/bs4A=</di:DigestValue>
+    </di:Reference>
+  </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml
new file mode 100644
index 0000000000..34acaf8f30
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml	
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-bef5aabfa8f44ed1b8ad">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+      <Model>Generic Model</Model>
+      <VIN>VEH-1234567890_SmartPS</VIN>
+      <Date>2017-02-15T11:00:00Z</Date>
+      <VehicleCategory>Bus</VehicleCategory>
+      <AxleConfiguration>6x2</AxleConfiguration>
+      <Articulated>false</Articulated>
+      <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+      <IdlingSpeed>600</IdlingSpeed>
+      <RetarderType>Transmission Output Retarder</RetarderType>
+      <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>
+      <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" />
+        <tcl:Entry gear="12" maxTorque="1900" />
+      </TorqueLimits>
+      <Components xsi:type="VehicleComponentsPIFType">
+        <Engine>
+          <Data xsi:type="EngineDataPIFType">
+            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+            <Model>Bus 6x2</Model>
+            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+            <Date>2017-02-15T11:00:00Z</Date>
+            <AppVersion>VectoEngine x.y</AppVersion>
+            <Displacement>12730</Displacement>
+            <RatedSpeed>1800</RatedSpeed>
+            <RatedPower>325032</RatedPower>
+            <MaxEngineTorque>2134</MaxEngineTorque>
+            <WHRType>
+              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+            </WHRType>
+            <Mode>
+              <IdlingSpeed>600</IdlingSpeed>
+              <FullLoadAndDragCurve>
+                <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
+                <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
+                <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
+                <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
+                <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
+                <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
+                <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
+                <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
+                <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
+                <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+              </FullLoadAndDragCurve>
+              <Fuels>
+                <FuelType>Diesel CI</FuelType>
+              </Fuels>
+            </Mode>
+          </Data>
+        </Engine>
+        <Transmission>
+          <Data xsi:type="TransmissionDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>Generic 40t Long Haul Truck Gearbox</Model>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <TransmissionType>AMT</TransmissionType>
+            <Gears xsi:type="TransmissionGearsPIFType">
+              <Gear number="1">
+                <Ratio>14.930</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="2">
+                <Ratio>11.640</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="3">
+                <Ratio>9.020</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="4">
+                <Ratio>7.040</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="5">
+                <Ratio>5.640</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="6">
+                <Ratio>4.400</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="7">
+                <Ratio>3.390</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="8">
+                <Ratio>2.650</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="9">
+                <Ratio>2.050</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="10">
+                <Ratio>1.600</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="11">
+                <Ratio>1.280</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="12">
+                <Ratio>1.000</Ratio>
+              </Gear>
+            </Gears>
+          </Data>
+        </Transmission>
+        <Axlegear>
+          <Data xsi:type="AxlegearDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>Generic 40t Long Haul Truck AxleGear</Model>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>2.590</Ratio>
+          </Data>
+        </Axlegear>
+        <pbus: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>
+              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>true</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleDriven</AxleType>
+                <TwinTyres>true</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0063</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+            </Axles>
+          </Data>
+        </pbus:AxleWheels>
+        <Auxiliaries>
+          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+            <aux:Fan>
+              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+            </aux:Fan>
+            <aux:SteeringPump>
+              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+            </aux:SteeringPump>
+            <aux:ElectricSystem>
+              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+              <aux:SmartElectrics>false</aux:SmartElectrics>
+              <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
+              <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
+            </aux:ElectricSystem>
+            <aux:PneumaticSystem>
+              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+              <aux:Clutch>none</aux:Clutch>
+              <aux:CompressorRatio>1.000</aux:CompressorRatio>
+              <aux:SmartCompressionSystem>true</aux:SmartCompressionSystem>
+              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+              <aux:AdBlueDosing>true</aux:AdBlueDosing>
+            </aux:PneumaticSystem>
+            <aux:HVAC>
+              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+            </aux:HVAC>
+          </Data>
+        </Auxiliaries>
+      </Components>
+    </Vehicle>
+    <ResultDataSignature>
+      <di:Reference URI="#RESULT-a52e27d5dcfa45809a15">
+        <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>N2rLz4OswTYm2BXlnnIUcNNKumZ3Y5jrcT66OO7E/bU=</di:DigestValue>
+      </di:Reference>
+    </ResultDataSignature>
+    <Results>
+      <Status>success</Status>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.576</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1508.3</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.449999999999989</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">24.818</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1819.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.985</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1171.7</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.449999999999989</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">19.482</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1428.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.271</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">972.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.449999999999989</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.445</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1205.5</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.2101</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.921</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1533.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.0505</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">25.759</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1888.2</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.2101</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.318</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1196.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.0505</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.349</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1491.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.2101</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.627</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">998.9</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.0505</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.218</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1262.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">14007.48</TotalVehicleMass>
+          <Payload unit="kg">2007.48</Payload>
+          <PassengerCount>28.274400000000004</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.200</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">821.0</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">17018.71</TotalVehicleMass>
+          <Payload unit="kg">5018.71</Payload>
+          <PassengerCount>70.686</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">12.592</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">923.0</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13277.49</TotalVehicleMass>
+          <Payload unit="kg">1277.49</Payload>
+          <PassengerCount>17.9928</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">8.713</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">638.7</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">15193.72</TotalVehicleMass>
+          <Payload unit="kg">3193.72</Payload>
+          <PassengerCount>44.982</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">9.175</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">672.6</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">14780.93</TotalVehicleMass>
+          <Payload unit="kg">2780.93</Payload>
+          <PassengerCount>39.168000000000006</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.720</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">859.1</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18952.32</TotalVehicleMass>
+          <Payload unit="kg">6952.32</Payload>
+          <PassengerCount>97.92</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.656</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1001.0</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">13853.95</TotalVehicleMass>
+          <Payload unit="kg">1853.95</Payload>
+          <PassengerCount>26.112000000000002</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">9.247</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">677.8</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16634.88</TotalVehicleMass>
+          <Payload unit="kg">4634.88</Payload>
+          <PassengerCount>65.28</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">9.908</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">726.3</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.0.1884-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-04-14T18:12:14.4272157Z</Date>
+    </ApplicationInformation>
+  </pif:Data>
+  <pif:Signature>
+    <di:Reference URI="#PIF-bef5aabfa8f44ed1b8ad">
+      <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>hSBXQqP35eesjLIzipHtocUgivICfUAlZ0QRgf4GrD8=</di:DigestValue>
+    </di:Reference>
+  </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
-- 
GitLab