From 13ad8f6f0d636f9f25bd440cd25accd9d7c380fd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 27 Apr 2020 18:35:14 +0200
Subject: [PATCH] adapting generic values in primary bus segment table;
adapting testcases removing primary bus groups 41-45 new columns in primary
bus segment table - some refactoring
---
.../UnitTests/SSMTOOLTests.vb | 2 -
.../VectoCommon/Models/VehicleClass.cs | 232 +++++++++---------
VectoCommon/VectoCommon/Models/VehicleCode.cs | 29 ---
VectoCommon/VectoCommon/Utils/VectoMath.cs | 2 +-
.../XMLDeclarationVehicleDataProvider.cs | 2 +-
...larationDataAdapterCompletedBusSpecific.cs | 11 +-
.../DeclarationDataAdapterPrimaryBus.cs | 20 +-
.../Declaration/CompletedBusSegments.cs | 4 +-
.../Models/Declaration/DeclarationData.cs | 24 +-
.../VectoCore/Models/Declaration/Mission.cs | 4 +-
.../Models/Declaration/MissionType.cs | 2 +-
.../Models/Declaration/PrimaryBusSegments.cs | 17 +-
.../CompletedBusSegmentationTable.csv | 102 ++++----
.../PrimaryBusSegmentationTable.csv | 44 ++--
.../CompletedBusFactorMethodTest.cs | 39 ++-
...eclarationSegmentComplete2AxleBusesTest.cs | 44 ++--
...eclarationSegmentComplete3AxleBusesTest.cs | 66 ++---
...eclarationSegmentComplete4AxleBusesTest.cs | 44 ++--
.../DeclarationSegmentHeavyBusesTest.cs | 140 +++++------
.../primary_heavyBus group41.RSLT_PIF.xml | 140 +++++------
...primary_heavyBus group41_AT-P.RSLT_PIF.xml | 171 ++++++-------
...mary_heavyBus group42_SmartPS.RSLT_PIF.xml | 160 ++++++------
.../vecto_vehicle-completed_heavyBus_41.xml | 1 +
...y_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml | 182 +++++++-------
.../primary_heavyBus group41.RSLT_PIF.xml | 140 +++++------
25 files changed, 802 insertions(+), 820 deletions(-)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index f1536d6e8e..c939cd7f37 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -78,7 +78,6 @@ Namespace UnitTests
.HVACCompressorType = ACCompressorType.TwoStage,
.HVACAuxHeaterPower = 30e3.SI(Of Watt),
.HVACConfiguration = BusHVACSystemConfiguration.Configuration6,
- .FloorType = FloorType.HighFloor,
.DoubleDecker = False,
.VehicleWidth = 2.55.SI(Of Meter),
.VehicleLength = 10.655.SI(Of meter),
@@ -586,7 +585,6 @@ Namespace UnitTests
.HVACCompressorType = ACCompressorType.TwoStage,
.HVACAuxHeaterPower = 18e3.SI(Of Watt),
.HVACConfiguration = BusHVACSystemConfiguration.Configuration6,
- .FloorType = FloorType.HighFloor,
.DoubleDecker = false,
.BodyHeight = 2.7.SI(of Meter),
.VehicleWidth = 2.55.SI(Of Meter),
diff --git a/VectoCommon/VectoCommon/Models/VehicleClass.cs b/VectoCommon/VectoCommon/Models/VehicleClass.cs
index d8912836bc..596ff23dc3 100644
--- a/VectoCommon/VectoCommon/Models/VehicleClass.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleClass.cs
@@ -61,6 +61,16 @@ namespace TUGraz.VectoCommon.Models
Class15,
Class16,
Class17,
+
+
+ // primary bus super groups
+ ClassP31_32,
+ ClassP33_34,
+ ClassP35_36,
+ ClassP37_38,
+ ClassP39_40,
+
+ // primary bus specific groups
ClassP31SD,
ClassP31DD,
ClassP32SD,
@@ -81,67 +91,63 @@ namespace TUGraz.VectoCommon.Models
ClassP39DD,
ClassP40SD,
ClassP40DD,
- ClassPB41,
- ClassPB42,
- ClassPB43,
- ClassPB44,
- ClassPB45,
-
- ClassCB31a,
- ClassCB31b,
- ClassCB31c,
- ClassCB31d,
- ClassCB31e,
- ClassCB32a,
- ClassCB32b,
- ClassCB32c,
- ClassCB32d,
- ClassCB32e,
- ClassCB32f,
+
+ // completed bus groups
+ Class31a,
+ Class31b,
+ Class31c,
+ Class31d,
+ Class31e,
+ Class32a,
+ Class32b,
+ Class32c,
+ Class32d,
+ Class32e,
+ Class32f,
- ClassCB33a,
- ClassCB33b,
- ClassCB33c,
- ClassCB33d,
- ClassCB33e,
- ClassCB34a,
- ClassCB34b,
- ClassCB34c,
- ClassCB34d,
- ClassCB34e,
- ClassCB34f,
+ Class33a,
+ Class33b,
+ Class33c,
+ Class33d,
+ Class33e,
+ Class34a,
+ Class34b,
+ Class34c,
+ Class34d,
+ Class34e,
+ Class34f,
- ClassCB35a,
- ClassCB35b,
- ClassCB35c,
- ClassCB36a,
- ClassCB36b,
- ClassCB36c,
- ClassCB36d,
- ClassCB36e,
- ClassCB36f,
+ Class35a,
+ Class35b,
+ Class35c,
+ Class36a,
+ Class36b,
+ Class36c,
+ Class36d,
+ Class36e,
+ Class36f,
- ClassCB37a,
- ClassCB37b,
- ClassCB37c,
- ClassCB37d,
- ClassCB37e,
- ClassCB38a,
- ClassCB38b,
- ClassCB38c,
- ClassCB38d,
- ClassCB38e,
- ClassCB38f,
+ Class37a,
+ Class37b,
+ Class37c,
+ Class37d,
+ Class37e,
+ Class38a,
+ Class38b,
+ Class38c,
+ Class38d,
+ Class38e,
+ Class38f,
- ClassCB39a,
- ClassCB39b,
- ClassCB39c,
- ClassCB40a,
- ClassCB40b,
- ClassCB40c,
- ClassCB40d,
- ClassCB40e,
- ClassCB40f,
+ Class39a,
+ Class39b,
+ Class39c,
+ Class40a,
+ Class40b,
+ Class40c,
+ Class40d,
+ Class40e,
+ Class40f,
}
public static class VehicleClassHelper
@@ -196,11 +202,11 @@ namespace TUGraz.VectoCommon.Models
case VehicleClass.ClassP39DD:
case VehicleClass.ClassP40SD:
case VehicleClass.ClassP40DD:
- case VehicleClass.ClassPB41:
- case VehicleClass.ClassPB42:
- case VehicleClass.ClassPB43:
- case VehicleClass.ClassPB44:
- case VehicleClass.ClassPB45: return true;
+ case VehicleClass.ClassP31_32:
+ case VehicleClass.ClassP33_34:
+ case VehicleClass.ClassP35_36:
+ case VehicleClass.ClassP37_38:
+ case VehicleClass.ClassP39_40: return true;
default: return false;
}
@@ -209,57 +215,57 @@ namespace TUGraz.VectoCommon.Models
public static bool IsCompletedBus(this VehicleClass vehicleClass)
{
switch (vehicleClass) {
- case VehicleClass.ClassCB31a:
- case VehicleClass.ClassCB31b:
- case VehicleClass.ClassCB31c:
- case VehicleClass.ClassCB31d:
- case VehicleClass.ClassCB31e:
- case VehicleClass.ClassCB32a:
- case VehicleClass.ClassCB32b:
- case VehicleClass.ClassCB32c:
- case VehicleClass.ClassCB32d:
- case VehicleClass.ClassCB32e:
- case VehicleClass.ClassCB32f:
- case VehicleClass.ClassCB33a:
- case VehicleClass.ClassCB33b:
- case VehicleClass.ClassCB33c:
- case VehicleClass.ClassCB33d:
- case VehicleClass.ClassCB33e:
- case VehicleClass.ClassCB34a:
- case VehicleClass.ClassCB34b:
- case VehicleClass.ClassCB34c:
- case VehicleClass.ClassCB34d:
- case VehicleClass.ClassCB34e:
- case VehicleClass.ClassCB34f:
- case VehicleClass.ClassCB35a:
- case VehicleClass.ClassCB35b:
- case VehicleClass.ClassCB35c:
- case VehicleClass.ClassCB36a:
- case VehicleClass.ClassCB36b:
- case VehicleClass.ClassCB36c:
- case VehicleClass.ClassCB36d:
- case VehicleClass.ClassCB36e:
- case VehicleClass.ClassCB36f:
- case VehicleClass.ClassCB37a:
- case VehicleClass.ClassCB37b:
- case VehicleClass.ClassCB37c:
- case VehicleClass.ClassCB37d:
- case VehicleClass.ClassCB37e:
- case VehicleClass.ClassCB38a:
- case VehicleClass.ClassCB38b:
- case VehicleClass.ClassCB38c:
- case VehicleClass.ClassCB38d:
- case VehicleClass.ClassCB38e:
- case VehicleClass.ClassCB38f:
- case VehicleClass.ClassCB39a:
- case VehicleClass.ClassCB39b:
- case VehicleClass.ClassCB39c:
- case VehicleClass.ClassCB40a:
- case VehicleClass.ClassCB40b:
- case VehicleClass.ClassCB40c:
- case VehicleClass.ClassCB40d:
- case VehicleClass.ClassCB40e:
- case VehicleClass.ClassCB40f: return true;
+ case VehicleClass.Class31a:
+ case VehicleClass.Class31b:
+ case VehicleClass.Class31c:
+ case VehicleClass.Class31d:
+ case VehicleClass.Class31e:
+ case VehicleClass.Class32a:
+ case VehicleClass.Class32b:
+ case VehicleClass.Class32c:
+ case VehicleClass.Class32d:
+ case VehicleClass.Class32e:
+ case VehicleClass.Class32f:
+ case VehicleClass.Class33a:
+ case VehicleClass.Class33b:
+ case VehicleClass.Class33c:
+ case VehicleClass.Class33d:
+ case VehicleClass.Class33e:
+ case VehicleClass.Class34a:
+ case VehicleClass.Class34b:
+ case VehicleClass.Class34c:
+ case VehicleClass.Class34d:
+ case VehicleClass.Class34e:
+ case VehicleClass.Class34f:
+ case VehicleClass.Class35a:
+ case VehicleClass.Class35b:
+ case VehicleClass.Class35c:
+ case VehicleClass.Class36a:
+ case VehicleClass.Class36b:
+ case VehicleClass.Class36c:
+ case VehicleClass.Class36d:
+ case VehicleClass.Class36e:
+ case VehicleClass.Class36f:
+ case VehicleClass.Class37a:
+ case VehicleClass.Class37b:
+ case VehicleClass.Class37c:
+ case VehicleClass.Class37d:
+ case VehicleClass.Class37e:
+ case VehicleClass.Class38a:
+ case VehicleClass.Class38b:
+ case VehicleClass.Class38c:
+ case VehicleClass.Class38d:
+ case VehicleClass.Class38e:
+ case VehicleClass.Class38f:
+ case VehicleClass.Class39a:
+ case VehicleClass.Class39b:
+ case VehicleClass.Class39c:
+ case VehicleClass.Class40a:
+ case VehicleClass.Class40b:
+ case VehicleClass.Class40c:
+ case VehicleClass.Class40d:
+ case VehicleClass.Class40e:
+ case VehicleClass.Class40f: return true;
default: return false;
}
}
diff --git a/VectoCommon/VectoCommon/Models/VehicleCode.cs b/VectoCommon/VectoCommon/Models/VehicleCode.cs
index c161337d2e..31e54f5e67 100644
--- a/VectoCommon/VectoCommon/Models/VehicleCode.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleCode.cs
@@ -19,35 +19,6 @@ namespace TUGraz.VectoCommon.Models {
public static class VehicleCodeHelper
{
- public static VehicleCode Parse(string vehicleCode)
- {
- switch (vehicleCode)
- {
- case "CA":
- return VehicleCode.CA;
- case "CB":
- return VehicleCode.CB;
- case "CC":
- return VehicleCode.CC;
- case "CD":
- return VehicleCode.CD;
- case "CE":
- return VehicleCode.CE;
- case "CF":
- return VehicleCode.CF;
- case "CG":
- return VehicleCode.CG;
- case "CH":
- return VehicleCode.CH;
- case "CI":
- return VehicleCode.CI;
- case "CJ":
- return VehicleCode.CJ;
- default:
- return VehicleCode.NOT_APPLICABLE;
- }
- }
-
public static string GetLabel(this VehicleCode self)
{
diff --git a/VectoCommon/VectoCommon/Utils/VectoMath.cs b/VectoCommon/VectoCommon/Utils/VectoMath.cs
index f0ce338e47..67beafee5c 100644
--- a/VectoCommon/VectoCommon/Utils/VectoMath.cs
+++ b/VectoCommon/VectoCommon/Utils/VectoMath.cs
@@ -195,7 +195,7 @@ namespace TUGraz.VectoCommon.Utils
return Max(Max(c1, c2), c3);
}
- [DebuggerStepThrough]
+ //[DebuggerStepThrough]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static T LimitTo<T>(this T value, T lowerBound, T upperBound) where T : IComparable
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index dceb6d9d50..ca2688a4b6 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -955,7 +955,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
//IdlingSpeed
public PerSecond EngineIdleSpeed
{
- get { return GetDouble(XMLNames.Engine_IdlingSpeed).SI<PerSecond>(); }
+ get { return GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
}
public RetarderType RetarderType
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index 74b4fde76f..18c2053e7c 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -183,8 +183,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
? 2 * Constants.BusParameters.DriverCompartmentLength
: completedVehicle.Length;
- var hvacBusHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode.GetFloorType(),
- isDoubleDecker, completedVehicle.Height);
+ var hvacBusHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.Height);
var hvacBusWidth = DeclarationData.BusAuxiliaries.CorrectedBusWidth(completedVehicle.Width);
var coolingPower = CalculateMaxCoolingPower(completedVehicle, mission);
@@ -270,14 +269,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
protected override Tuple<Watt, Watt> CalculateMaxCoolingPower(IVehicleDeclarationInputData completedVehicle,
Mission mission)
{
- var isDoubleDecker = completedVehicle.VehicleCode.IsDoubleDeckerBus();
- var floorType = completedVehicle.VehicleCode.GetFloorType();
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
var length = DeclarationData.BusAuxiliaries.CalculateInternalLength(
- completedVehicle.Length ,isDoubleDecker, floorType,
+ completedVehicle.Length , completedVehicle.VehicleCode,
completedVehicle.NumberOfPassengersLowerDeck);
- var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(floorType, isDoubleDecker, completedVehicle.Height);
+ var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.Height);
var volume = length * height * completedVehicle.Width;
var driver = DeclarationData.BusAuxiliaries.HVACMaxCoolingPower.DriverMaxCoolingPower(
@@ -314,7 +311,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var busParams = mission.BusParameter;
return DeclarationData.BusAuxiliaries.CalculateLengthInteriorLights(
- vehicleData.Length, vehicleData.VehicleCode.IsDoubleDeckerBus(), vehicleData.VehicleCode.GetFloorType(), busParams.NumberPassengersLowerDeck)
+ vehicleData.Length, vehicleData.VehicleCode, busParams.NumberPassengersLowerDeck)
.Value();
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
index 1e9616bf7d..839986ef7f 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
@@ -241,7 +241,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var busParams = mission.BusParameter;
return DeclarationData.BusAuxiliaries.CalculateLengthInteriorLights(
- busParams.VehicleLength, busParams.DoubleDecker, busParams.FloorType, busParams.NumberPassengersLowerDeck)
+ busParams.VehicleLength, busParams.VehicleCode, busParams.NumberPassengersLowerDeck)
.Value();
}
@@ -251,9 +251,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
//throw new NotImplementedException();
return new PneumaticUserInputsConfig() {
- KneelingHeight = mission.BusParameter.FloorType == FloorType.LowFloor
- ? Constants.BusAuxiliaries.PneumaticUserConfig.DefaultKneelingHeight
- : 0.SI<Meter>(),
+ KneelingHeight = VectoMath.Max(0.SI<Meter>(), mission.BusParameter.EntranceHeight - Constants.BusParameters.EntranceHeight),
CompressorGearEfficiency = Constants.BusAuxiliaries.PneumaticUserConfig.CompressorGearEfficiency,
CompressorGearRatio = busAux.PneumaticSupply.Ratio,
CompressorMap = GetCompressorMap(busAux.PneumaticSupply.CompressorSize, busAux.PneumaticSupply.Clutch),
@@ -333,12 +331,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var hvacBusLength = busParams.HVACConfiguration == BusHVACSystemConfiguration.Configuration2
? 2 * Constants.BusParameters.DriverCompartmentLength
: busParams.VehicleLength;
- var hvacBusheight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(mission.BusParameter.FloorType, mission.BusParameter.DoubleDecker, busParams.BodyHeight);
+ var hvacBusheight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(mission.BusParameter.VehicleCode, busParams.BodyHeight);
var coolingPower = CalculateMaxCoolingPower(null, mission);
var retVal = GetDefaulSSMInputs(heatingFuel);
- retVal.BusFloorType = busParams.FloorType;
- retVal.Technologies = GetSSMTechnologyBenefits(busAuxInputData, mission.BusParameter.FloorType);
+ retVal.BusFloorType = busParams.VehicleCode.GetFloorType();
+ retVal.Technologies = GetSSMTechnologyBenefits(busAuxInputData, mission.BusParameter.VehicleCode.GetFloorType());
retVal.FuelFiredHeaterPower = busParams.HVACAuxHeaterPower;
retVal.BusWindowSurface = DeclarationData.BusAuxiliaries.WindowHeight(busParams.DoubleDecker) * hvacBusLength +
@@ -347,7 +345,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
busParams.VehicleWidth * busParams.BodyHeight);
retVal.BusVolume = hvacBusLength * busParams.VehicleWidth * hvacBusheight;
- retVal.UValue = DeclarationData.BusAuxiliaries.UValue(busParams.FloorType);
+ retVal.UValue = DeclarationData.BusAuxiliaries.UValue(busParams.VehicleCode.GetFloorType());
retVal.NumberOfPassengers =
DeclarationData.BusAuxiliaries.CalculateBusFloorSurfaceArea(hvacBusLength, busParams.VehicleWidth) *
busParams.PassengerDensity *
@@ -360,7 +358,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.COP = DeclarationData.BusAuxiliaries.CalculateCOP(
coolingPower.Item1, ACCompressorType.None, coolingPower.Item2, busParams.HVACCompressorType,
- busParams.FloorType);
+ busParams.VehicleCode.GetFloorType());
retVal.HVACTechnology = string.Format(
"{0} ({1})", busParams.HVACConfiguration.GetName(),
string.Join(", ", new[] { busParams.HVACCompressorType.GetName(), ACCompressorType.None.GetName() }));
@@ -426,9 +424,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var busParams = mission.BusParameter;
var length = DeclarationData.BusAuxiliaries.CalculateInternalLength(
- busParams.VehicleLength, busParams.DoubleDecker, busParams.FloorType,
+ busParams.VehicleLength, busParams.VehicleCode,
busParams.NumberPassengersLowerDeck);
- var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(busParams.FloorType, busParams.DoubleDecker, busParams.BodyHeight);
+ var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(busParams.VehicleCode, busParams.BodyHeight);
var volume = length * height * busParams.VehicleWidth;
var driver = DeclarationData.BusAuxiliaries.HVACMaxCoolingPower.DriverMaxCoolingPower(
diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index 721faead28..b0cf0b6e74 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Models.Declaration
var rows = _segmentTable.AsEnumerable().Where(
r => {
var currentNumberOfAxles = r.Field<string>("numaxles").ToInt(0);
- var currentVehicleCode = VehicleCodeHelper.Parse(r.Field<string>("vehiclecode"));
+ var currentVehicleCode = r.Field<string>("vehiclecode").ParseEnum<VehicleCode>();
var registrationClasses = RegistrationClassHelper.Parse(r.Field<string>("registrationclasses"));
return currentNumberOfAxles == numberOfAxles
@@ -143,7 +143,7 @@ namespace TUGraz.VectoCore.Models.Declaration
PassengerDensity = row.ParseDouble(missionType.ToString()).SI<PerSquareMeter>(),
AirDragMeasurementAllowed = row.ParseBoolean("airdragmeasurement"),
ElectricalConsumers = GetVehicleEquipment(row),
- DoubleDecker = VehicleCodeHelper.Parse(row.Field<string>("vehiclecode")).IsDoubleDeckerBus(),
+ DoubleDecker = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>().IsDoubleDeckerBus(),
DeltaHeight = row.ParseDouble("deltaheight").SI<Meter>()
}
};
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index f33c9f979b..9686fd3b93 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -241,42 +241,42 @@ namespace TUGraz.VectoCore.Models.Declaration
}
- public static Meter CalculateInternalLength(Meter vehicleLength, bool doubleDecker, FloorType floorType, double numPassLowFloor)
+ public static Meter CalculateInternalLength(Meter vehicleLength, VehicleCode vehicleCode, double numPassLowFloor)
{
- if (floorType == FloorType.LowFloor) {
- return doubleDecker ? 2 * vehicleLength : vehicleLength;
+ if (vehicleCode.GetFloorType() == FloorType.LowFloor) {
+ return vehicleCode.IsDoubleDeckerBus() ? 2 * vehicleLength : vehicleLength;
}
- if (floorType == FloorType.HighFloor) {
- if (doubleDecker) {
+ if (vehicleCode.GetFloorType() == FloorType.HighFloor) {
+ if (vehicleCode.IsDoubleDeckerBus()) {
return numPassLowFloor > 6 ? 1.5 * vehicleLength : vehicleLength + 2.4.SI<Meter>();
}
return vehicleLength;
}
- throw new VectoException("Internal Length for floorType {0} {1} not defined", floorType.ToString(), doubleDecker ? "DD" : "SD");
+ throw new VectoException("Internal Length for floorType {0} {1} not defined", vehicleCode.GetFloorType().ToString(), vehicleCode.IsDoubleDeckerBus() ? "DD" : "SD");
}
public static Meter CalculateLengthInteriorLights(
- Meter vehicleLength, bool doubleDecker, FloorType floorType, double numPassLowFloor)
+ Meter vehicleLength, VehicleCode vehicleCode, double numPassLowFloor)
{
- return CalculateInternalLength(vehicleLength, doubleDecker, floorType, numPassLowFloor);
+ return CalculateInternalLength(vehicleLength, vehicleCode, numPassLowFloor);
}
- public static Meter CalculateInternalHeight(FloorType floorType, bool doubleDecker, Meter vehicleHeight)
+ public static Meter CalculateInternalHeight(VehicleCode vehicleCode, Meter vehicleHeight)
{
- if (doubleDecker) {
+ if (vehicleCode.IsDoubleDeckerBus()) {
return Constants.BusParameters.InternalHeightDoubleDecker;
}
- switch (floorType) {
+ switch (vehicleCode.GetFloorType()) {
case FloorType.LowFloor:
return vehicleHeight;
case FloorType.HighFloor:
return vehicleHeight - Constants.BusParameters.HeightLuggageCompartment;
}
- throw new VectoException("Internal height for vehicle floor type '{0}' {1} not defined", floorType.ToString(), doubleDecker ? "double decker" : "single decker");
+ throw new VectoException("Internal height for vehicle floor type '{0}' {1} not defined", vehicleCode.GetFloorType().ToString(), vehicleCode.IsDoubleDeckerBus() ? "double decker" : "single decker");
}
public static Meter WindowHeight(bool doubleDecker)
diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs
index 821395f814..7b7c669ba9 100644
--- a/VectoCore/VectoCore/Models/Declaration/Mission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public bool DoubleDecker { get; internal set; }
- public FloorType FloorType { get; internal set; }
+ public bool? LowEntry { get; internal set; }
// #### HVAC Model Parameters
@@ -151,6 +151,8 @@ namespace TUGraz.VectoCore.Models.Declaration
public Dictionary<string, double> ElectricalConsumers { get; internal set; }
public Meter DeltaHeight { get; internal set; }
+ public Meter EntranceHeight { get; set; }
+ public VehicleCode VehicleCode { get; set; }
}
diff --git a/VectoCore/VectoCore/Models/Declaration/MissionType.cs b/VectoCore/VectoCore/Models/Declaration/MissionType.cs
index c397234494..3dc2e45247 100644
--- a/VectoCore/VectoCore/Models/Declaration/MissionType.cs
+++ b/VectoCore/VectoCore/Models/Declaration/MissionType.cs
@@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.Models.Declaration
case MissionType.HeavyUrban:
case MissionType.Urban:
case MissionType.Suburban: return 0.2;
- case MissionType.Interurban:
+ case MissionType.Interurban: return 0.25;
case MissionType.Coach: return 0.4;
default: return 0.1;
}
diff --git a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
index 57b7349a48..fe8df1be1a 100644
--- a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
@@ -128,7 +128,9 @@ namespace TUGraz.VectoCore.Models.Declaration
NumberPassengersUpperDeck = row.ParseDouble("passengersupperdeck"),
PassengerDensity = passengerDensity,
DoubleDecker = row.ParseBoolean("doubledecker"),
- FloorType = GetFloorType(row.Field<string>("floortype")),
+ LowEntry = GetLowEntry(row.Field<string>("lowentry")),
+ EntranceHeight = row.ParseDouble("entranceheight").SI(Unit.SI.Milli.Meter).Cast<Meter>(),
+ VehicleCode = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>(),
HVACConfiguration = BusHVACSystemConfigurationHelper.Parse(row.Field<string>("hvacsystemconfiguration")),
HVACAuxHeaterPower = row.ParseDouble("hvacauxheater").SI(Unit.SI.Kilo.Watt).Cast<Watt>(),
HVACCompressorType = ACCompressorTypeExtensions.ParseEnum(row.Field<string>("hvaccompressortype")),
@@ -146,14 +148,15 @@ namespace TUGraz.VectoCore.Models.Declaration
return missions.ToArray();
}
- private FloorType GetFloorType(string field)
+ private bool? GetLowEntry(string field)
{
switch (field) {
- case "high": return FloorType.HighFloor;
- case "low": return FloorType.LowFloor;
- case "semilowfloor":
- case "semilow": return FloorType.SemiLowFloor;
- default: return FloorType.Unknown;
+ case "-": return null;
+ case "0": return false;
+ case "1": return true;
+ //case "semilowfloor":
+ //case "semilow": return FloorType.SemiLowFloor;
+ default: return null;
}
}
diff --git a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
index 862291fb11..0896e26184 100644
--- a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
@@ -1,52 +1,52 @@
Num Axles , Articulated , Vehicle Code , Registration Classes , Low entry , Passengers Lower Deck , Body Height , HDV Group , .vacc file , DesignSpeed , Cross Wind Correction , Heavy Urban , Urban , Suburban , Interurban , Coach , Air Drag Measurement , CdxA Standard , Axle load distribution , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , Is Valid , Delta Height
-2 , 0 , CE , I/I+II/II/A , 0 , - , - , CB31a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CE , I/I+II/II/A , 1 , - , - , CB31b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CF , I/I+II/II/A , - , - , - , CB31c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1 , 0.30
-2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , CB31d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1 , 0.30
-2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , CB31e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1 , 0.30
-2 , 0 , CA , II , - , - , - , CB32a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CA , II+III , - , - , 0-3.1 , CB32b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CA , II+III , - , - , 3.1-999 , CB32c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
-2 , 0 , CA , III/B , - , - , - , CB32d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
-2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , CB32e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
-2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , CB32f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
-3 , 0 , CE , I/I+II/II/A , 0 , - , - , CB33a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CE , I/I+II/II/A , 1 , - , - , CB33b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CF , I/I+II/II/A , - , - , - , CB33c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1 , 0.30
-3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , CB33d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1 , 0.30
-3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , CB33e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1 , 0.30
-3 , 0 , CA , II , - , - , - , CB34a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CA , II+III , - , - , 0-3.1 , CB34b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CA , II+III , - , - , 3.1-999 , CB34c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30
-3 , 0 , CA , III/B , - , - , - , CB34d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30
-3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , CB34e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1 , 0.30
-3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , CB34f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1 , 0.30
-3 , 1 , CG , I/I+II/II/A , 0 , - , - , CB35a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
-3 , 1 , CG , I/I+II/II/A , 1 , - , - , CB35b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
-3 , 1 , CH , I/I+II/II/A , - , - , - , CB35c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CC , II , - , - , - , CB36a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CC , II+III , - , - , 0-3.1 , CB36b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CC , II+III , - , - , 3.1-999 , CB36c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CC , III/B , - , - , - , CB36d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , CB36e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , CB36f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CE , I/I+II/II/A , 0 , - , - , CB37a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CE , I/I+II/II/A , 1 , - , - , CB37b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CF , I/I+II/II/A , - , - , - , CB37c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , CB37d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , CB37e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CA , II , - , - , - , CB38a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CA , II+III , - , - , 0-3.1 , CB38b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CA , II+III , - , - , 3.1-999 , CB38c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CA , III/B , - , - , - , CB38d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , CB38e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , CB38f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CG , I/I+II/II/A , 0 , - , - , CB39a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
-4 , 1 , CG , I/I+II/II/A , 1 , - , - , CB39b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
-4 , 1 , CH , I/I+II/II/A , - , - , - , CB39c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CC , II , - , - , - , CB40a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CC , II+III , - , - , 0-3.1 , CB40b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CC , II+III , - , - , 3.1-999 , CB40c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CC , III/B , - , - , - , CB40d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , CB40e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , CB40f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
\ No newline at end of file
+2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
+2 , 0 , CE , I/I+II/II/A , 1 , - , - , 31b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
+2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1 , 0.30
+2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1 , 0.30
+2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 31e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1 , 0.30
+2 , 0 , CA , II , - , - , - , 32a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
+2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
+2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
+2 , 0 , CA , III/B , - , - , - , 32d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
+2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
+2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1 , 0.30
+3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
+3 , 0 , CE , I/I+II/II/A , 1 , - , - , 33b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
+3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1 , 0.30
+3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1 , 0.30
+3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 33e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1 , 0.30
+3 , 0 , CA , II , - , - , - , 34a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
+3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
+3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30
+3 , 0 , CA , III/B , - , - , - , 34d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1 , 0.30
+3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1 , 0.30
+3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1 , 0.30
+3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
+3 , 1 , CG , I/I+II/II/A , 1 , - , - , 35b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
+3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CC , II , - , - , - , 36a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CC , III/B , - , - , - , 36d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CE , I/I+II/II/A , 1 , - , - , 37b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 37e , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CA , II , - , - , - , 38a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CA , III/B , - , - , - , 38d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
+4 , 1 , CG , I/I+II/II/A , 1 , - , - , 39b , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
+4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CC , II , - , - , - , 40a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CC , III/B , - , - , - , 40d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
+4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
index 16c68f5cc9..9548da237c 100644
--- a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
@@ -1,26 +1,26 @@
-HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , floor type , DesignSpeed , Body , .vacc file , Cross Wind Correction , CdxA Standard , AxlesWeights , Width , Length , Body Height , CurbMass , PassengersLowerDeck , PassengersUpperDeck , Heavy Urban , Urban , Suburban , Interurban , Coach , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , HVAC System Configuration , HVAC Compressor type , HVAC Aux Heater , HVAC Double Glasing , HVAC Heatpump , HVAC Adjustable AuxiliaryHeater , HVAC SeparateAirDistributionDucts
+HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , vehicle code , low entry , DesignSpeed , Body , .vacc file , Cross Wind Correction , CdxA Standard , AxlesWeights , Width , Length , Body Height , entrance height , CurbMass , PassengersLowerDeck , PassengersUpperDeck , Heavy Urban , Urban , Suburban , Interurban , Coach , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , HVAC System Configuration , HVAC Compressor type , HVAC Aux Heater , HVAC Double Glasing , HVAC Heatpump , HVAC Adjustable AuxiliaryHeater , HVAC SeparateAirDistributionDucts
## Heavy Bus Primary Vehicles
-P31SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 10000 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P31DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 10000 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 10000 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P32DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 10000 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P31SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 340 , 11975 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P31DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 340 , 12350 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P32SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P32DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
##
-P33SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P33DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P34DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P33SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14.2 , 2.8 , 340 , 14175 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P33DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 340 , 14725 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P34SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P34DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
-P35SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P35DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P36DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-## ,
-P37SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.8 , 14000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P37DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P38DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P35SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CG , 0 , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18.2 , 2.8 , 340 , 17800 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P35DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 340 , 20250 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P36SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+##
+P37SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.8 , 340 , 15000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P37DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 340 , 18700 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P38SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
-P39SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 2.6 , 14000 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P39DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P40DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P39SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CG , 0 , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 2.6 , 340 , 19600 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P39DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 340 , 24800 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P40SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 350bb56054..f6a8f79f9c 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -1013,6 +1013,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
[TestCase(JobFile_Group41, TestName = "RunCompletedBusSimulation Group41/32b"),
TestCase(JobFile_Group42, TestName = "RunCompletedBusSimulation Group42/33b"),
TestCase(JobFilePrimary41, TestName = "RunPrimaryBusSimulation Group41"),
+ TestCase(@"TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_nonSmart_AT-P.xml", TestName = "RunPrimaryBusSimulation Group41 AT-P"),
+ TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", TestName = "RunPrimaryBusSimulation Group41 ES-AUX"),
TestCase(JobFilePrimary42, TestName = "RunPrimaryBusSimulation Group42"),
TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_41-32b.vecto", TestName = "RunSingleBusSimulation Group 41/32b"),
TestCase(@"TestData\Integration\Buses\FactorMethod\SingleBus_42-33b.vecto", TestName = "RunSingleBusSimulation Group 42/33b"),
@@ -1048,7 +1050,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
[TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),]
+ TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),
+
+ TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
+ TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
+ TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS_SmartES.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS SmartES"),
+ ]
public void TestRunPrimaryBusSimulation_ESS(string jobName, int runIdx)
{
var relativeJobPath = jobName;
@@ -1077,5 +1084,35 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error)));
//Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException)));
}
+
+ [TestCase(@"E:\QUAM\tmp\primary_heavyBus group 42_SmartPS_spec engine map.xml", 0),]
+ public void TestRunPrimaryBusSimulationSngle(string jobName, int runIdx)
+ {
+ var relativeJobPath = jobName;
+ var writer = new FileOutputWriter(relativeJobPath);
+ var inputData = Path.GetExtension(relativeJobPath) == ".xml"
+ ? xmlInputReader.CreateDeclaration(relativeJobPath)
+ : JSONInputDataFactory.ReadJsonJob(relativeJobPath);
+ var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
+ WriteModalResults = true,
+ //ActualModalData = true,
+ Validate = false
+ };
+ var jobContainer = new JobContainer(new SummaryDataContainer(writer));
+
+ var runs = factory.SimulationRuns().ToArray();
+
+ runs[runIdx].Run();
+
+ Assert.IsTrue(runs[runIdx].FinishedWithoutErrors);
+
+ //jobContainer.AddRuns(factory);
+
+ //jobContainer.Execute();
+ //jobContainer.WaitFinished();
+ //var progress = jobContainer.GetProgress();
+ //Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error)));
+ //Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException)));
+ }
}
}
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index 4e1a008829..f8c598653e 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -20,17 +20,17 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31a, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB31b, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB31c, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB31d, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB31e, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB32a, 2),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.ClassCB32b, 2),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB32c, 2),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.ClassCB32d, 2),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.B, 6, 0, false, VehicleClass.ClassCB32e, 2),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.II, 7, 0, false, VehicleClass.ClassCB32f, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class31a, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class31c, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class31d, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class31e, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.Class32a, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.Class32b, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class32c, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.Class32d, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.B, 6, 0, false, VehicleClass.Class32e, 2),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.II, 7, 0, false, VehicleClass.Class32f, 2),
]
public void SegmentLookupTest(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass, int passengersLowerDeck,
double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.IsNotNull(segment.AccelerationFile);
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31a, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class31a, 3)]
public void TestComplete2AxlesCompleteBus31A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -72,7 +72,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB31b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b, 3)]
public void TestComplete2AxlesCompleteBus31B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31c, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.I, 0, 0, false, VehicleClass.Class31c, 3)]
public void TestComplete2AxlesCompleteBus31F(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -136,7 +136,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB31d, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class31d, 3)]
public void TestComplete2AxlesCompleteBus31D(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB31e, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class31e, 3)]
public void TestComplete2AxlesCompleteBus31E(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -202,7 +202,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB32a, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.Class32a, 2)]
public void TestComplete2AxlesCompleteBus32A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -235,7 +235,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.ClassCB32b, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.Class32b, 2)]
public void TestComplete2AxlesCompleteBus32B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -267,7 +267,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB32c, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class32c, 2)]
public void TestComplete2AxlesCompleteBus32C(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -300,7 +300,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.ClassCB32d, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.Class32d, 2)]
public void TestComplete2AxlesCompleteBus32D(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -332,7 +332,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.B, 6, 0, false, VehicleClass.ClassCB32e, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.B, 6, 0, false, VehicleClass.Class32e, 2)]
public void TestComplete2AxlesCompleteBus32E(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -364,7 +364,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.II, 7, 0, false, VehicleClass.ClassCB32f, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CB, RegistrationClass.II, 7, 0, false, VehicleClass.Class32f, 2)]
public void TestComplete2AxlesCompleteBus32F(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index aaa918acbe..232c0de95e 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -24,27 +24,27 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB33a, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB33b, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB33c, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB33d, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB33e, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB34a, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.ClassCB34b, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB34c, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.ClassCB34d, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.ClassCB34e, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.ClassCB34f, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class33a, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class33c, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class33d, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class33e, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.Class34a, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.Class34b, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class34c, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.Class34d, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.Class34e, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.Class34f, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB35a, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB35b, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB35c, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB36a, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.ClassCB36b, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB36c, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB36d, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CD, RegistrationClass.III, 5, 0, false, VehicleClass.ClassCB36e, 2),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CD, RegistrationClass.II, 10, 0, false, VehicleClass.ClassCB36f, 2)
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class35a, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.Class35c, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.Class36a, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.Class36b, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class36c, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.B, 0, 0, false, VehicleClass.Class36d, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CD, RegistrationClass.III, 5, 0, false, VehicleClass.Class36e, 2),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CD, RegistrationClass.II, 10, 0, false, VehicleClass.Class36f, 2)
]
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB33a, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class33a, 3)]
public void TestComplete3AxlesCompleteBus33A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB33b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b, 3)]
public void TestComplete3AxlesCompleteBus33B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -119,7 +119,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB33c, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class33c, 3)]
public void TestComplete3AxlesCompleteBus33C(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -150,7 +150,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB33d, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class33d, 3)]
public void TestComplete3AxlesCompleteBus33D(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -182,7 +182,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB33e, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class33e, 3)]
public void TestComplete3AxlesCompleteBus33E(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -214,7 +214,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB34a, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.Class34a, 2)]
public void TestComplete3AxlesCompleteBus34A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -246,7 +246,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.ClassCB34b, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.Class34b, 2)]
public void TestComplete3AxlesCompleteBus34B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -278,7 +278,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB34c, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class34c, 2)]
public void TestComplete3AxlesCompleteBus34C(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -310,7 +310,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.ClassCB34d, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.Class34d, 2)]
public void TestComplete3AxlesCompleteBus34D(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -342,7 +342,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.ClassCB34e, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.Class34e, 2)]
public void TestComplete3AxlesCompleteBus34E(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -374,7 +374,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.ClassCB34f, 2)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.Class34f, 2)]
public void TestComplete3AxlesCompleteBus34F(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -406,7 +406,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB35a, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class35a, 3)]
public void TestComplete3AxlesCompleteBus35A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -436,7 +436,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB35b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b, 3)]
public void TestComplete3AxlesCompleteBus35B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index c75ac8a4de..96f8ab52d6 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -20,27 +20,27 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB37a, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB37b, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB37c, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB37d, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB37e, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB38a, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.ClassCB38b, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB38c, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.ClassCB38d, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.ClassCB38e, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.ClassCB38f, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class37a, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class37b, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class37c, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class37d, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class37e, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II, 0, 0, false, VehicleClass.Class38a, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1, false, VehicleClass.Class38b, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class38c, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CA, RegistrationClass.III, 0, 0, false, VehicleClass.Class38d, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CB, RegistrationClass.B, 5, 0, false, VehicleClass.Class38e, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.Class38f, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB39a, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB39b, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.ClassCB39c, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.ClassCB40a, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.ClassCB40b, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.ClassCB40c, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.B, 0, 0, false, VehicleClass.ClassCB40d, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CD, RegistrationClass.III, 5, 0, false, VehicleClass.ClassCB40e, 2),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CD, RegistrationClass.II, 10, 0, false, VehicleClass.ClassCB40f, 2)
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class39a, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.Class39c, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.Class40a, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.Class40b, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1001, false, VehicleClass.Class40c, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.B, 0, 0, false, VehicleClass.Class40d, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CD, RegistrationClass.III, 5, 0, false, VehicleClass.Class40e, 2),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CD, RegistrationClass.II, 10, 0, false, VehicleClass.Class40f, 2)
]
public void SegmentLookupTest(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass, int passengersLowerDeck,
double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB39a, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class39a, 3)]
public void TestComplete4AxlesCompleteBus39A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.ClassCB39b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b, 3)]
public void TestComplete4AxlesCompleteBus39B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index bf80aaff22..7a63609ffe 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -14,64 +14,64 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.LowFloor, false, false,
- VehicleClass.ClassPB41),
+ VehicleClass.ClassP31_32),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.HighFloor, true, false,
- VehicleClass.ClassPB41),
+ VehicleClass.ClassP31_32),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.LowFloor, false, true,
- VehicleClass.ClassPB41),
+ VehicleClass.ClassP31_32),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.HighFloor, true, true,
- VehicleClass.ClassPB41),
+ VehicleClass.ClassP31_32),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.LowFloor, false, false,
- VehicleClass.ClassPB42),
+ VehicleClass.ClassP33_34),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.HighFloor, true, false,
- VehicleClass.ClassPB42),
+ VehicleClass.ClassP33_34),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.LowFloor, false, false,
- VehicleClass.ClassPB42),
+ VehicleClass.ClassP33_34),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.HighFloor, true, false,
- VehicleClass.ClassPB42),
+ VehicleClass.ClassP33_34),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.LowFloor, false, true,
- VehicleClass.ClassPB43),
+ VehicleClass.ClassP35_36),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.HighFloor, true, true,
- VehicleClass.ClassPB43),
+ VehicleClass.ClassP35_36),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.LowFloor, false, true,
- VehicleClass.ClassPB43),
+ VehicleClass.ClassP35_36),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.HighFloor, true, true,
- VehicleClass.ClassPB43),
+ VehicleClass.ClassP35_36),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.LowFloor, false, false,
- VehicleClass.ClassPB44),
+ VehicleClass.ClassP37_38),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.HighFloor, true, false,
- VehicleClass.ClassPB44),
+ VehicleClass.ClassP37_38),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.LowFloor, false, false,
- VehicleClass.ClassPB44),
+ VehicleClass.ClassP37_38),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.HighFloor, true, false,
- VehicleClass.ClassPB44),
+ VehicleClass.ClassP37_38),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.LowFloor, false, true,
- VehicleClass.ClassPB45),
+ VehicleClass.ClassP39_40),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.HighFloor, true, true,
- VehicleClass.ClassPB45),
+ VehicleClass.ClassP39_40),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.LowFloor, false, true,
- VehicleClass.ClassPB45),
+ VehicleClass.ClassP39_40),
TestCase(
VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.HighFloor, true, true,
- VehicleClass.ClassPB45),
+ VehicleClass.ClassP39_40),
]
public void SegmentLookupTest(
VehicleCategory category, AxleConfiguration axleConfiguration, FloorType floorType, bool doubleDecker,
@@ -86,7 +86,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase()]
- public void TestPrimaryBusGroup41Test()
+ public void TestPrimaryBusGroup31_32Test()
{
var vehicleData = new {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
@@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleData.DoubleDecker);
Assert.AreEqual(10, segment.Missions.Length);
- Assert.AreEqual(VehicleClass.ClassPB41, segment.VehicleClass);
+ Assert.AreEqual(VehicleClass.ClassP31_32, segment.VehicleClass);
var missions = new[]
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 12,
width: 2.55,
height: 2.8,
- curbMass: 10000,
+ curbMass: 11975,
refLoad: 5618.16,
lowLoad: 1123.632,
axleWeightDistribution: new[] { 0.375, 0.625 },
@@ -130,7 +130,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 10.5,
width: 2.55,
height: 3.8,
- curbMass: 10000,
+ curbMass: 12350,
refLoad: 5966.694,
lowLoad: 1193.3388,
axleWeightDistribution: new[] { 0.375, 0.625 },
@@ -145,9 +145,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 12,
width: 2.55,
height: 3.15,
- curbMass: 10000,
+ curbMass: 13150,
refLoad: 4301.748,
- lowLoad: 860.3496 * 2,
+ lowLoad: 1075.437,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
@@ -158,7 +158,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 12,
width: 2.55,
height: 3.15,
- curbMass: 10000,
+ curbMass: 13150,
refLoad: 2737.476,
lowLoad: 547.4952 * 2,
axleWeightDistribution: new[] { 0.375, 0.625 },
@@ -172,9 +172,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 10.5,
width: 2.55,
height: 3.7,
- curbMass: 10000,
+ curbMass: 13400,
refLoad: 5051.295,
- lowLoad: 1010.259 * 2,
+ lowLoad: 1262.82375,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 2, 1, 1)
);
@@ -185,7 +185,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 10.5,
width: 2.55,
height: 3.7,
- curbMass: 10000,
+ curbMass: 13400,
refLoad: 3367.53,
lowLoad: 673.506 * 2,
axleWeightDistribution: new[] { 0.375, 0.625 },
@@ -195,7 +195,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[TestCase()]
- public void TestPrimaryBusGroup42Test()
+ public void TestPrimaryBusGroup33_34Test()
{
var vehicleData = new {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
@@ -209,7 +209,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleData.DoubleDecker);
Assert.AreEqual(10, segment.Missions.Length);
- Assert.AreEqual(VehicleClass.ClassPB42, segment.VehicleClass);
+ Assert.AreEqual(VehicleClass.ClassP33_34, segment.VehicleClass);
var missions = new[]
{ MissionType.HeavyUrban, MissionType.Urban, MissionType.Suburban, MissionType.Interurban, MissionType.Coach };
@@ -222,7 +222,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 14.2,
width: 2.55,
height: 2.8,
- curbMass: 12000,
+ curbMass: 14175,
refLoad: 6762.6,
lowLoad: 1352.52,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
@@ -237,7 +237,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 13.5,
width: 2.55,
height: 3.8,
- curbMass: 12000,
+ curbMass: 14725,
refLoad: 7891.434,
lowLoad: 1578.2868,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
@@ -252,9 +252,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 13.8,
width: 2.55,
height: 3.15,
- curbMass: 12000,
+ curbMass: 15213,
refLoad: 5018.706,
- lowLoad: 1003.7412 * 2,
+ lowLoad: 1254.6765,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
@@ -265,7 +265,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 13.8,
width: 2.55,
height: 3.15,
- curbMass: 12000,
+ curbMass: 15213,
refLoad: 3193.722,
lowLoad: 638.7444 * 2,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
@@ -279,9 +279,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 14,
width: 2.55,
height: 3.7,
- curbMass: 12000,
+ curbMass: 17850,
refLoad: 6952.32,
- lowLoad: 1390.464 * 2,
+ lowLoad: 1738.08,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 4, 1, 1.5)
);
@@ -292,7 +292,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 14,
width: 2.55,
height: 3.7,
- curbMass: 12000,
+ curbMass: 17850,
refLoad: 4634.88,
lowLoad: 926.976 * 2,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
@@ -302,7 +302,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[TestCase()]
- public void TestPrimaryBusGroup43Test()
+ public void TestPrimaryBusGroup35_36Test()
{
var vehicleData = new {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
@@ -316,7 +316,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleData.DoubleDecker);
Assert.AreEqual(10, segment.Missions.Length);
- Assert.AreEqual(VehicleClass.ClassPB43, segment.VehicleClass);
+ Assert.AreEqual(VehicleClass.ClassP35_36, segment.VehicleClass);
var missions = new[]
{ MissionType.HeavyUrban, MissionType.Urban, MissionType.Suburban, MissionType.Interurban, MissionType.Coach };
@@ -329,7 +329,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 2.8,
- curbMass: 12000,
+ curbMass: 17800,
refLoad: 8843.4,
lowLoad: 1768.68,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
@@ -344,7 +344,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 3.8,
- curbMass: 12000,
+ curbMass: 20250,
refLoad: 10906.86,
lowLoad: 2181.372,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
@@ -359,9 +359,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 3.15,
- curbMass: 12000,
+ curbMass: 19267,
refLoad: 6771.27,
- lowLoad: 1354.254 * 2,
+ lowLoad: 1692.8175,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -372,7 +372,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 3.15,
- curbMass: 12000,
+ curbMass: 19267,
refLoad: 4308.99,
lowLoad: 861.798 * 2,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
@@ -385,9 +385,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 3.7,
- curbMass: 12000,
+ curbMass: 21375,
refLoad: 9233.55,
- lowLoad: 1846.71 * 2,
+ lowLoad: 2308.3875,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -398,7 +398,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 18.2,
width: 2.55,
height: 3.7,
- curbMass: 12000,
+ curbMass: 21375,
refLoad: 6155.7,
lowLoad: 1231.14 * 2,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
@@ -408,7 +408,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[TestCase()]
- public void TestPrimaryBusGroup44Test()
+ public void TestPrimaryBusGroup37_38Test()
{
var vehicleData = new {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
@@ -422,7 +422,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleData.DoubleDecker);
Assert.AreEqual(10, segment.Missions.Length);
- Assert.AreEqual(VehicleClass.ClassPB44, segment.VehicleClass);
+ Assert.AreEqual(VehicleClass.ClassP37_38, segment.VehicleClass);
var missions = new[]
{ MissionType.HeavyUrban, MissionType.Urban, MissionType.Suburban, MissionType.Interurban, MissionType.Coach };
@@ -435,7 +435,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 2.8,
- curbMass: 14000,
+ curbMass: 15000,
refLoad: 7178.76,
lowLoad: 1435.752,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
@@ -450,7 +450,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 3.8,
- curbMass: 14000,
+ curbMass: 18700,
refLoad: 8853.804,
lowLoad: 1770.7608,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
@@ -465,9 +465,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 3.15,
- curbMass: 14000,
+ curbMass: 17500,
refLoad: 5496.6780,
- lowLoad: 1099.3356 * 2,
+ lowLoad: 1374.16950,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -478,7 +478,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 3.15,
- curbMass: 14000,
+ curbMass: 17500,
refLoad: 3497.886,
lowLoad: 699.5772 * 2,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
@@ -492,9 +492,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 3.7,
- curbMass: 14000,
+ curbMass: 21200,
refLoad: 7495.47,
- lowLoad: 1499.094 * 2,
+ lowLoad: 1873.86750,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -505,7 +505,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 15,
width: 2.55,
height: 3.7,
- curbMass: 14000,
+ curbMass: 21200,
refLoad: 4996.98,
lowLoad: 999.396 * 2,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
@@ -515,7 +515,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[TestCase()]
- public void TestPrimaryBusGroup45Test()
+ public void TestPrimaryBusGroup39_40Test()
{
var vehicleData = new {
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
@@ -529,7 +529,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleData.DoubleDecker);
Assert.AreEqual(10, segment.Missions.Length);
- Assert.AreEqual(VehicleClass.ClassPB45, segment.VehicleClass);
+ Assert.AreEqual(VehicleClass.ClassP39_40, segment.VehicleClass);
var missions = new[]
{ MissionType.HeavyUrban, MissionType.Urban, MissionType.Suburban, MissionType.Interurban, MissionType.Coach };
@@ -542,7 +542,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 2.6,
- curbMass: 14000,
+ curbMass: 19600,
refLoad: 10299.96,
lowLoad: 2059.992,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
@@ -557,7 +557,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 3.8,
- curbMass: 14000,
+ curbMass: 24800,
refLoad: 12703.284,
lowLoad: 2540.6568,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
@@ -572,9 +572,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 3.15,
- curbMass: 14000,
+ curbMass: 20950,
refLoad: 7886.538,
- lowLoad: 1577.3076 * 2,
+ lowLoad: 1971.6345,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -585,7 +585,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 3.15,
- curbMass: 14000,
+ curbMass: 20950,
refLoad: 5018.706,
lowLoad: 1003.7412 * 2,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
@@ -599,9 +599,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 3.7,
- curbMass: 14000,
+ curbMass: 24600,
refLoad: 10754.37,
- lowLoad: 2150.874 * 2,
+ lowLoad: 2688.5925,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
@@ -612,7 +612,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
length: 21,
width: 2.55,
height: 3.7,
- curbMass: 14000,
+ curbMass: 24600,
refLoad: 7169.58,
lowLoad: 1433.916 * 2,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
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
index 7f0b49b268..1b50024a92 100644
--- 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
@@ -1,6 +1,6 @@
<?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-1ab386aa885d407a830f">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-3c3a0ed335444192bea8">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -214,13 +214,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-f7dc5223f7de446cbf3f">
+ <di:Reference URI="#RESULT-2f5cc7aab2544f56ae73">
<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>zkLb3eBNIM5Jn2qW6VlLeoCD2Klt1p5OBsJICXEv7hU=</di:DigestValue>
+ <di:DigestValue>bOrQ6bQixJt5hoaDBGcf49dOqY2XRBZ0mhKqXzuO+Ok=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -229,296 +229,296 @@
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.55874</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.12292</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1507.0</CO2>
+ <CO2 unit="g/km">1621.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">24.72664</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.33759</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1812.5</CO2>
+ <CO2 unit="g/km">1930.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.51737</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.87775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1210.8</CO2>
+ <CO2 unit="g/km">1310.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.97854</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.34392</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1464.5</CO2>
+ <CO2 unit="g/km">1564.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.54914</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.88888</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1066.5</CO2>
+ <CO2 unit="g/km">1164.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.78057</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.06094</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1303.4</CO2>
+ <CO2 unit="g/km">1397.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.69855</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.57521</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1517.2</CO2>
+ <CO2 unit="g/km">1654.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">25.05212</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.99415</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1836.4</CO2>
+ <CO2 unit="g/km">1978.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.71817</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.32938</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1225.5</CO2>
+ <CO2 unit="g/km">1343.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.34373</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.95764</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1491.2</CO2>
+ <CO2 unit="g/km">1609.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.81370</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.41503</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1085.9</CO2>
+ <CO2 unit="g/km">1203.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.20023</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.70852</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1334.1</CO2>
+ <CO2 unit="g/km">1444.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11720.70</TotalVehicleMass>
- <Payload unit="kg">1720.70</Payload>
- <PassengerCount>24.24</PassengerCount>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.71183</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.95443</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">931.8</CO2>
+ <CO2 unit="g/km">1022.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14301.75</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
<Payload unit="kg">4301.75</Payload>
<PassengerCount>60.59</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.10937</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.69902</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1034.2</CO2>
+ <CO2 unit="g/km">1150.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11094.99</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
<Payload unit="kg">1094.99</Payload>
<PassengerCount>15.42</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.30279</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.00564</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">828.5</CO2>
+ <CO2 unit="g/km">880.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12737.48</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
<Payload unit="kg">2737.48</Payload>
<PassengerCount>38.56</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.69546</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.43599</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">857.3</CO2>
+ <CO2 unit="g/km">911.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12020.52</TotalVehicleMass>
- <Payload unit="kg">2020.52</Payload>
- <PassengerCount>28.46</PassengerCount>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.99600</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.32957</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">952.6</CO2>
+ <CO2 unit="g/km">1050.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15051.30</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
<Payload unit="kg">5051.30</Payload>
<PassengerCount>71.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.62679</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.30992</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1072.2</CO2>
+ <CO2 unit="g/km">1195.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11347.01</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
<Payload unit="kg">1347.01</Payload>
<PassengerCount>18.97</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.78953</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.52741</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">864.2</CO2>
+ <CO2 unit="g/km">918.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13367.53</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
<Payload unit="kg">3367.53</Payload>
<PassengerCount>47.43</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.24810</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.01279</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">897.8</CO2>
+ <CO2 unit="g/km">953.9</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-20T06:06:22.9933333Z</Date>
+ <Date>2020-04-27T15:04:22.0809726Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-1ab386aa885d407a830f">
+ <di:Reference URI="#PIF-3c3a0ed335444192bea8">
<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>naBcEFhLacU2ZsLiDYpvQm0wI2mrRBpTmYzOgIDek/c=</di:DigestValue>
+ <di:DigestValue>4feqZKffRbmushwCdq9Rz1vO+NRc5prQhCGvhbjovVM=</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
index aed749b44f..2560c2115e 100644
--- 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
@@ -1,6 +1,6 @@
<?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-5281cbbdf40b4d569b81">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-b38afb14ebf64d7b9994">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -90,37 +90,6 @@
</Gears>
</Data>
</Transmission>
- <TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
- <Manufacturer>Some Manufacturer</Manufacturer>
- <Model>Some Model</Model>
- <CertificationMethod>Standard values</CertificationMethod>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-02-15T11:00:00Z</Date>
- <AppVersion>TC CalcApp 123</AppVersion>
- <Characteristics>
- <Entry speedRatio="0.0000" torqueRatio="4.50" inputTorqueRef="700.00"/>
- <Entry speedRatio="0.1000" torqueRatio="3.50" inputTorqueRef="640.00"/>
- <Entry speedRatio="0.2000" torqueRatio="2.70" inputTorqueRef="560.00"/>
- <Entry speedRatio="0.3000" torqueRatio="2.20" inputTorqueRef="460.00"/>
- <Entry speedRatio="0.4000" torqueRatio="1.60" inputTorqueRef="350.00"/>
- <Entry speedRatio="0.5000" torqueRatio="1.20" inputTorqueRef="250.00"/>
- <Entry speedRatio="0.6000" torqueRatio="0.90" inputTorqueRef="160.00"/>
- <Entry speedRatio="0.7400" torqueRatio="0.90" inputTorqueRef="1.00"/>
- <Entry speedRatio="0.8100" torqueRatio="1.00" inputTorqueRef="-40.34"/>
- <Entry speedRatio="0.9100" torqueRatio="1.00" inputTorqueRef="-80.34"/>
- <Entry speedRatio="1.0200" torqueRatio="1.00" inputTorqueRef="-136.11"/>
- <Entry speedRatio="1.1600" torqueRatio="1.00" inputTorqueRef="-216.52"/>
- <Entry speedRatio="1.3600" torqueRatio="1.00" inputTorqueRef="-335.19"/>
- <Entry speedRatio="1.6300" torqueRatio="1.00" inputTorqueRef="-528.77"/>
- <Entry speedRatio="2.0400" torqueRatio="1.00" inputTorqueRef="-883.40"/>
- <Entry speedRatio="3.2600" torqueRatio="1.00" inputTorqueRef="-2462.17"/>
- <Entry speedRatio="8.1500" torqueRatio="1.00" inputTorqueRef="-16540.98"/>
- <Entry speedRatio="28.1500" torqueRatio="0.20" inputTorqueRef="-116540.98"/>
- </Characteristics>
- </Data>
- </TorqueConverter>
-
<Axlegear>
<Data xsi:type="AxlegearDataPIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
@@ -232,13 +201,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-c2a4ca7417ef4403bfb1">
+ <di:Reference URI="#RESULT-401fc11dff10458fa7d3">
<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>8uddySyC6a8GJzIXjqKNlelzMUZCxb0Tzgtr+SgtyMg=</di:DigestValue>
+ <di:DigestValue>G6pV7UUBa4Tu2R2azvxxI+Xwrk+EUmpwlWfLnrUgelU=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -247,296 +216,296 @@
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.23345</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.97504</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1629.8</CO2>
+ <CO2 unit="g/km">1757.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.83537</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">28.62965</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1967.1</CO2>
+ <CO2 unit="g/km">2098.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.56540</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.01393</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1287.6</CO2>
+ <CO2 unit="g/km">1393.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.30146</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.79643</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1561.4</CO2>
+ <CO2 unit="g/km">1671.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.01495</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.38848</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1100.6</CO2>
+ <CO2 unit="g/km">1201.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.33820</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.63719</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1344.2</CO2>
+ <CO2 unit="g/km">1439.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.38606</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">24.45016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1640.9</CO2>
+ <CO2 unit="g/km">1792.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">27.19393</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">29.32238</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1993.4</CO2>
+ <CO2 unit="g/km">2149.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.74623</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.47331</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1300.8</CO2>
+ <CO2 unit="g/km">1427.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.67295</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.45718</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1588.7</CO2>
+ <CO2 unit="g/km">1719.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.27559</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.90512</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1119.7</CO2>
+ <CO2 unit="g/km">1239.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.74151</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.27630</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1373.8</CO2>
+ <CO2 unit="g/km">1486.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11720.70</TotalVehicleMass>
- <Payload unit="kg">1720.70</Payload>
- <PassengerCount>24.24</PassengerCount>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.88776</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.32222</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">944.7</CO2>
+ <CO2 unit="g/km">1049.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14301.75</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
<Payload unit="kg">4301.75</Payload>
<PassengerCount>60.59</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.46004</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.26264</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1060.0</CO2>
+ <CO2 unit="g/km">1192.1</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11094.99</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
<Payload unit="kg">1094.99</Payload>
<PassengerCount>15.42</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.34413</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.16119</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">831.5</CO2>
+ <CO2 unit="g/km">891.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12737.48</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
<Payload unit="kg">2737.48</Payload>
<PassengerCount>38.56</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.74344</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.60476</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">860.8</CO2>
+ <CO2 unit="g/km">924.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12020.52</TotalVehicleMass>
- <Payload unit="kg">2020.52</Payload>
- <PassengerCount>28.46</PassengerCount>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.16650</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.72559</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">965.1</CO2>
+ <CO2 unit="g/km">1079.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15051.30</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
<Payload unit="kg">5051.30</Payload>
<PassengerCount>71.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.08617</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.92556</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1105.8</CO2>
+ <CO2 unit="g/km">1240.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11347.01</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
<Payload unit="kg">1347.01</Payload>
<PassengerCount>18.97</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.84055</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.68026</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">867.9</CO2>
+ <CO2 unit="g/km">929.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13367.53</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
<Payload unit="kg">3367.53</Payload>
<PassengerCount>47.43</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.30440</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.20667</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">901.9</CO2>
+ <CO2 unit="g/km">968.1</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-20T06:35:28.9714193Z</Date>
+ <Date>2020-04-27T15:20:47.5882303Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-5281cbbdf40b4d569b81">
+ <di:Reference URI="#PIF-b38afb14ebf64d7b9994">
<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>Aq2kgZmKyRjWhx5xQY1wJvN6CjGGnX+owVW/VdVWui4=</di:DigestValue>
+ <di:DigestValue>jCI3DmkyeDxwqruVCC9WQan2/VSsfuB2fbiGUQH6B+E=</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
index ff62f8aae5..73b2b1eacf 100644
--- 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
@@ -1,6 +1,6 @@
-<?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-1a5c4fd556f14ec8ac23">
+<?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-4547e7655ef846a59ce4">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -255,23 +255,23 @@
</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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
- </di:Reference>
+ <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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
+ </di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-bfe32d82bc964c108ed0">
+ <di:Reference URI="#RESULT-7aec58efb2f74c059ffa">
<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>1g9GT522b4FZfr8XwSCNBMfrdcP9F6MoZHxRWugnOzs=</di:DigestValue>
+ <di:DigestValue>eNjTT9Oy2Bu8HDCg/K+XH4l6Pl2jrlbcifUajMsJ+dA=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -280,296 +280,296 @@
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+ <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">20.88156</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.34507</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1530.7</CO2>
+ <CO2 unit="g/km">1637.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+ <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.19313</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.71425</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1846.7</CO2>
+ <CO2 unit="g/km">1958.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+ <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.27847</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.54681</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1193.2</CO2>
+ <CO2 unit="g/km">1286.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+ <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">19.84642</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.15782</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1454.8</CO2>
+ <CO2 unit="g/km">1550.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13352.52</TotalVehicleMass>
+ <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">13.77284</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.04555</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1009.6</CO2>
+ <CO2 unit="g/km">1102.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18762.60</TotalVehicleMass>
+ <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.16015</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.39865</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1257.9</CO2>
+ <CO2 unit="g/km">1348.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+ <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">21.20835</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.09253</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1554.6</CO2>
+ <CO2 unit="g/km">1692.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+ <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">26.15141</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">28.09841</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1917.0</CO2>
+ <CO2 unit="g/km">2059.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+ <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">16.61571</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.21362</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1218.0</CO2>
+ <CO2 unit="g/km">1335.1</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+ <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">20.72374</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.38977</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1519.1</CO2>
+ <CO2 unit="g/km">1641.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13578.29</TotalVehicleMass>
+ <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">14.11255</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.70160</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1034.5</CO2>
+ <CO2 unit="g/km">1151.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19891.43</TotalVehicleMass>
+ <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">18.01528</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.55551</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1320.6</CO2>
+ <CO2 unit="g/km">1433.5</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.27</PassengerCount>
+ <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.47502</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.58748</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">841.1</CO2>
+ <CO2 unit="g/km">922.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17018.71</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">20231.71</TotalVehicleMass>
<Payload unit="kg">5018.71</Payload>
<PassengerCount>70.69</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.95176</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.45973</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">949.4</CO2>
+ <CO2 unit="g/km">1059.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13277.49</TotalVehicleMass>
+ <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.74194</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.48143</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">640.8</CO2>
+ <CO2 unit="g/km">695.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15193.72</TotalVehicleMass>
+ <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.21875</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.96560</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">675.8</CO2>
+ <CO2 unit="g/km">730.5</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.17</PassengerCount>
+ <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">12.01195</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.24030</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">880.5</CO2>
+ <CO2 unit="g/km">1043.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18952.32</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">24802.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">14.07047</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.77091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1031.4</CO2>
+ <CO2 unit="g/km">1229.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13853.95</TotalVehicleMass>
+ <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.27959</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">10.63937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">680.2</CO2>
+ <CO2 unit="g/km">779.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">16634.88</TotalVehicleMass>
+ <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">9.95462</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.34890</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">729.7</CO2>
+ <CO2 unit="g/km">831.9</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-16T12:23:52.6883135Z</Date>
+ <Date>2020-04-27T15:27:55.0235083Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-1a5c4fd556f14ec8ac23">
+ <di:Reference URI="#PIF-4547e7655ef846a59ce4">
<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>b3547elwo1lTvTbxKYq/b7VwOEygVUcPt9E/kpjkMcY=</di:DigestValue>
+ <di:DigestValue>Bd6+KBNxRH+VvltBoDPg1kX8DVKHlMClWX6SOQjV9Nc=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index 2e4dde98a3..e51e272c37 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -11,6 +11,7 @@
<VehicleCode>CA</VehicleCode>
<CurbMassChassis>8300</CurbMassChassis>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <NgTankSystem>Compressed</NgTankSystem>
<RegisteredPassengers>
<LowerDeck>30</LowerDeck>
<UpperDeck>0</UpperDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
index 831b6d5920..cbffa8c530 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?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-1e0e376f9424423ab5bc">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-ee3fb48489044a79a1ed">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -59,7 +59,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00" />
</FullLoadAndDragCurve>
<Fuels>
- <FuelType>Diesel CI</FuelType>
+ <FuelType>NG CI</FuelType>
</Fuels>
</Mode>
</Data>
@@ -236,13 +236,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-110cacb92a4e4d209e97">
+ <di:Reference URI="#RESULT-54f0b68e380a4fa3abe0">
<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>B4//vERuSq39BSoxMVAPbY2di8NYaYOqHUkOWYJ1BxQ=</di:DigestValue>
+ <di:DigestValue>f+tMDAgSLYwGqTWDD34xLNT8wHyy/8E9frPGKdSKEX0=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -251,296 +251,296 @@
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.53611</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">18.84546</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">982.8</CO2>
+ <CO2 unit="g/km">1056.1</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.12671</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">22.54566</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1184.0</CO2>
+ <CO2 unit="g/km">1263.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.01515</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">15.14071</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">785.4</CO2>
+ <CO2 unit="g/km">848.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.01467</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">18.22196</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">953.5</CO2>
+ <CO2 unit="g/km">1021.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.21061</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">13.37478</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">684.3</CO2>
+ <CO2 unit="g/km">749.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.10177</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">16.31513</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">846.3</CO2>
+ <CO2 unit="g/km">914.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.68650</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">19.24449</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">991.2</CO2>
+ <CO2 unit="g/km">1078.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.43298</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">23.17053</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1201.1</CO2>
+ <CO2 unit="g/km">1298.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.19064</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">15.55164</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">795.3</CO2>
+ <CO2 unit="g/km">871.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.34295</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">18.79571</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">971.9</CO2>
+ <CO2 unit="g/km">1053.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.44190</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">13.83562</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">697.3</CO2>
+ <CO2 unit="g/km">775.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.44072</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">16.93966</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">865.3</CO2>
+ <CO2 unit="g/km">949.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11720.70</TotalVehicleMass>
- <Payload unit="kg">1720.70</Payload>
- <PassengerCount>24.24</PassengerCount>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.49355</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">11.65585</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">588.1</CO2>
+ <CO2 unit="g/km">653.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14301.75</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
<Payload unit="kg">4301.75</Payload>
<PassengerCount>60.59</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.79622</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">13.34146</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">661.1</CO2>
+ <CO2 unit="g/km">747.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11094.99</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
<Payload unit="kg">1094.99</Payload>
<PassengerCount>15.42</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">8.69707</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">9.47120</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">487.4</CO2>
+ <CO2 unit="g/km">530.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12737.48</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
<Payload unit="kg">2737.48</Payload>
<PassengerCount>38.56</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.12793</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">9.91693</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">511.5</CO2>
+ <CO2 unit="g/km">555.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12020.52</TotalVehicleMass>
- <Payload unit="kg">2020.52</Payload>
- <PassengerCount>28.46</PassengerCount>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.74975</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">11.98595</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">602.4</CO2>
+ <CO2 unit="g/km">671.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15051.30</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
<Payload unit="kg">5051.30</Payload>
<PassengerCount>71.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.27697</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">13.94106</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">688.0</CO2>
+ <CO2 unit="g/km">781.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11347.01</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
<Payload unit="kg">1347.01</Payload>
<PassengerCount>18.97</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.15481</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">9.98110</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">513.1</CO2>
+ <CO2 unit="g/km">559.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13367.53</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
<Payload unit="kg">3367.53</Payload>
<PassengerCount>47.43</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.66609</EnergyConsumption>
+ <Fuel type="NG CI">
+ <EnergyConsumption unit="MJ/km">10.51592</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">541.7</CO2>
+ <CO2 unit="g/km">589.3</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-23T09:45:30.2810805Z</Date>
+ <Date>2020-04-27T15:40:40.3451077Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-1e0e376f9424423ab5bc">
+ <di:Reference URI="#PIF-ee3fb48489044a79a1ed">
<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>7x4wcaqGj3oUEA2beYZ9PCeIPXLH34thrXeTaYgruKc=</di:DigestValue>
+ <di:DigestValue>+FxZ1z90Juhoj0n67kA6amYCq4x8g/q81lomEk0LK2k=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
index 7f0b49b268..1b50024a92 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?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-1ab386aa885d407a830f">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-3c3a0ed335444192bea8">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -214,13 +214,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-f7dc5223f7de446cbf3f">
+ <di:Reference URI="#RESULT-2f5cc7aab2544f56ae73">
<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>zkLb3eBNIM5Jn2qW6VlLeoCD2Klt1p5OBsJICXEv7hU=</di:DigestValue>
+ <di:DigestValue>bOrQ6bQixJt5hoaDBGcf49dOqY2XRBZ0mhKqXzuO+Ok=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -229,296 +229,296 @@
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.55874</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.12292</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1507.0</CO2>
+ <CO2 unit="g/km">1621.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">24.72664</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.33759</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1812.5</CO2>
+ <CO2 unit="g/km">1930.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.51737</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.87775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1210.8</CO2>
+ <CO2 unit="g/km">1310.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.97854</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.34392</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1464.5</CO2>
+ <CO2 unit="g/km">1564.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11123.63</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
<Payload unit="kg">1123.63</Payload>
<PassengerCount>16.52</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.54914</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.88888</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1066.5</CO2>
+ <CO2 unit="g/km">1164.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15618.16</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
<Payload unit="kg">5618.16</Payload>
<PassengerCount>82.62</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.78057</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.06094</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1303.4</CO2>
+ <CO2 unit="g/km">1397.2</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.69855</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.57521</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1517.2</CO2>
+ <CO2 unit="g/km">1654.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">25.05212</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.99415</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1836.4</CO2>
+ <CO2 unit="g/km">1978.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.71817</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.32938</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1225.5</CO2>
+ <CO2 unit="g/km">1343.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.34373</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.95764</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1491.2</CO2>
+ <CO2 unit="g/km">1609.5</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11193.34</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
<Payload unit="kg">1193.34</Payload>
<PassengerCount>17.55</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.81370</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.41503</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1085.9</CO2>
+ <CO2 unit="g/km">1203.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15966.69</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
<Payload unit="kg">5966.69</Payload>
<PassengerCount>87.75</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.20023</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.70852</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1334.1</CO2>
+ <CO2 unit="g/km">1444.7</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11720.70</TotalVehicleMass>
- <Payload unit="kg">1720.70</Payload>
- <PassengerCount>24.24</PassengerCount>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.71183</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.95443</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">931.8</CO2>
+ <CO2 unit="g/km">1022.9</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14301.75</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
<Payload unit="kg">4301.75</Payload>
<PassengerCount>60.59</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.10937</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.69902</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1034.2</CO2>
+ <CO2 unit="g/km">1150.8</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11094.99</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
<Payload unit="kg">1094.99</Payload>
<PassengerCount>15.42</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.30279</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.00564</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">828.5</CO2>
+ <CO2 unit="g/km">880.0</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12737.48</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
<Payload unit="kg">2737.48</Payload>
<PassengerCount>38.56</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.69546</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.43599</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">857.3</CO2>
+ <CO2 unit="g/km">911.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">12020.52</TotalVehicleMass>
- <Payload unit="kg">2020.52</Payload>
- <PassengerCount>28.46</PassengerCount>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.99600</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.32957</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">952.6</CO2>
+ <CO2 unit="g/km">1050.4</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">15051.30</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
<Payload unit="kg">5051.30</Payload>
<PassengerCount>71.15</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.62679</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.30992</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1072.2</CO2>
+ <CO2 unit="g/km">1195.6</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">11347.01</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
<Payload unit="kg">1347.01</Payload>
<PassengerCount>18.97</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.78953</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.52741</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">864.2</CO2>
+ <CO2 unit="g/km">918.3</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">13367.53</TotalVehicleMass>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
<Payload unit="kg">3367.53</Payload>
<PassengerCount>47.43</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.24810</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.01279</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">897.8</CO2>
+ <CO2 unit="g/km">953.9</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-20T06:06:22.9933333Z</Date>
+ <Date>2020-04-27T15:04:22.0809726Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-1ab386aa885d407a830f">
+ <di:Reference URI="#PIF-3c3a0ed335444192bea8">
<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>naBcEFhLacU2ZsLiDYpvQm0wI2mrRBpTmYzOgIDek/c=</di:DigestValue>
+ <di:DigestValue>4feqZKffRbmushwCdq9Rz1vO+NRc5prQhCGvhbjovVM=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
--
GitLab