Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit cf1c3b72 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

change passenger density primary vehicle for IU cycles, adapt testcases

parent f2f9980c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
+ 10
− 10
View file @ cf1c3b72
......@@ -2,25 +2,25 @@ HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated ,
## 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
P31DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 340 , 12350 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P32SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P32DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P32SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 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 , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 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
P33DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 340 , 14725 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P34SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P34DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P34SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 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 , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 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
P35DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 340 , 20250 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P36SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P36SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 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 , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 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
P37DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 340 , 18700 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P38SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P38SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 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 , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 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
P39DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 340 , 24800 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P40SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
P40SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 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 , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+ 20
− 20
View file @ cf1c3b72
......@@ -145,8 +145,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.15,
curbMass: 13150,
refLoad: 4301.748,
lowLoad: 1075.437,
refLoad: 3519.612,
lowLoad: 879.903,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
......@@ -172,8 +172,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.7,
curbMass: 13400,
refLoad: 5051.295,
lowLoad: 1262.82375,
refLoad: 4209.4125,
lowLoad: 1052.353125,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 2, 1, 1)
);
......@@ -251,8 +251,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.15,
curbMass: 15213,
refLoad: 5018.706,
lowLoad: 1254.6765,
refLoad: 4106.214,
lowLoad: 1026.5535,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
......@@ -278,8 +278,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.7,
curbMass: 17850,
refLoad: 6952.32,
lowLoad: 1738.08,
refLoad: 5793.6,
lowLoad: 1448.4,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 4, 1, 1.5)
);
......@@ -357,8 +357,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.15,
curbMass: 19267,
refLoad: 6771.27,
lowLoad: 1692.8175,
refLoad: 5540.130,
lowLoad: 1385.0325,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......@@ -383,8 +383,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.7,
curbMass: 21375,
refLoad: 9233.55,
lowLoad: 2308.3875,
refLoad: 7694.625,
lowLoad: 1923.65625,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......@@ -462,8 +462,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.15,
curbMass: 17500,
refLoad: 5496.6780,
lowLoad: 1374.16950,
refLoad: 4497.282,
lowLoad: 1124.3205,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......@@ -489,8 +489,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.7,
curbMass: 21200,
refLoad: 7495.47,
lowLoad: 1873.86750,
refLoad: 6246.225,
lowLoad: 1561.55625,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......@@ -568,8 +568,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.15,
curbMass: 20950,
refLoad: 7886.538,
lowLoad: 1971.6345,
refLoad: 6452.622,
lowLoad: 1613.1555,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......@@ -595,8 +595,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
width: 2.55,
height: 3.7,
curbMass: 24600,
refLoad: 10754.37,
lowLoad: 2688.5925,
refLoad: 8961.975,
lowLoad: 2240.49375,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about