remove unnecessary parameter for computing payload, adapt testcase due to...

remove unnecessary parameter for computing payload, adapt testcase due to changed simulation runs (no full-load any more)

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)) {

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);