diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index 852234a88af8f354c3866675735c4e52a6942e6d..dff4919200a7d5faf9481e17ff50d1c10ab25dd0 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -90,6 +90,10 @@ namespace TUGraz.VectoCore.Models.Declaration
var segment = new Segment {
Found = true,
+ AccelerationFile =
+ RessourceHelper.ReadStream(
+ DeclarationData.DeclarationDataResourcePrefix + ".VACC." +
+ row.Field<string>(".vaccfile")),
Missions = CreateMissions(rows),
VehicleClass = VehicleClassHelper.Parse("CB" + row.Field<string>("vehicleparametergroup")),
};
@@ -115,6 +119,7 @@ namespace TUGraz.VectoCore.Models.Declaration
var mission = new Mission {
MissionType = missionType,
+ CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
MinLoad = null,
MaxLoad = null,
RefLoad = 100.SI<Kilogram>(), // dummy value to trigger simulation with ref load
diff --git a/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/CompletedBusSegmentationTable.csv
index e8b58990042bde2abac5abfb7201018d64af2d2a..3eda833ed96847718458b4b042840e1af08a4a41 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 , Vehicle Parameter Group , Heavy Urban , Urban , Suburban , Interurban , Coach , Air Drag Measurement , CdxA Standard , Axle load distribution , External displays , Internal displays , Fridge , Kitchen Standard , Is Valid
-2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
-2 , 0 , CE , I/I+II/II/A , 1 , - , - , 31b , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
-2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1
-2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1
-2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 31e , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1
-2 , 0 , CA , II , - , - , - , 32a , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
-2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
-2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
-2 , 0 , CA , III/B , - , - , - , 32d , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
-2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
-2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
-3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
-3 , 0 , CE , I/I+II/II/A , 1 , - , - , 33b , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
-3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1
-3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1
-3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 33e , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1
-3 , 0 , CA , II , - , - , - , 34a , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
-3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
-3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1
-3 , 0 , CA , III/B , - , - , - , 34d , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1
-3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1
-3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1
-3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1
-3 , 1 , CG , I/I+II/II/A , 1 , - , - , 35b , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1
-3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CC , II , - , - , - , 36a , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CC , III/B , - , - , - , 36d , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CE , I/I+II/II/A , 1 , - , - , 37b , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 37e , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CA , II , - , - , - , 38a , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CA , III/B , - , - , - , 38d , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1
-4 , 1 , CG , I/I+II/II/A , 1 , - , - , 39b , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1
-4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CC , II , - , - , - , 40a , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CC , III/B , - , - , - , 40d , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
-4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
\ No newline at end of file
+Num Axles , Articulated , Vehicle Code , Registration Classes , Low entry , Passengers Lower Deck , Body Height , Vehicle Parameter Group , .vacc file , Cross Wind Correction , Heavy Urban , Urban , Suburban , Interurban , Coach , Air Drag Measurement , CdxA Standard , Axle load distribution , External displays , Internal displays , Fridge , Kitchen Standard , Is Valid
+2 , 0 , CE , I/I+II/II/A , 0 , - , - , 31a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
+2 , 0 , CE , I/I+II/II/A , 1 , - , - , 31b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 4.9 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
+2 , 0 , CF , I/I+II/II/A , - , - , - , 31c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.2 , 37.5/62.5 , 3 , 3 , 0 , 0 , 1
+2 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 31d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.7 , 37.5/62.5 , 1 , 1 , 0 , 0 , 1
+2 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 31e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7 , 37.5/62.5 , 2 , 1 , 0 , 0 , 1
+2 , 0 , CA , II , - , - , - , 32a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
+2 , 0 , CA , II+III , - , - , 0-3.1 , 32b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 3 , 2 , 0 , 0 , 1
+2 , 0 , CA , II+III , - , - , 3.1-999 , 32c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
+2 , 0 , CA , III/B , - , - , - , 32d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.6 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
+2 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 32e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
+2 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 32f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.2 , 37.5/62.5 , 1 , 2 , 1 , 1 , 1
+3 , 0 , CE , I/I+II/II/A , 0 , - , - , 33a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
+3 , 0 , CE , I/I+II/II/A , 1 , - , - , 33b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.0 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
+3 , 0 , CF , I/I+II/II/A , - , - , - , 33c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.3 , 27.3/45.4/27.3 , 3 , 3 , 0 , 0 , 1
+3 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 33d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.8 , 27.3/45.4/27.3 , 1 , 1 , 0 , 0 , 1
+3 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 33e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.1 , 27.3/45.4/27.3 , 2 , 1 , 0 , 0 , 1
+3 , 0 , CA , II , - , - , - , 34a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
+3 , 0 , CA , II+III , - , - , 0-3.1 , 34b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 3 , 2 , 0 , 0 , 1
+3 , 0 , CA , II+III , - , - , 3.1-999 , 34c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1
+3 , 0 , CA , III/B , - , - , - , 34d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.7 , 27.3/45.4/27.3 , 1 , 2 , 1 , 1 , 1
+3 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 34e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 3 , 1 , 1 , 1
+3 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 34f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.3 , 27.3/45.4/27.3 , 1 , 4 , 1 , 1.5 , 1
+3 , 1 , CG , I/I+II/II/A , 0 , - , - , 35a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1
+3 , 1 , CG , I/I+II/II/A , 1 , - , - , 35b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 24.3/35.2/40.5 , 3 , 3 , 0 , 0 , 1
+3 , 1 , CH , I/I+II/II/A , - , - , - , 35c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CC , II , - , - , - , 36a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CC , II+III , - , - , 0-3.1 , 36b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CC , II+III , - , - , 3.1-999 , 36c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CC , III/B , - , - , - , 36d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 36e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+3 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 36f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 24.3/35.2/40.5 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CE , I/I+II/II/A , 0 , - , - , 37a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CE , I/I+II/II/A , 1 , - , - , 37b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.1 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CF , I/I+II/II/A , - , - , - , 37c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CI , I/I+II/II/II+III/III/A/B , - , - , - , 37d , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.9 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CJ , I/I+II/II/II+III/III/A/B , - , - , - , 37e , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 7.2 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CA , II , - , - , - , 38a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CA , II+III , - , - , 0-3.1 , 38b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CA , II+III , - , - , 3.1-999 , 38c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CA , III/B , - , - , - , 38d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.8 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CB , II/II+III/III/B , - , 0-6 , - , 38e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 0 , CB , II/II+III/III/B , - , 7-9999 , - , 38f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.4 , 21.4/21.4/35.8/21.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CG , I/I+II/II/A , 0 , - , - , 39a , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1
+4 , 1 , CG , I/I+II/II/A , 1 , - , - , 39b , Bus.vacc , CoachBus , 3 , 3 , 3 , , , 0 , 5.2 , 20.0/28.2/32.4/19.4 , 3 , 3 , 0 , 0 , 1
+4 , 1 , CH , I/I+II/II/A , - , - , - , 39c , Bus.vacc , CoachBus , 3.7 , 3.7 , 3.7 , , , 0 , 6.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CC , II , - , - , - , 40a , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CC , II+III , - , - , 0-3.1 , 40b , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CC , II+III , - , - , 3.1-999 , 40c , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CC , III/B , - , - , - , 40d , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 4.9 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CD , II/II+III/III/B , - , 0-6 , - , 40e , Bus.vacc , CoachBus , , , , 2.2 , 1.4 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
+4 , 1 , CD , II/II+III/III/B , - , 7-9999 , - , 40f , Bus.vacc , CoachBus , , , , 3 , 2 , 1 , 5.5 , 20.0/28.2/32.4/19.4 , 0 , 0 , 0 , 0 , 1
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index 425c4ee96edd1713c4323f9955526d70f3f4b12c..a2d04218911b364664e49a2510230fc41e1dd8f0 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -37,6 +37,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
+ Assert.IsNotNull(segment.AccelerationFile);
}
[TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31a, 3)]
@@ -53,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(4.9, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -84,6 +86,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(4.9, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -115,6 +118,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(6.2, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -147,6 +151,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -179,6 +184,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -211,6 +217,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i+3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -243,6 +250,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -274,6 +282,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -306,6 +315,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -337,6 +347,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -368,6 +379,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index f8a6c84d6cc437630bc560cd29e3cfe3c7355ce6..85dfaf017edb2939497f73a149d1ac5b2dc47269 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -54,8 +54,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
+ Assert.IsNotNull(segment.AccelerationFile);
}
-
+
[TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB33a, 3)]
public void TestComplete3AxlesCompleteBus33A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
@@ -71,6 +72,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -101,6 +103,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -131,6 +134,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(6.3, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -162,6 +166,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.8, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -193,6 +198,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(7.1, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -224,6 +230,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -255,6 +262,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -286,6 +294,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -317,6 +326,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -348,6 +358,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.3, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -379,6 +390,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.3, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -408,6 +420,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.1, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -438,6 +451,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.1, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index fa9916a40a00a8c5152ac371c7f4c459e43420ca..2c55e93512c49e911f42d489a86e954d3cb7a03f 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -47,8 +47,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
+ Assert.IsNotNull(segment.AccelerationFile);
}
-
+
[TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB39a, 3)]
public void TestComplete4AxlesCompleteBus39A(AxleConfiguration axleConfig, VehicleCode vehicleCode, RegistrationClass registrationClass,
@@ -64,6 +65,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 20, axle2: 28.20, axle3: 32.40, axle4: 19.40, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(
@@ -95,6 +97,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
+ Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 20, axle2: 28.2, axle3: 32.4, axle4: 19.4, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters(