diff --git a/VectoCommon/VectoCommon/Models/VehicleClass.cs b/VectoCommon/VectoCommon/Models/VehicleClass.cs
index 9a57c754a0026398586c87c7b77cfb59d081ef4b..ed10306f3f9030bbdad66cf80f9a15cb8f067c33 100644
--- a/VectoCommon/VectoCommon/Models/VehicleClass.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleClass.cs
@@ -94,7 +94,8 @@ namespace TUGraz.VectoCommon.Models
// completed bus groups
Class31a,
- Class31b,
+ Class31b1,
+ Class31b2,
Class31c,
Class31d,
Class31e,
@@ -106,7 +107,8 @@ namespace TUGraz.VectoCommon.Models
Class32f,
Class33a,
- Class33b,
+ Class33b1,
+ Class33b2,
Class33c,
Class33d,
Class33e,
@@ -118,7 +120,8 @@ namespace TUGraz.VectoCommon.Models
Class34f,
Class35a,
- Class35b,
+ Class35b1,
+ Class35b2,
Class35c,
Class36a,
Class36b,
@@ -128,7 +131,8 @@ namespace TUGraz.VectoCommon.Models
Class36f,
Class37a,
- Class37b,
+ Class37b1,
+ Class37b2,
Class37c,
Class37d,
Class37e,
@@ -140,7 +144,8 @@ namespace TUGraz.VectoCommon.Models
Class38f,
Class39a,
- Class39b,
+ Class39b1,
+ Class39b2,
Class39c,
Class40a,
Class40b,
@@ -221,7 +226,8 @@ namespace TUGraz.VectoCommon.Models
{
switch (vehicleClass) {
case VehicleClass.Class31a:
- case VehicleClass.Class31b:
+ case VehicleClass.Class31b1:
+ case VehicleClass.Class31b2:
case VehicleClass.Class31c:
case VehicleClass.Class31d:
case VehicleClass.Class31e:
@@ -232,7 +238,8 @@ namespace TUGraz.VectoCommon.Models
case VehicleClass.Class32e:
case VehicleClass.Class32f:
case VehicleClass.Class33a:
- case VehicleClass.Class33b:
+ case VehicleClass.Class33b1:
+ case VehicleClass.Class33b2:
case VehicleClass.Class33c:
case VehicleClass.Class33d:
case VehicleClass.Class33e:
@@ -243,7 +250,8 @@ namespace TUGraz.VectoCommon.Models
case VehicleClass.Class34e:
case VehicleClass.Class34f:
case VehicleClass.Class35a:
- case VehicleClass.Class35b:
+ case VehicleClass.Class35b1:
+ case VehicleClass.Class35b2:
case VehicleClass.Class35c:
case VehicleClass.Class36a:
case VehicleClass.Class36b:
@@ -252,7 +260,8 @@ namespace TUGraz.VectoCommon.Models
case VehicleClass.Class36e:
case VehicleClass.Class36f:
case VehicleClass.Class37a:
- case VehicleClass.Class37b:
+ case VehicleClass.Class37b1:
+ case VehicleClass.Class37b2:
case VehicleClass.Class37c:
case VehicleClass.Class37d:
case VehicleClass.Class37e:
@@ -263,7 +272,8 @@ namespace TUGraz.VectoCommon.Models
case VehicleClass.Class38e:
case VehicleClass.Class38f:
case VehicleClass.Class39a:
- case VehicleClass.Class39b:
+ case VehicleClass.Class39b1:
+ case VehicleClass.Class39b2:
case VehicleClass.Class39c:
case VehicleClass.Class40a:
case VehicleClass.Class40b:
diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index a8474e19b2896914d779dacad1f0b690bbfcb3a4..d47a62e573f3673461d9224ad13e15c70eee7931 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore.Models.Declaration
BusGroup = VehicleClassHelper.Parse(row.Field<string>("hdvgroup")),
PassengerDensityLow = row.ParseDouble(missionType.ToString()).SI<PerSquareMeter>(),
PassengerDensityRef = row.ParseDouble(missionType.ToString()).SI<PerSquareMeter>(),
- AirDragMeasurementAllowed = row.ParseBoolean("airdragmeasurement"),
+ 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>()
diff --git a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
index 0896e26184df63f07ed1cab92440ee36551fdde1..a9838c152934d4066db77cc5580d109574863d9b 100644
--- a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
@@ -1,52 +1,57 @@
-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 , - , - , 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
+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
diff --git a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
index 0932a99beb169201a948808a6e61fb3a8c73e703..32ab637a091e203badf9f167ee863644f303ac7d 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 , 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 , 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
+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 , 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 , 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 , 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 , - , 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 , 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
+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 , 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 , 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 , 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 , - , 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 , 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
+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 , 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 , 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 , 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 , - , 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 , 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
+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 , 1.8 , , , , , , 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 , 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 , - , 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 , 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
+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 , 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 , 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 , 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 , - , 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/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index 9d4aae5bdfbd1279c225cca26b48bca4bbe0a232..18de36d67ca4b6c2b5d5dff6efc37f0efea85ebd 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -21,7 +21,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
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.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b2, 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),
@@ -72,13 +72,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, true, VehicleClass.Class31b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b2, 4)]
public void TestComplete2AxlesCompleteBus31B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck,
bodyHeight.SI<Meter>(), lowEntry);
- Assert.AreEqual(3, segment.Missions.Length);
+ Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
for (int i = 0; i < segment.Missions.Length; i++)
@@ -92,8 +93,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
- passengerDensity: new[] { 3.0 },
- airDragAllowed: false,
+ passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
+ airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false,
busParameters: mission.BusParameter
);
@@ -104,7 +105,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.I, 0, 0, false, VehicleClass.Class31c, 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)
{
@@ -235,7 +236,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [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.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,6 +268,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
+
+
[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)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index 006ed08feec7d701dd90df2759bdb3f856384b54..a32418b263e760a41f73ae565bfcf7af450108d7 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -25,7 +25,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
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.CE, RegistrationClass.I, 0, 0, true, VehicleClass.Class33b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b2, 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),
@@ -37,7 +38,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
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.Class35a, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.III, 0, 0, true, VehicleClass.Class35b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b2, 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),
@@ -88,13 +90,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.A, 0, 0, true, VehicleClass.Class33b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b2, 4)]
public void TestComplete3AxlesCompleteBus33B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck,
bodyHeight.SI<Meter>(), lowEntry);
- Assert.AreEqual(3, segment.Missions.Length);
+ Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
for (int i = 0; i < segment.Missions.Length; i++)
@@ -108,8 +111,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
- passengerDensity: new[] { 3.0 },
- airDragAllowed: false,
+ passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
+ airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false,
busParameters: mission.BusParameter
);
@@ -118,8 +121,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleEquipment: mission.BusParameter.ElectricalConsumers);
}
}
-
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class33c, 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)
{
@@ -436,13 +439,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
- [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I_II, 0, 0, true, VehicleClass.Class35b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b2, 4)]
public void TestComplete3AxlesCompleteBus35B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck,
bodyHeight.SI<Meter>(), lowEntry);
- Assert.AreEqual(3, segment.Missions.Length);
+ Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
for (int i = 0; i < segment.Missions.Length; i++)
@@ -457,7 +461,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
passengerDensity: new[] { 3.0 },
- airDragAllowed: false,
+ airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false,
busParameters: mission.BusParameter
);
@@ -466,11 +470,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
vehicleEquipment: mission.BusParameter.ElectricalConsumers);
}
}
-
- #region Assert Methods
+ #region Assert Methods
- private void AssertBusParameters(MissionType missionType, double[] passengerDensity, bool airDragAllowed,
+ private void AssertBusParameters(MissionType missionType, double[] passengerDensity, bool airDragAllowed,
bool doubleDecker, BusParameters busParameters)
{
switch (missionType)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index 6563fdf8be882435011d85324c85f5e6107937a2..0c9e3c0ed1eadfe4a3784d8c511d12cb5cd0b99d 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -21,7 +21,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
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.CE, RegistrationClass.I, 0, 0, true, VehicleClass.Class37b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class37b2, 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),
@@ -33,7 +34,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
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.Class39a, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II_III, 0, 0, true, VehicleClass.Class39b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b2, 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),
@@ -83,13 +85,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
- [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b, 3)]
+ [TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.A, 0, 0, true, VehicleClass.Class39b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b2, 4)]
public void TestComplete4AxlesCompleteBus39B(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
int passengersLowerDeck, double bodyHeight, bool lowEntry, VehicleClass vehicleParameterGroup, int numberOfMissions)
{
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck,
bodyHeight.SI<Meter>(), lowEntry);
- Assert.AreEqual(3, segment.Missions.Length);
+ Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
for (int i = 0; i < segment.Missions.Length; i++)
@@ -103,8 +106,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
- passengerDensity: new[] { 3.0 },
- airDragAllowed: false,
+ passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
+ airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false,
busParameters: mission.BusParameter
);
@@ -114,10 +117,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
}
-
- #region Assert Methods
- private void AssertBusParameters(MissionType missionType, double[] passengerDensity, bool airDragAllowed,
+ #region Assert Methods
+
+ private void AssertBusParameters(MissionType missionType, double[] passengerDensity, bool airDragAllowed,
bool doubleDecker, BusParameters busParameters)
{
switch (missionType)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 8c4e5f43d5189041ac8772c9e7ef42f86a696d10..7146e86e0203b6fee49da93890ad44daf1d3af83 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP31_32, segment.VehicleClass);
@@ -120,9 +120,22 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(3, 2, 0, 0)
);
}
- for (var i = 3; i < 6; i++) {
+ AssertMission(
+ segment.Missions[3],
+ missionType: MissionType.Interurban,
+ cdxA: 4.9,
+ length: 12,
+ width: 2.55,
+ height: 2.8,
+ curbMass: 11975,
+ refLoad: 3519.612,
+ lowLoad: 879.903,
+ axleWeightDistribution: new[] { 0.375, 0.625 },
+ expVehicleEquipment: GetExpectedVehicleEquipment(3, 2, 0, 0)
+ );
+ for (var i = 3; i < 6; i++) {
AssertMission(
- segment.Missions[i],
+ segment.Missions[i + 1],
missionType: missions[i % 3],
cdxA: 6.2,
length: 10.5,
@@ -137,7 +150,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
AssertMission(
- segment.Missions[6],
+ segment.Missions[7],
missionType: MissionType.Interurban,
cdxA: 3.45,
length: 12,
@@ -150,7 +163,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
AssertMission(
- segment.Missions[7],
+ segment.Missions[8],
missionType: MissionType.Coach,
cdxA: 3.45,
length: 12,
@@ -164,7 +177,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
);
AssertMission(
- segment.Missions[8],
+ segment.Missions[9],
missionType: MissionType.Interurban,
cdxA: 3.9,
length: 10.5,
@@ -177,7 +190,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(1, 2, 1, 1)
);
AssertMission(
- segment.Missions[9],
+ segment.Missions[10],
missionType: MissionType.Coach,
cdxA: 3.9,
length: 10.5,
@@ -204,7 +217,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP33_34, segment.VehicleClass);
var missions = new[]
@@ -225,9 +238,22 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(3, 2, 0, 0)
);
}
- for (var i = 3; i < 6; i++) {
+ AssertMission(
+ segment.Missions[3],
+ missionType: MissionType.Interurban,
+ cdxA: 5.0,
+ length: 14.2,
+ width: 2.55,
+ height: 2.8,
+ curbMass: 14175,
+ refLoad: 4236.57,
+ lowLoad: 1059.1425,
+ axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
+ expVehicleEquipment: GetExpectedVehicleEquipment(3, 2, 0, 0)
+ );
+ for (var i = 3; i < 6; i++) {
AssertMission(
- segment.Missions[i],
+ segment.Missions[i+1],
missionType: missions[i % 3],
cdxA: 6.3,
length: 13.5,
@@ -242,7 +268,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
AssertMission(
- segment.Missions[6],
+ segment.Missions[7],
missionType: MissionType.Interurban,
cdxA: 3.53,
length: 13.8,
@@ -255,7 +281,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
AssertMission(
- segment.Missions[7],
+ segment.Missions[8],
missionType: MissionType.Coach,
cdxA: 3.53,
length: 13.8,
@@ -269,7 +295,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
);
AssertMission(
- segment.Missions[8],
+ segment.Missions[9],
missionType: MissionType.Interurban,
cdxA: 3.98,
length: 14,
@@ -282,7 +308,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(1, 4, 1, 1.5)
);
AssertMission(
- segment.Missions[9],
+ segment.Missions[10],
missionType: MissionType.Coach,
cdxA: 3.98,
length: 14,
@@ -309,7 +335,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP35_36, segment.VehicleClass);
var missions = new[]
@@ -330,9 +356,22 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(3, 3, 0, 0)
);
}
- for (var i = 3; i < 6; i++) {
+ AssertMission(
+ segment.Missions[3],
+ missionType: MissionType.Interurban,
+ cdxA: 5.1,
+ length: 18.2,
+ width: 2.55,
+ height: 2.8,
+ curbMass: 17800,
+ refLoad: 5540.130,
+ lowLoad: 1385.0325,
+ axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
+ expVehicleEquipment: GetExpectedVehicleEquipment(3, 3, 0, 0)
+ );
+ for (var i = 3; i < 6; i++) {
AssertMission(
- segment.Missions[i],
+ segment.Missions[i+1],
missionType: missions[i % 3],
cdxA: 6.4,
length: 18.2,
@@ -347,7 +386,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
AssertMission(
- segment.Missions[6],
+ segment.Missions[7],
missionType: MissionType.Interurban,
cdxA: 3.6,
length: 18.2,
@@ -360,7 +399,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[7],
+ segment.Missions[8],
missionType: MissionType.Coach,
cdxA: 3.6,
length: 18.2,
@@ -373,7 +412,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[8],
+ segment.Missions[9],
missionType: MissionType.Interurban,
cdxA: 4.05,
length: 18.2,
@@ -386,7 +425,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[9],
+ segment.Missions[10],
missionType: MissionType.Coach,
cdxA: 4.05,
length: 18.2,
@@ -413,7 +452,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP37_38, segment.VehicleClass);
var missions = new[]
@@ -434,9 +473,22 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
}
- for (var i = 3; i < 6; i++) {
+ AssertMission(
+ segment.Missions[3],
+ missionType: MissionType.Interurban,
+ cdxA: 5.1,
+ length: 15,
+ width: 2.55,
+ height: 2.8,
+ curbMass: 15000,
+ refLoad: 4497.282,
+ lowLoad: 1124.3205,
+ axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
+ expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
+ );
+ for (var i = 3; i < 6; i++) {
AssertMission(
- segment.Missions[i],
+ segment.Missions[i+1],
missionType: missions[i % 3],
cdxA: 6.4,
length: 15,
@@ -451,7 +503,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
AssertMission(
- segment.Missions[6],
+ segment.Missions[7],
missionType: MissionType.Interurban,
cdxA: 3.6,
length: 15,
@@ -464,7 +516,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[7],
+ segment.Missions[8],
missionType: MissionType.Coach,
cdxA: 3.6,
length: 15,
@@ -478,7 +530,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
);
AssertMission(
- segment.Missions[8],
+ segment.Missions[9],
missionType: MissionType.Interurban,
cdxA: 4.05,
length: 15,
@@ -491,7 +543,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[9],
+ segment.Missions[10],
missionType: MissionType.Coach,
cdxA: 4.05,
length: 15,
@@ -518,7 +570,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP39_40, segment.VehicleClass);
var missions = new[]
@@ -539,9 +591,22 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(3, 3, 0, 0)
);
}
- for (var i = 3; i < 6; i++) {
+ AssertMission(
+ segment.Missions[3],
+ missionType: MissionType.Interurban,
+ cdxA: 5.2,
+ length: 21,
+ width: 2.55,
+ height: 2.6,
+ curbMass: 19600,
+ refLoad: 6452.622,
+ lowLoad: 1613.1555,
+ axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
+ expVehicleEquipment: GetExpectedVehicleEquipment(3, 3, 0, 0)
+ );
+ for (var i = 3; i < 6; i++) {
AssertMission(
- segment.Missions[i],
+ segment.Missions[i+1],
missionType: missions[i % 3],
cdxA: 6.5,
length: 21,
@@ -556,7 +621,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
AssertMission(
- segment.Missions[6],
+ segment.Missions[7],
missionType: MissionType.Interurban,
cdxA: 3.68,
length: 21,
@@ -569,7 +634,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[7],
+ segment.Missions[8],
missionType: MissionType.Coach,
cdxA: 3.68,
length: 21,
@@ -583,7 +648,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
);
AssertMission(
- segment.Missions[8],
+ segment.Missions[9],
missionType: MissionType.Interurban,
cdxA: 4.13,
length: 21,
@@ -596,7 +661,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
- segment.Missions[9],
+ segment.Missions[10],
missionType: MissionType.Coach,
cdxA: 4.13,
length: 21,