This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit e1c6b059 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

renamig vehicle groups for medium lorries to 51-56

parent 4988b7fb
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 172 additions and 160 deletions
VECTO/MainModule.vb
+ 6
− 6
View file @ e1c6b059
......@@ -45,12 +45,12 @@ Module MainModule
Public Function ConvPicPath(hdVclass As VehicleClass, isLongHaul As Boolean) As Bitmap
Select Case hdVclass
Case VehicleClass.ClassML2r,
VehicleClass.ClassML2van,
VehicleClass.ClassML3r,
VehicleClass.ClassML3van,
VehicleClass.ClassML4r,
VehicleClass.ClassML4van,
Case VehicleClass.Class51,
VehicleClass.Class52,
VehicleClass.Class53,
VehicleClass.Class54,
VehicleClass.Class55,
VehicleClass.Class56,
VehicleClass.Class1s
Return My.Resources.Undef
......
VectoCommon/VectoCommon/Models/VehicleClass.cs
+ 22
− 18
View file @ e1c6b059
......@@ -36,12 +36,8 @@ namespace TUGraz.VectoCommon.Models
public enum VehicleClass
{
Unknown,
ClassML2r,
ClassML2van,
ClassML3r,
ClassML3van,
ClassML4r,
ClassML4van,
// heavy lorries
Class1s,
Class0,
Class1,
......@@ -62,7 +58,6 @@ namespace TUGraz.VectoCommon.Models
Class16,
Class17,
// primary bus super groups
ClassP31_32,
ClassP33_34,
......@@ -153,6 +148,15 @@ namespace TUGraz.VectoCommon.Models
Class40d,
Class40e,
Class40f,
// medium lorries
Class51,
Class52,
Class53,
Class54,
Class55,
Class56,
}
public static class VehicleClassHelper
......@@ -172,12 +176,12 @@ namespace TUGraz.VectoCommon.Models
public static bool IsMediumLorry(this VehicleClass vehicleClass)
{
switch (vehicleClass) {
case VehicleClass.ClassML2r:
case VehicleClass.ClassML2van:
case VehicleClass.ClassML3r:
case VehicleClass.ClassML3van:
case VehicleClass.ClassML4r:
case VehicleClass.ClassML4van:
case VehicleClass.Class51:
case VehicleClass.Class52:
case VehicleClass.Class53:
case VehicleClass.Class54:
case VehicleClass.Class55:
case VehicleClass.Class56:
return true;
default:
return false;
......@@ -187,9 +191,9 @@ namespace TUGraz.VectoCommon.Models
public static bool IsVan(this VehicleClass vehicleClass)
{
switch (vehicleClass) {
case VehicleClass.ClassML2van:
case VehicleClass.ClassML3van:
case VehicleClass.ClassML4van:
case VehicleClass.Class52:
case VehicleClass.Class54:
case VehicleClass.Class56:
return true;
default:
return false;
......
VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
+ 10
− 9
View file @ e1c6b059
......@@ -41,13 +41,7 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public enum WeightingGroup
{
GroupML2r = 1,
GroupML2van,
GroupML3r,
GroupML3van,
GroupML4r,
GroupML4van,
Group1s,
Group1s = 1,
Group1,
Group2,
Group3,
......@@ -65,6 +59,13 @@ namespace TUGraz.VectoCore.Models.Declaration
Group12,
Group16,
Group51,
Group52,
Group53,
Group54,
Group55,
Group56,
Unknown
}
......
VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
+ 7
− 6
View file @ e1c6b059
Weighting Group , LongHaul , LongHaul EMS , Regional Delivery , Regional Delivery EMS , Urban Delivery , Municipal Utility , Construction
ML2r , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
ML2van , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
ML3r , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
ML3van , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
ML4r , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
ML4van , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
1s , 0/0 , 0/0 , 0.1/0.4 , 0/0 , 0.15/0.35 , 0/0 , 0/0
1 , 0/0 , 0/0 , 0.1/0.4 , 0/0 , 0.15/0.35 , 0/0 , 0/0
2 , 0.06/0.14 , 0/0 , 0.06/0.24 , 0/0 , 0.15/0.35 , 0/0 , 0/0
......@@ -21,3 +15,10 @@ ML4van , 0/0 , 0/0 , 0.25/0.25 , 0/0
11 , 0.01/0.02 , 0/0 , 0.11/0.25 , 0/0 , 0/0 , 0.08/0.19 , 0.09/0.25
12 , 0.16/0.36 , 0/0 , 0.03/0.07 , 0/0 , 0/0 , 0/0 , 0.11/0.27
16 , 0/0 , 0/0 , 0/0 , 0/0 , 0/0 , 0/0 , 0.30/0.70
#
51 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
52 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
53 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
54 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
55 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
56 , 0/0 , 0/0 , 0.25/0.25 , 0/0 , 0.25/0.25 , 0/0 , 0/0
VectoCore/VectoCore/Resources/Declaration/CO2Standards/WeightingGroups.csv
+ 13
− 12
View file @ e1c6b059
Vehicle Group , Cabin Type , Engine Rated Power Min [kw] , Engine Rated Power Max [kW] , Weighting Group
ML2r , DayCab , 0 , 999999 , ML2r
ML2r , SleeperCab , 0 , 999999 , ML2r
ML2van , DayCab , 0 , 999999 , ML2van
ML2van , SleeperCab , 0 , 999999 , ML2van
ML3r , DayCab , 0 , 999999 , ML3r
ML3r , SleeperCab , 0 , 999999 , ML3r
ML3van , DayCab , 0 , 999999 , ML3van
ML3van , SleeperCab , 0 , 999999 , ML3van
ML4r , DayCab , 0 , 999999 , ML4r
ML4r , SleeperCab , 0 , 999999 , ML4r
ML4van , DayCab , 0 , 999999 , ML4van
ML4van , SleeperCab , 0 , 999999 , ML4van
1s , DayCab , 0 , 999999 , 1s
1s , SleeperCab , 0 , 999999 , 1s
1 , DayCab , 0 , 999999 , 1
......@@ -37,3 +25,16 @@ ML4van , SleeperCab , 0 , 999999
12 , SleeperCab , 0 , 999999 , 12
16 , DayCab , 0 , 999999 , 16
16 , SleeperCab , 0 , 999999 , 16
#
51 , DayCab , 0 , 999999 , 51
51 , SleeperCab , 0 , 999999 , 51
52 , DayCab , 0 , 999999 , 52
52 , SleeperCab , 0 , 999999 , 52
53 , DayCab , 0 , 999999 , 53
53 , SleeperCab , 0 , 999999 , 53
54 , DayCab , 0 , 999999 , 54
54 , SleeperCab , 0 , 999999 , 54
55 , DayCab , 0 , 999999 , 55
55 , SleeperCab , 0 , 999999 , 55
56 , DayCab , 0 , 999999 , 56
56 , SleeperCab , 0 , 999999 , 56
VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
+ 12
− 9
View file @ e1c6b059
HDV group , Vocational , Valid , Vehicle Category , Axle Conf. , TPMLM_Min , TPMLM_Max , Height , DesignSpeed , Body , Body Construction , Body MunicipalUtility , Trailer , Trailer Construction , EMS , .vacc file , Cross Wind Correction - Long haul , Cross Wind Correction - EMS , Cross Wind Correction - Other , Truck Axles - Long haul , Truck Axles - Other , Trailer Axles - Long haul , Trailer Axles - Other , Truck Axles - Long haul EMS , Truck Axles - Other EMS , Trailer Axles - Long haul EMS , Trailer Axles - Other EMS , Long haul , Long haul EMS , Regional delivery , Regional delivery EMS , Urban delivery , Municipal utility , Construction , Heavy Urban , Urban , Suburban , Interurban , Coach , CdxA_Default , CdxA_Construction
ML2r , 0 , 1 , RigidTruck , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML2r , 0 , 1 , Tractor , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML2van , 0 , 1 , Van , 4x2F , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
ML3r , 0 , 1 , RigidTruck , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML3r , 0 , 1 , Tractor , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML3van , 0 , 1 , Van , 4x2 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
ML4r , 0 , 1 , RigidTruck , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML4r , 0 , 1 , Tractor , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
ML4van , 0 , 1 , Van , 4x4 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
### Heavy lorries
1s , 0 , 1 , RigidTruck , 4x2 , 7.4 , 7.5 , 3.6 , 85 , B1 , , , , , , Truck.vacc , , , RigidSolo , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 7.1 ,
1s , 0 , 1 , Tractor , 4x2 , 7.4 , 7.5 , 3.6 , 85 , B1 , , , , , , Truck.vacc , , , RigidSolo , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 7.1 ,
1 , 0 , 1 , RigidTruck , 4x2 , 7.5 , 10 , 3.6 , 85 , B1 , , , , , , Truck.vacc , , , RigidSolo , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 7.1 ,
......@@ -36,3 +29,13 @@ ML4van , 0 , 1 , Van , 4x4 , 5 , 7.4
17 , 0 , 0 , RigidTruck , 8x6 , 0 , 99 , 3.6 , 85 , , , , , , , Truck.vacc , , , RigidSolo , , , , , , , , , - , - , - , - , - , - , - , - , - , - , - , - , ,
17 , 0 , 0 , RigidTruck , 8x8 , 0 , 99 , 4 , 85 , , , , , , , Truck.vacc , , , RigidSolo , , , , , , , , , - , - , - , - , - , - , - , - , - , - , - , - , ,
### Medium lorries
51 , 0 , 1 , RigidTruck , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
51 , 0 , 1 , Tractor , 4x2F , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
52 , 0 , 1 , Van , 4x2F , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
53 , 0 , 1 , RigidTruck , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
53 , 0 , 1 , Tractor , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
54 , 0 , 1 , Van , 4x2 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
55 , 0 , 1 , RigidTruck , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
55 , 0 , 1 , Tractor , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
56 , 0 , 1 , Van , 4x4 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
+ 14
− 13
View file @ e1c6b059
Technology , HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
None , ML2r , 0 , 0 , 0 , 0 , 0
None , ML2van , 0 , 0 , 0 , 0 , 0
None , ML3r , 0 , 0 , 0 , 0 , 0
None , ML3van , 0 , 0 , 0 , 0 , 0
None , ML4r , 0 , 0 , 0 , 0 , 0
None , ML4van , 0 , 0 , 0 , 0 , 0
# , , , , , ,
None , 1s , 0 , 0 , 0 , 0 , 0
None , 1 , 0 , 0 , 0 , 0 , 0
......@@ -17,13 +11,13 @@ None , 10 , 0 , 0 , 0 , 0
None , 11 , 0 , 0 , 0 , 0 , 0
None , 12 , 0 , 0 , 0 , 0 , 0
None , 16 , 0 , 0 , 0 , 0 , 0
# , , , , , ,
Default , ML2r , 200 , 150 , 150 , ,
Default , ML2van , 200 , 150 , 150 , ,
Default , ML3r , 200 , 150 , 150 , ,
Default , ML3van , 200 , 150 , 150 , ,
Default , ML4r , 200 , 150 , 150 , ,
Default , ML4van , 200 , 150 , 150 , ,
#
None , 51 , 0 , 0 , 0 , 0 , 0
None , 52 , 0 , 0 , 0 , 0 , 0
None , 53 , 0 , 0 , 0 , 0 , 0
None , 54 , 0 , 0 , 0 , 0 , 0
None , 55 , 0 , 0 , 0 , 0 , 0
None , 56 , 0 , 0 , 0 , 0 , 0
# , , , , , ,
Default , 1s , 200 , 150 , 150 , ,
Default , 1 , 200 , 150 , 150 , ,
......@@ -36,3 +30,10 @@ Default , 10 , 350 , 200 , ,
Default , 11 , 350 , 200 , , 300 , 200
Default , 12 , 350 , 200 , , , 200
Default , 16 , , , , , 200
# , , , , , ,
Default , 51 , 200 , 150 , 150 , ,
Default , 52 , 200 , 150 , 150 , ,
Default , 53 , 200 , 150 , 150 , ,
Default , 54 , 200 , 150 , 150 , ,
Default , 55 , 200 , 150 , 150 , ,
Default , 56 , 200 , 150 , 150 , ,
VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
+ 7
− 6
View file @ e1c6b059
HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
ML2r , 255/20/0 , 200/20/20 , 180/20/30 , ,
ML2van , 255/20/0 , 200/20/20 , 180/20/30 , ,
ML3r , 255/20/0 , 200/20/20 , 180/20/30 , ,
ML3van , 255/20/0 , 200/20/20 , 180/20/30 , ,
ML4r , 255/20/0 , 200/20/20 , 180/20/30 , ,
ML4van , 255/20/0 , 200/20/20 , 180/20/30 , ,
1s , 290/25/0 , 240/20/20 , 220/20/30 , ,
1 , 290/25/0 , 240/20/20 , 220/20/30 , ,
2 , 340/30/0 , 290/30/20 , 260/20/30 , ,
......@@ -19,3 +13,10 @@ ML4van , 255/20/0 , 200/20/20 , 180/20/30 , ,
11 , 600/120/0 , 490/60/40 , , 430/30/50 , 640/50/80
12 , 450/120/0 , 440/90/40 , , , 640/50/80
16 , , , , , 640/50/80
#
51 , 255/20/0 , 200/20/20 , 180/20/30 , ,
52 , 255/20/0 , 200/20/20 , 180/20/30 , ,
53 , 255/20/0 , 200/20/20 , 180/20/30 , ,
54 , 255/20/0 , 200/20/20 , 180/20/30 , ,
55 , 255/20/0 , 200/20/20 , 180/20/30 , ,
56 , 255/20/0 , 200/20/20 , 180/20/30 , ,
VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+ 81
− 81
View file @ e1c6b059
......@@ -369,20 +369,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(VehicleClass.Class1, "Electrically driven - Electronically controlled", new[] { 700, 800, 600, 600, 1400 }),
//medium lorries
TestCase(VehicleClass.ClassML2r, "", new[] { 0, 258, 198, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Crankshaft mounted - Electronically controlled visco clutch", new[] { 0, 258, 198, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Crankshaft mounted - Bimetallic controlled visco clutch", new[] { 0, 335, 260, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Crankshaft mounted - Discrete step clutch", new[] { 0, 277, 237, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Crankshaft mounted - On/off clutch", new[] { 0, 297, 256, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Belt driven or driven via transm. - Electronically controlled visco clutch",
TestCase(VehicleClass.Class51, "", new[] { 0, 258, 198, 0, 0 }),
TestCase(VehicleClass.Class51, "Crankshaft mounted - Electronically controlled visco clutch", new[] { 0, 258, 198, 0, 0 }),
TestCase(VehicleClass.Class51, "Crankshaft mounted - Bimetallic controlled visco clutch", new[] { 0, 335, 260, 0, 0 }),
TestCase(VehicleClass.Class51, "Crankshaft mounted - Discrete step clutch", new[] { 0, 277, 237, 0, 0 }),
TestCase(VehicleClass.Class51, "Crankshaft mounted - On/off clutch", new[] { 0, 297, 256, 0, 0 }),
TestCase(VehicleClass.Class51, "Belt driven or driven via transm. - Electronically controlled visco clutch",
new[] { 0, 402, 320, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Belt driven or driven via transm. - Bimetallic controlled visco clutch",
TestCase(VehicleClass.Class51, "Belt driven or driven via transm. - Bimetallic controlled visco clutch",
new[] { 0, 478, 382, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Belt driven or driven via transm. - Discrete step clutch", new[] { 0, 421, 378, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Belt driven or driven via transm. - On/off clutch", new[] { 0, 440, 397, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Hydraulic driven - Variable displacement pump", new[] { 0, 444, 320, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Hydraulic driven - Constant displacement pump", new[] { 0, 538, 385, 0, 0 }),
TestCase(VehicleClass.ClassML2r, "Electrically driven - Electronically controlled", new[] { 0, 308, 231, 0, 0 })
TestCase(VehicleClass.Class51, "Belt driven or driven via transm. - Discrete step clutch", new[] { 0, 421, 378, 0, 0 }),
TestCase(VehicleClass.Class51, "Belt driven or driven via transm. - On/off clutch", new[] { 0, 440, 397, 0, 0 }),
TestCase(VehicleClass.Class51, "Hydraulic driven - Variable displacement pump", new[] { 0, 444, 320, 0, 0 }),
TestCase(VehicleClass.Class51, "Hydraulic driven - Constant displacement pump", new[] { 0, 538, 385, 0, 0 }),
TestCase(VehicleClass.Class51, "Electrically driven - Electronically controlled", new[] { 0, 308, 231, 0, 0 })
]
public void AuxFanTechTest(VehicleClass vehicleClass, string technology, int[] expected)
......@@ -405,12 +405,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertHelper.Exception<VectoException>(() => DeclarationData.Fan.LookupPowerDemand(vehicleClass, missionType, technology));
}
[TestCase(VehicleClass.ClassML2r, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.ClassML2van, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.ClassML3r, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.ClassML3van, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.ClassML4r, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.ClassML4van, new[] { 200, 150, 150, -1, -1 }),
[TestCase(VehicleClass.Class51, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class52, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class53, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class54, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class55, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class56, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class1s, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class1, new[] { 200, 150, 150, -1, -1 }),
TestCase(VehicleClass.Class2, new[] { 200, 200, 150, -1, -1 }),
......@@ -442,12 +442,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
TestCase(VehicleClass.ClassML2r, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.ClassML2van, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.ClassML3r, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.ClassML3van, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.ClassML4r, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.ClassML4van, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class51, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class52, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class53, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class54, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class55, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class56, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class1s, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class1, new[] { 0, 0, 0, 0, 0 }),
TestCase(VehicleClass.Class2, new[] { 0, 0, 0, 0, 0 }),
......@@ -650,14 +650,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.ClassML2r),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.ClassML2van),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.ClassML3r),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.ClassML3r),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.ClassML3van),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.ClassML4r),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.ClassML4r),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.ClassML4van),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class51),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5000.01, 0, false, VehicleClass.Class52),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class53),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class53),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5000.01, 0, false, VehicleClass.Class54),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class55),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5000.01, 0, false, VehicleClass.Class56),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400.01, 0, false, VehicleClass.Class1s),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400.01, 0, false, VehicleClass.Class1s),
......@@ -717,12 +717,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.ClassML2r, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.ClassML2van, 85),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.ClassML3r, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.ClassML3van, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.ClassML4r, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.ClassML4van, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class51, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 5001, 0, false, VehicleClass.Class52, 85),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.Class53, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 5001, 0, false, VehicleClass.Class54, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class55, 85),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 5001, 0, false, VehicleClass.Class56, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7401, 0, false, VehicleClass.Class1s, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7501, 0, false, VehicleClass.Class1, 85),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 10001, 0, false, VehicleClass.Class2, 85),
......@@ -749,23 +749,23 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML2r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML2r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2van, 0, null,
TestName = "SegmentLookupBodyWeight ClassML2van Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML3r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML3r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3van, 0, null,
TestName = "SegmentLookupBodyWeight ClassML3van Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML4r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4r, 800, null,
TestName = "SegmentLookupBodyWeight ClassML4r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4van, 0, null,
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
TestName = "SegmentLookupBodyWeight Class51 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 800, null,
TestName = "SegmentLookupBodyWeight Class51 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 0, null,
TestName = "SegmentLookupBodyWeight Class52 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 800, null,
TestName = "SegmentLookupBodyWeight Class53 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 800, null,
TestName = "SegmentLookupBodyWeight Class53 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class54, 0, null,
TestName = "SegmentLookupBodyWeight Class54 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
TestName = "SegmentLookupBodyWeight Class55 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 800, null,
TestName = "SegmentLookupBodyWeight Class55 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 0, null,
TestName = "SegmentLookupBodyWeight ClassML4rvan Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7500, 0, false, VehicleClass.Class1s, 1600, null,
TestName = "SegmentLookupBodyWeight Class1s Rigid"),
......@@ -819,26 +819,26 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[Test,
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2r, 3.5,
TestName = "SegmentLookupHeight ClassML2r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2r, 3.5,
TestName = "SegmentLookupHeight ClassML2r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.ClassML2van, 2.9,
TestName = "SegmentLookupHeight ClassML2van Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3r, 3.5,
TestName = "SegmentLookupHeight ClassML3r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3r, 3.5,
TestName = "SegmentLookupHeight ClassML3r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.ClassML3van, 2.9,
TestName = "SegmentLookupHeight ClassML3van Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4r, 3.5,
TestName = "SegmentLookupHeight ClassML4r Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4r, 3.5,
TestName = "SegmentLookupHeight ClassML4r Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.ClassML4van, 2.9,
TestName = "SegmentLookupHeight ClassML4van Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
TestName = "SegmentLookupHeight Class51 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class51, 3.5,
TestName = "SegmentLookupHeight Class51 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2F, 7400, 0, false, VehicleClass.Class52, 2.9,
TestName = "SegmentLookupHeight Class52 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 3.5,
TestName = "SegmentLookupHeight Class53 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class53, 3.5,
TestName = "SegmentLookupHeight Class53 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x2, 7400, 0, false, VehicleClass.Class54, 2.9,
TestName = "SegmentLookupHeight Class54 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
TestName = "SegmentLookupHeight Class55 Rigid"),
TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class55, 3.5,
TestName = "SegmentLookupHeight Class55 Tractor"),
TestCase(VehicleCategory.Van, AxleConfiguration.AxleConfig_4x4, 7400, 0, false, VehicleClass.Class56, 2.9,
TestName = "SegmentLookupHeight Class56 Van"),
TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 7500, 0, false, VehicleClass.Class1s, 3.6,
......@@ -2253,12 +2253,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
TestCase(WeightingGroup.GroupML2r, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.GroupML2van, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.GroupML3r, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.GroupML3van, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.GroupML4r, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.GroupML4van, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group51, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group52, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group53, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group54, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group55, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group56, 0.25, 0.25, 0, 0, 0.25, 0.25),
TestCase(WeightingGroup.Group1s, 0.1, 0.4, 0, 0, 0.15, 0.35),
TestCase(WeightingGroup.Group1, 0.1, 0.4, 0, 0, 0.15, 0.35),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

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