diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs index 632f9c272f1f8e2ba4317b95bd3f9ba6d7b013d6..1d0e33997470656adc0bd6dff83f3a120a480582 100644 --- a/VectoCore/VectoCore/Models/Declaration/Segments.cs +++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs @@ -199,10 +199,10 @@ namespace TUGraz.VectoCore.Models.Declaration var payloads = row.Field<string>(missionType.ToString()).Split('/'); Kilogram refLoad = null, lowLoad = 0.SI<Kilogram>(); if (payloads.Length == 2) { - lowLoad = GetLoading(payloads[0], grossVehicleWeight, missionType, trailers, true); - refLoad = GetLoading(payloads[1], grossVehicleWeight, missionType, trailers, false); + lowLoad = GetLoading(payloads[0], grossVehicleWeight, trailers, true); + refLoad = GetLoading(payloads[1], grossVehicleWeight, trailers, false); } else { - refLoad = GetLoading(row.Field<string>(missionType.ToString()), grossVehicleWeight, missionType, trailers, false); + refLoad = GetLoading(row.Field<string>(missionType.ToString()), grossVehicleWeight, trailers, false); } refLoad = refLoad.LimitTo(0.SI<Kilogram>(), maxLoad); @@ -229,7 +229,7 @@ namespace TUGraz.VectoCore.Models.Declaration return missions.ToArray(); } - private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight, MissionType missionType, IEnumerable<MissionTrailer> trailers, bool lowLoading) + private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight, IEnumerable<MissionTrailer> trailers, bool lowLoading) { var refLoadValue = payloadStr.ToDouble(double.NaN); if (double.IsNaN(refLoadValue)) { diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs index c6d9c328b696cc8d1c117d298e60a360ceac0152..9d36d184cd3186b62e71f0138f4b77825a979dc0 100644 --- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs +++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs @@ -183,8 +183,8 @@ namespace TUGraz.VectoCore.Tests.Integration [TestMethod, TestCategory("LongRunning")] public void Truck40t_Mod1Hz_Test() { - var modFileName = "40t_Long_Haul_Truck_RegionalDeliveryFullLoading.vmod"; - var modFileName1Hz = "40t_Long_Haul_Truck_RegionalDeliveryFullLoading_1Hz.vmod"; + var modFileName = "40t_Long_Haul_Truck_RegionalDeliveryReferenceLoad.vmod"; + var modFileName1Hz = "40t_Long_Haul_Truck_RegionalDeliveryReferenceLoad_1Hz.vmod"; if (File.Exists(modFileName)) { File.Delete(modFileName);