coach test: extend axle loss map; write mod data;

aaux test: rename mod-files

VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs

@@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
 
 			var slopeStr = GetSlopeString(slope);
-			var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+			var modFileName = string.Format(CultureInfo.InvariantCulture, @"CoachAAUX_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
 
 			Coach_BusAuxiliaries(cycle, modFileName,
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
@@ -141,7 +141,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
 
 			var slopeStr = GetSlopeString(slope);
-			var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+			var modFileName = string.Format(CultureInfo.InvariantCulture, @"CoachAAUX_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
 
 			Coach_BusAuxiliaries(cycle, modFileName,
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
@@ -157,7 +157,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
 
 			var slopeStr = GetSlopeString(slope);
-			var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+			var modFileName = string.Format(CultureInfo.InvariantCulture, @"CoachAAUX_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
 
 			Coach_BusAuxiliaries(cycle, modFileName,
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr),
@@ -212,7 +212,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
 
 			var slopeStr = GetSlopeString(slope);
-			var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+			var modFileName = string.Format(CultureInfo.InvariantCulture, @"CoachAAUX_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
 
 			Coach_BusAuxiliaries(cycle, modFileName,
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
@@ -230,7 +230,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
 
 			var slopeStr = GetSlopeString(slope);
-			var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+			var modFileName = string.Format(CultureInfo.InvariantCulture, @"CoachAAUX_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
 
 			Coach_BusAuxiliaries(cycle, modFileName,
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr),

VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs

@@ -75,7 +75,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			KilogramSquareMeter gearBoxInertia = null, bool engineHighPower = true)
 		{
 			var fileWriter = new FileOutputWriter(modFileName);
-			var modData = new ModalDataContainer(modFileName, fileWriter);
+			var modData = new ModalDataContainer(modFileName, fileWriter) { WriteModalResults = true };
 			var container = new VehicleContainer(ExecutionMode.Engineering, modData) {
 				RunData = new VectoRunData { JobName = modFileName, Cycle = cycleData }
 			};

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/Axle.vtlm

@@ -8,6 +8,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,4500,107.5
 0,5500,122.5
 0,6500,137.5
+0,7500,152.5
 200,-1500,62.5
 200,-500,47.5
 200,500,47.5
@@ -17,6 +18,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,4500,107.5
 200,5500,122.5
 200,6500,137.5
+200,7500,152.5
 400,-1500,62.5
 400,-500,47.5
 400,500,47.5
@@ -26,6 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,4500,107.5
 400,5500,122.5
 400,6500,137.5
+600,7500,152.5
 600,-1500,62.5
 600,-500,47.5
 600,500,47.5
@@ -44,6 +47,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,4500,107.5
 800,5500,122.5
 800,6500,137.5
+800,7500,152.2
 1000,-1500,62.5
 1000,-500,47.5
 1000,500,47.5