diff --git a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
index 3602729e7e3ced9b439fca29a2144745c06c0dde..8a84bb5ff02a190d5d6b07de670c12c615c528bc 100644
--- a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
+++ b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor.vveh
@@ -1,7 +1,7 @@
-{
+{
"Header": {
"CreatedBy": "",
- "Date": "2019-12-03T16:56:30.4122138Z",
+ "Date": "2022-01-26T08:54:53.5628568Z",
"AppVersion": "3",
"FileVersion": 8
},
@@ -11,28 +11,11 @@
"LegislativeClass": "Unknown",
"CurbWeight": 8229.0,
"CurbWeightExtra": 7500.0,
- "Loading": 19300.0,
"MassMax": 18.0,
+ "Loading": 19300.0,
"rdyn": 492.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
- "Retarder": {
- "Type": "secondary",
- "Ratio": 1.0,
- "File": "Default.vrlm"
- },
- "Angledrive": {
- "Type": "None",
- "Ratio": 0.0,
- "LossMap": ""
- },
- "PTO": {
- "Type": "None",
- "LossMap": "",
- "Cycle": ""
- },
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -84,10 +67,28 @@
]
},
"EngineStopStart": false,
- "EcoRoll": "None",
- "PredictiveCruiseControl": "None",
+ "EcoRoll": "WithoutEngineStop",
+ "PredictiveCruiseControl": "Option_1_2_3",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 5.3,
- "VehicleHeight": 0.0
+ "VehicleHeight": 0.0,
+ "IdlingSpeed": 0.0,
+ "Retarder": {
+ "Type": "secondary",
+ "Ratio": 1.0,
+ "File": "Default.vrlm"
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": "",
+ "CycleDriving": ""
+ },
+ "TorqueLimits": {}
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
index 5549443574ace22bf7455ed68df430ec79dc31e9..6c50201d0b36ecb9bbdb464c461990f58a180569 100644
--- a/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
+++ b/Generic Vehicles/Engineering Mode/Group5_Tractor_4x2/Class5_Tractor_ENG.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-03-03T09:04:48.6087237Z",
+ "Date": "2022-01-26T09:00:21.8597275Z",
"AppVersion": "3",
"FileVersion": 5
},
@@ -12,7 +12,6 @@
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
- "ShiftStrategy": "",
"Padd": 5000.0,
"Paux_ICEOff_Driving": 3000.0,
"Paux_ICEOff_Standstill": 2000.0,
@@ -20,6 +19,7 @@
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
"EngineStopStartUtilityFactor": 0.8,
+ "EngineStopStartUtilityFactorDriving": 0.8,
"EcoRollMinSpeed": 60.000000000000007,
"EcoRollActivationDelay": 2.0,
"EcoRollUnderspeedThreshold": 0.0,
@@ -45,7 +45,7 @@
"OverSpeed": 5.0
},
"Cycles": [
- "Long_Haul+ES.vdri"
+ "E:\\QUAM\\Downloads\\CoachCycle\\Coach_short_HW.vdri"
]
}
}
\ No newline at end of file
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 1deb616710589563fa3b0fe9f03e9d49dfa51183..ff992c3c7d0483d6f8bc8cae4ef9dd0347a25e7e 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -914,7 +914,12 @@ end Property
End Get
End Property
- Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
+ Public ReadOnly Property NumSteeredAxles As Integer? Implements IAxlesDeclarationInputData.NumSteeredAxles
+ get
+ return nothing
+ End Get
+ End Property
+ Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
Public ReadOnly Property ArchitectureID As ArchitectureID Implements IVehicleDeclarationInputData.ArchitectureID
Public ReadOnly Property OvcHev As Boolean Implements IVehicleDeclarationInputData.OvcHev
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
index 97c194b88d1633123a82426ceb6421550b3cb29c..a1880347bb904087987f87e11bfc904a2827c2cf 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/AxleWheelsViewModel.cs
@@ -48,6 +48,8 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components
public IList<IAxleDeclarationInputData> AxlesDeclaration =>
AxleViewModels.Cast<IAxleDeclarationInputData>().ToList();
+ public int? NumSteeredAxles => null;
+
public XmlNode XMLSource => _xmlSource;
}
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index f8e73e2eae461501274540d1accf18b7217a36f5..c1e35cafa04dec8c57903fa5fa68d8f7c5179fc0 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -253,6 +253,8 @@ namespace TUGraz.VectoCommon.InputData
/// </summary>
IList<IAxleDeclarationInputData> AxlesDeclaration { get; }
+ int? NumSteeredAxles { get; }
+
XmlNode XMLSource { get; }
}
@@ -456,9 +458,9 @@ namespace TUGraz.VectoCommon.InputData
ITyreDeclarationInputData Tyre { get; }
DataSource DataSource { get; }
-
- bool Steered { get; }
- }
+
+ bool Steered { get; }
+ }
public interface ITyreDeclarationInputData : IComponentInputData
{
diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
index 30ff897700a86e8551cea3c401dda5f2ec9e4925..38faea4cd4c9fa93298d6e4a2515ecc1ee710fca 100644
--- a/VectoCommon/VectoCommon/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -1455,7 +1455,7 @@ namespace TUGraz.VectoCommon.Utils
/// <param name="val">The value.</param>
/// <param name="unitFactor"></param>
/// <param name="units">The units.</param>
- [DebuggerHidden]
+ //[DebuggerHidden]
protected SI(double val, double unitFactor, int[] units)
{
Val = val;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index d2975f87878d0531f9554425ce3e9223dd0805e1..9744002d62cece30416bf515c27282b3551b2605 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -309,6 +309,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
+ public int? NumSteeredAxles => null;
XmlNode IVehicleDeclarationInputData.XMLSource => null;
public virtual string VehicleTypeApprovalNumber { get; }
public ArchitectureID ArchitectureID { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
index 4041fd877cfa3a749cee94e9ddbb89bd59259bbe..7181384e6fac40f491ed5319857a53f8e4e3d220 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
@@ -30,6 +30,7 @@
*/
using System.Collections.Generic;
+using System.Linq;
using System.Xml;
using System.Xml.Linq;
using TUGraz.VectoCommon.Exceptions;
@@ -95,6 +96,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
+ public int? NumSteeredAxles=> AxlesDeclaration.Count(x => x.Steered);
+
public XmlNode XMLSource => BaseNode;
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index d0be389f2411ea3f0f10de36d04f026563da846d..0a36841a9952039f1a9fcfd89741de120fe7db1e 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected VectoRunData CreateVectoRunDataSpecific(Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, int modeIdx)
{
var cycle = DeclarationData.CyclesCache.GetOrAdd(mission.MissionType, _ => DrivingCycleDataReader.ReadFromStream(mission.CycleFile, CycleType.DistanceBased, "", false));
- var numSteeredAxles = PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered);
+ var numSteeredAxles = PrimaryVehicle.Components.AxleWheels.NumSteeredAxles;
var simulationRunData = new VectoRunData {
Loading = loading.Key,
@@ -269,7 +269,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
AngledriveData = _angledriveData,
Aux = DataAdapterGeneric.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
primaryBusAuxiliaries, mission.MissionType, primarySegment.VehicleClass,
- mission.BusParameter.VehicleLength, PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ mission.BusParameter.VehicleLength, PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 7bbcf8a900b016df1a411c9b83dcf19f83e5c068..baeba8a41c51a797cccec0fc376049139df02c27 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
AngledriveData = _angledriveData,
Aux = DataAdapterSpecific.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segmentCompletedBus.VehicleClass, CompletedVehicle.Length,
- PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
@@ -292,7 +292,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Aux = DataAdapterGeneric.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
primaryBusAuxiliaries, mission.MissionType, primarySegment.VehicleClass,
mission.BusParameter.VehicleLength,
- PrimaryVehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverData,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
index 5e165e4ada0398d0fcd84673a3b954546c118c9a..d07214774fe8ad549d74b8855be47d178cf83cd4 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
@@ -165,7 +165,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType,
_segment.VehicleClass, vehicle.Length,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index bf87fba39115fd94560935d2b9d71bd9e0366e5f..b4dfa81ff8cb72c4ff9f5ddfa89d4bcf764dba5d 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType, _segment.VehicleClass,
vehicle.Length ?? mission.BusParameter.VehicleLength,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index 2802c869d7f700f34fe38866c84b6d72819a8b00..b397c4bc184f0312e47a4bee36ff52cb5302a49c 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
Aux = DataAdapter.CreateAuxiliaryData(vehicle.Components.AuxiliaryInputData,
vehicle.Components.BusAuxiliaries, mission.MissionType,
_segment.VehicleClass, vehicle.Length ?? mission.BusParameter.VehicleLength,
- vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered)),
+ vehicle.Components.AxleWheels.NumSteeredAxles),
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Retarder = _retarderData,
DriverData = _driverdata,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
index 468cae22cb84a07898091fb27905fa713ca90b5c..574d77a8497ddf95411de146f8765e0371d9a992 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
@@ -120,12 +120,12 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
JobInputData.Vehicle.Components.BusAuxiliaries,
missionType,
Segment.VehicleClass, JobInputData.Vehicle.Length,
- JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered));
+ JobInputData.Vehicle.Components.AxleWheels.NumSteeredAxles);
}
protected virtual List<VectoRunData.AuxData> CreateVTPAuxData(IVehicleDeclarationInputData vehicle)
{
- var numSteered = vehicle.Components.AxleWheels.AxlesDeclaration.Count(x => x.Steered);
+ var numSteered = vehicle.Components.AxleWheels.NumSteeredAxles;
var auxRD = Dao.CreateAuxiliaryData(
vehicle.Components.AuxiliaryInputData, vehicle.Components.BusAuxiliaries, MissionType.RegionalDelivery, Segment.VehicleClass, vehicle.Length, numSteered)
.ToList();
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index c1c1e070535c4fd577defe8788fe085d5db6ddd8..76db0e47e87581dcb5d5ba08a7a9ae3ea0b3812d 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
case VectoSimulationJobType.SerialHybridVehicle:
return GetSerialHybridRunData();
default:
- throw new ArgumentOutOfRangeException();
+ throw new ArgumentOutOfRangeException($"Invalid JobType {InputDataProvider.JobInputData.JobType}");
}
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index ffc8be13bd2317627a4ad87a9778617732c2e0bd..617872a0bd98102a5a00fc5a18add5fe78cffa85 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
@@ -10,6 +10,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1" schemaLocation="VectoDeclarationDefinitions.2.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
</xs:schema>
diff --git a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
index 6d198dcf89cf8e85da868b651e2f52138126dd35..258f8d9668b62488919f21c44d6d16a8f63c545a 100644
--- a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
@@ -277,7 +277,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
public IVehicleEngineeringInputData Vehicle { get; set; }
public IHybridStrategyParameters HybridStrategyParameters { get; }
public IList<ICycleData> Cycles { get; set; }
- public VectoSimulationJobType JobType { get; }
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public bool EngineOnlyMode => false;
public IEngineEngineeringInputData EngineOnly => null;
public TableData PTOCycleWhileDrive { get; set; }
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c953f429177e094f02dfd04e86fa2c484abeabaa
--- /dev/null
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -0,0 +1,604 @@
+<?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-bce95de06ff54c85bca9" 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>
+ <Model>Generic Model Primary</Model>
+ <VIN>VEH-1234567890_SmartPS</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <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>
+ <vif0.1: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>
+ </vif0.1:ADAS>
+ <vif0.1:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Entry gear="6" maxTorque="1800" />
+ <Entry gear="1" maxTorque="2500" />
+ <Entry gear="12" maxTorque="1900" />
+ </vif0.1:TorqueLimits>
+ <Components xsi:type="VehicleComponentsPIFType">
+ <Engine>
+ <Data xsi:type="EngineDataPIFType">
+ <Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
+ <Model>Bus 6x2 Engine</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>
+ <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
+ <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
+ <v2.3:ElectricalOutput>false</v2.3: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 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">
+ <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 Primary</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>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataPIFType">
+ <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>
+ <v2.0:TwinTyres>false</v2.0:TwinTyres>
+ <v2.0:Steered>true</v2.0:Steered>
+ <v2.0:Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
+ <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Wheel</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
+ <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
+ <v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
+ <v2.0:FzISO>31300</v2.0:FzISO>
+ </v2.0:Data>
+ <v2.0: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>
+ </v2.0:Signature>
+ </v2.0:Tyre>
+ </Axle>
+ <Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
+ <v2.0:AxleType>VehicleDriven</v2.0:AxleType>
+ <v2.0:TwinTyres>true</v2.0:TwinTyres>
+ <v2.0:Steered>false</v2.0:Steered>
+ <v2.0:Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
+ <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Wheel</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
+ <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
+ <v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
+ <v2.0:FzISO>31300</v2.0:FzISO>
+ </v2.0:Data>
+ <v2.0: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>
+ </v2.0:Signature>
+ </v2.0:Tyre>
+ </Axle>
+ <Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
+ <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
+ <v2.0:TwinTyres>false</v2.0:TwinTyres>
+ <v2.0:Steered>false</v2.0:Steered>
+ <v2.0:Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
+ <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Wheel</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
+ <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
+ <v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
+ <v2.0:FzISO>31300</v2.0:FzISO>
+ </v2.0:Data>
+ <v2.0: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>
+ </v2.0:Signature>
+ </v2.0:Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AuxiliaryDataPIFType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>electrically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>true</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#VEH-PrimaryBus_SmartPS">
+ <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>JKmEGO5ChZ+EWf9fu/yxJQldo/kvXaJnmhgcz2YQTpU=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#RESULT-75ce50bbcc114a1a8fa8">
+ <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>nFutXxdSkqt7h2WAMbnJuL50CjfABdvcu9V30e0y1NI=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <Status>success</Status>
+ <Result status="success">
+ <VehicleGroup>P33SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15527.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">21.18710</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1553.06</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P33SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+ <Payload unit="kg">6762.60</Payload>
+ <PassengerCount>99.45</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15527.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">16.73089</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1226.41</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P33SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+ <Payload unit="kg">6762.60</Payload>
+ <PassengerCount>99.45</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15527.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">14.37825</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1053.96</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P33SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+ <Payload unit="kg">6762.60</Payload>
+ <PassengerCount>99.45</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
+ <Payload unit="kg">1294.51</Payload>
+ <PassengerCount>18.23</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
+ <Payload unit="kg">4236.57</Payload>
+ <PassengerCount>59.67</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+ <Payload unit="kg">1578.29</Payload>
+ <PassengerCount>23.21</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+ <Payload unit="kg">7891.43</Payload>
+ <PassengerCount>116.05</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+ <Payload unit="kg">1578.29</Payload>
+ <PassengerCount>23.21</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+ <Payload unit="kg">7891.43</Payload>
+ <PassengerCount>116.05</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+ <Payload unit="kg">1578.29</Payload>
+ <PassengerCount>23.21</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+ <Payload unit="kg">7891.43</Payload>
+ <PassengerCount>116.05</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
+ <Payload unit="kg">1254.68</Payload>
+ <PassengerCount>17.67</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+ <Payload unit="kg">4106.21</Payload>
+ <PassengerCount>57.83</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
+ <Payload unit="kg">1277.49</Payload>
+ <PassengerCount>17.99</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
+ <Payload unit="kg">3193.72</Payload>
+ <PassengerCount>44.98</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
+ <Payload unit="kg">1738.08</Payload>
+ <PassengerCount>24.48</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+ <Payload unit="kg">5793.60</Payload>
+ <PassengerCount>81.60</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
+ <Payload unit="kg">1853.95</Payload>
+ <PassengerCount>26.11</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <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>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22484.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">10.56696</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">774.58</CO2>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.7.2547-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2022-02-04T13:12:27.6775278Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#VEH-bce95de06ff54c85bca9">
+ <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>3nwxGv2EIt273Cowtnqnd99NijSf4E6945LbLgs886M=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file