diff --git a/VectoCore/VectoCore/Resources/Declaration/Body_Trailers_Weights.csv b/VectoCore/VectoCore/Resources/Declaration/Body_Trailers_Weights.csv index 65ca5b44824991b2eb5943bc8f46c5016f6de158..e671266386070fc7c3945f2efcabe24ba03409a2 100644 --- a/VectoCore/VectoCore/Resources/Declaration/Body_Trailers_Weights.csv +++ b/VectoCore/VectoCore/Resources/Declaration/Body_Trailers_Weights.csv @@ -8,9 +8,9 @@ B5 , 2200 , - , - BT1 , 2000 , - , - , 0 , , 0.0 , tipper body for construction cycle BT2 , 3230 , - , - , 0 , , 0.0 , tipper body for construction cycle BT3 , 4355 , - , - , 0 , , 0.0 , tipper body for construction cycle -MU4 , 6000 , - , - , 0 , , 49.4 , rear collector body -MU9 , 6750 , - , - , 0 , , 51.9 , rear collector body -MU11 , 6750 , - , - , 0 , , 51.9 , rear collector body +MU4 , 6000 , - , - , 0 , , 0.0 , rear collector body +MU9 , 6750 , - , - , 0 , , 0.0 , rear collector body +MU11 , 6750 , - , - , 0 , , 0.0 , rear collector body T1 , 3400 , 10500 , 1.3 , 2 , 235/75 R17.5 , 39.8 , T2 , 5400 , 18000 , 1.5/1.5 , 2 , 385/65 R22.5 , 49.5 , ST1 , 7500 , 24000 , 0/2.1 , 3 , 385/65 R22.5 , 91.0 , relevant for fully loaded is GVM of tractor semitrailer combination = 40000kg diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs index 99a9e1a529aa1d320a4efe916ef54b7ab75480d2..21e4a6dfe283673ba303d62b2141812c7635a8dd 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs @@ -774,23 +774,23 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 16000, 0, false, VehicleClass.Class3, new[] { 47.7, 47.7 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 18000, 0, false, VehicleClass.Class4, - new[] { 98.9, 49.4, 49.4, 49.4 }), + new[] { 98.9, 49.4, 49.4, 0.0 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2, 18000, 0, true, VehicleClass.Class4, - new[] { 49.4, 0.0 }), + new[] { 0.0, 0.0 }), TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 18000, 0, false, VehicleClass.Class5, new[] { 91.0, 140.5, 91.0, 140.5, 91.0 }), TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2, 18000, 0, true, VehicleClass.Class5, new[] { 0.0 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x2, 16000, 0, false, VehicleClass.Class9, - new[] { 101.4, 142.9, 51.9, 142.9, 51.9 }), + new[] { 101.4, 142.9, 51.9, 142.9, 0.0 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x2, 16000, 0, true, VehicleClass.Class9, - new[] { 51.9, 0.0 }), + new[] { 0.0, 0.0 }), TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x2, 16000, 0, false, VehicleClass.Class10, new[] { 91.0, 140.5, 91.0, 140.5 }), TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x2, 16000, 0, true, VehicleClass.Class10, new[] { 0.0 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x4, 40000, 0, false, VehicleClass.Class11, - new[] { 101.4, 142.9, 51.9, 142.9, 51.9, 0.0 }), + new[] { 101.4, 142.9, 51.9, 142.9, 0.0, 0.0 }), TestCase(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x4, 99000, 0, false, VehicleClass.Class12, new[] { 91.0, 140.5, 91.0, 140.5, 0.0 }), TestCase(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_8x4, 99000, 0, false, VehicleClass.Class16,