From 5c2dfba0bb4ec2d3f45027bf4a1ff074fe6619e9 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 7 Aug 2020 10:16:21 +0200
Subject: [PATCH] extend primary bus segment table with expected input for air
distribution ducts check input value in completed bus specific data adapter
---
...larationDataAdapterCompletedBusSpecific.cs | 5 +
.../Declaration/CompletedBusSegments.cs | 3 +-
.../VectoCore/Models/Declaration/Mission.cs | 3 +
.../CompletedBusSegmentationTable.csv | 123 ++++++++++--------
.../PrimaryBusSegmentationTable.csv | 50 +++----
VectoCore/VectoCoreTest/Utils/AssertHelper.cs | 2 +-
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 1 +
7 files changed, 103 insertions(+), 84 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index d239773971..96c59b6579 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -191,6 +191,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
throw new VectoException("HVAC System Configuration {0} requires PassengerAC Technology", hvacConfiguration);
}
+ if (mission.BusParameter.SeparateAirDistributionDuctsHVACCfg.Contains(hvacConfiguration) &&
+ !completedVehicle.Components.BusAuxiliaries.HVACAux.SeparateAirDistributionDucts) {
+ throw new VectoException("Input parameter 'separate air distribution ducts' has to be set to 'true' for vehicle group '{0}' and HVAC configuration '{1}'",
+ mission.BusParameter.BusGroup.GetClassNumber(), hvacConfiguration.GetName());
+ }
var internalLength = hvacConfiguration == BusHVACSystemConfiguration.Configuration2
? 2 * Constants.BusParameters.DriverCompartmentLength // OK
: DeclarationData.BusAuxiliaries.CalculateInternalLength(
diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index d47a62e573..d063760bb4 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -145,7 +145,8 @@ namespace TUGraz.VectoCore.Models.Declaration
AirDragMeasurementAllowed = row.ParseBoolean(missionType == MissionType.Interurban ? "airdragmeasurementinterurban" : "airdragmeasurement"),
ElectricalConsumers = GetVehicleEquipment(row),
DoubleDecker = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>().IsDoubleDeckerBus(),
- DeltaHeight = row.ParseDouble("deltaheight").SI<Meter>()
+ DeltaHeight = row.ParseDouble("deltaheight").SI<Meter>(),
+ SeparateAirDistributionDuctsHVACCfg = row.Field<string>("sepairdistrductshvaccfg").Split('/').Select(BusHVACSystemConfigurationHelper.Parse).ToArray()
}
};
diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs
index 8ca2926e09..6076de72b4 100644
--- a/VectoCore/VectoCore/Models/Declaration/Mission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs
@@ -130,7 +130,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public bool HVACHeatpump { get; internal set; }
public bool HVACAdjustableAuxHeater { get; internal set; }
+ // used for primary bus only
public bool HVACSeparateAirDistributionDucts { get; internal set; }
+
public PerSquareMeter PassengerDensityLow { get; internal set; }
public PerSquareMeter PassengerDensityRef { get; internal set; }
public VehicleClass BusGroup { get; internal set; }
@@ -155,6 +157,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public Meter EntranceHeight { get; set; }
public VehicleCode VehicleCode { get; set; }
public FloorType FloorType { get; set; }
+ public IList<BusHVACSystemConfiguration> SeparateAirDistributionDuctsHVACCfg { get; set; }
}
diff --git a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
index a9838c1529..70fb3edcdc 100644
--- a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
@@ -1,57 +1,66 @@
-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 , Air Drag Measurement Interurban , 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 , - , - , 31a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CE , I/I+II/A , 1 , - , - , 31b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1 , 0.30
-2 , 0 , CE , II , 1 , - , - , 31b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CE , I/I+II/A , 1 , - , - , 33b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1 , 0.30
-3 , 0 , CE , II , 1 , - , - , 33b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
-3 , 1 , CG , I/I+II/A , 1 , - , - , 35b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1 , 0.30
-3 , 1 , CG , II , 1 , - , - , 35b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CE , I/I+II/A , 1 , - , - , 37b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1 , 0.30
-4 , 0 , CE , II , 1 , - , - , 37b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
-4 , 1 , CG , I/I+II/A , 1 , - , - , 39b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1 , 0.30
-4 , 1 , CG , II , 1 , - , - , 39b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 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 , 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 , 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 , 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 , 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 , 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 , 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 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1 , 0.30
\ No newline at end of file
+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 , Air Drag Measurement Interurban , CdxA Standard , Axle load distribution , ES_External displays , ES_Internal displays , ES_Fridge , ES_Kitchen Standard , Sep air distr ducts HVAC cfg , Is Valid , Delta Height
+2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+2 , 0 , CE , I/I+II/A , 1 , - , - , 31b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+2 , 0 , CE , II , 1 , - , - , 31b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 8/9/10 , 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 , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+2 , 0 , CA , II , - , - , - , 32a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+2 , 0 , CA , III/B , - , - , - , 32d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 0 , CE , I/I+II/A , 1 , - , - , 33b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 0 , CE , II , 1 , - , - , 33b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 8/9/10 , 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 , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+3 , 0 , CA , II , - , - , - , 34a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 0 , CA , III/B , - , - , - , 34d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 1 , CG , I/I+II/A , 1 , - , - , 35b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 1 , CG , II , 1 , - , - , 35b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+3 , 1 , CC , II , - , - , - , 36a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 1 , CC , III/B , - , - , - , 36d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 0 , CE , I/I+II/A , 1 , - , - , 37b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 0 , CE , II , 1 , - , - , 37b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 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 , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+4 , 0 , CA , II , - , - , - , 38a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 0 , CA , III/B , - , - , - , 38d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 1 , CG , I/I+II/A , 1 , - , - , 39b1 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , , , 0 , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 1 , CG , II , 1 , - , - , 39b2 , Bus.vacc , 100 , CoachBus , 3 , 3 , 3 , 2.2 , , 0 , 1 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 8/9/10 , 1 , 0.30
+4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , Bus.vacc , 100 , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 8/9/10 , 1 , 0.30
+# ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+4 , 1 , CC , II , - , - , - , 40a , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 1 , CC , III/B , - , - , - , 40d , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , Bus.vacc , 100 , CoachBus , , , , 2.2 , 1.4 , 1 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 1 , 0.30
+4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , Bus.vacc , 100 , CoachBus , , , , 3 , 2 , 1 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1/2/3/4/5/6/7/8/9/10 , 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 70ded2d2d5..0ba1f0fd78 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 , vehicle code , low entry , floor type , 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
+HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , vehicle code , low entry , floor type , 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 , P31_32 , - , 2 , 7.4 , 999 , 0 , CE , 0 , low floor , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 340 , 11975 , 80 , 0 , 3 , 3 , 3 , 1.8 , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P31DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CF , 0 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.45 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 2.2/1.8 , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.9 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 3/2.5 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-##
-P33SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CE , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.53 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 2.2/1.8 , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.98 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 3/2.5 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-#
-P35SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CG , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.60 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , high floor , 100 , , Bus.vacc , CoachBus , 4.05 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-##
-P37SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CE , 0 , low floor , 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 , 1.8 , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P37DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CF , 0 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.60 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , high floor , 100 , , Bus.vacc , CoachBus , 4.05 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-#
-P39SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CG , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.68 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , high floor , 100 , , Bus.vacc , CoachBus , 4.13 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P31SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CE , 0 , low floor , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 340 , 11975 , 80 , 0 , 3 , 3 , 3 , 1.8 , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P31DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CF , 0 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.45 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 2.2/1.8 , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.9 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 3/2.5 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+## , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+P33SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CE , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.53 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 2.2/1.8 , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.98 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 3/2.5 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+## , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+P35SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CG , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.60 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , high floor , 100 , , Bus.vacc , CoachBus , 4.05 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+## , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+P37SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CE , 0 , low floor , 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 , 1.8 , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P37DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CF , 0 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.60 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , high floor , 100 , , Bus.vacc , CoachBus , 4.05 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+## , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , ----- , -----
+P39SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CG , 0 , low floor , 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 , 1.8 , , 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 , low floor , 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 , - , high floor , 100 , , Bus.vacc , CoachBus , 3.68 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 2.2/1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , high floor , 100 , , Bus.vacc , CoachBus , 4.13 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 3/2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
diff --git a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
index e84f5f8b1e..f07d2933f2 100644
--- a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.Utils
Assert.AreEqual(message, ex.Message);
}
if (messageContains != null) {
- Assert.IsTrue(ex.Message.Contains(messageContains));
+ Assert.IsTrue(ex.Message.Contains(messageContains), "Exception message does not contain expected text. Expected: '{1}', Message: '{0}'", ex.Message, messageContains);
}
}
}
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index e8e7cf7f1c..5008c71473 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -105,6 +105,7 @@
<Compile Include="Integration\CoachAdvancedAuxPowertrain.cs" />
<Compile Include="Integration\CoachPowerTrain.cs" />
<Compile Include="Integration\CompletedBus\CompletedBusFactorMethodTest.cs" />
+ <Compile Include="Integration\CompletedBus\CompletedBusSanityCheckTests.cs" />
<Compile Include="Integration\Declaration\ADASVehicleTest.cs" />
<Compile Include="Integration\Declaration\EngineInputDataTests.cs" />
<Compile Include="Integration\Declaration\NaturalGasVehicles.cs" />
--
GitLab