added comparison mod files as test cases for measured speed

VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs

@@ -31,6 +31,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using TUGraz.VectoCore.Exceptions;
 using TUGraz.VectoCore.Models.Simulation;
 using TUGraz.VectoCore.Models.Simulation.Data;
@@ -46,7 +47,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		public const string DirectAuxiliaryId = "";
 
 		private readonly Dictionary<string, Func<PerSecond, Watt>> _auxDict = new Dictionary<string, Func<PerSecond, Watt>>();
-		private readonly Dictionary<string, Watt> _powerDemands = new Dictionary<string, Watt>();
+		private Dictionary<string, Watt> _powerDemands = new Dictionary<string, Watt>();
 
 		public EngineAuxiliary(IVehicleContainer container) : base(container) {}
 
@@ -71,28 +72,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		private Watt ComputePowerDemand(PerSecond engineSpeed)
 		{
-			_powerDemands.Clear();
-			var powerDemand = 0.SI<Watt>();
-
-			foreach (var kv in _auxDict) {
-				var demand = kv.Value(engineSpeed);
-				powerDemand += demand;
-				_powerDemands[kv.Key] = demand;
-			}
-			return powerDemand;
+			_powerDemands = _auxDict.ToDictionary(kv => kv.Key, kv => kv.Value(engineSpeed));
+			return _powerDemands.Values.Sum(p => p);
 		}
 
 		protected override void DoWriteModalResults(IModalDataContainer container)
 		{
-			var sum = 0.SI<Watt>();
-			foreach (var kv in _powerDemands) {
-				sum += kv.Value;
-				// todo: aux write directauxiliary somewhere to moddata .... probably Padd column??
-				if (!string.IsNullOrWhiteSpace(kv.Key)) {
-					container[kv.Key] = kv.Value;
-				}
+			foreach (var kv in _powerDemands.Where(kv => !string.IsNullOrWhiteSpace(kv.Key))) {
+				container[kv.Key] = kv.Value;
 			}
-			container[ModalResultField.P_aux] = sum;
+			container[ModalResultField.P_aux] = _powerDemands.Values.Sum(p => p);
 		}
 
 		protected override void DoCommitSimulationStep()

VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs

@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_25.vmod");
 		}
 
-		[TestMethod, TestCategory("LongRunning")]
+		[TestMethod, Ignore]
 		public void Truck_Accelerate_20_60_uphill_15()
 		{
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleAccelerate_20_60_uphill_15);

VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs

@@ -307,7 +307,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		}
 
 
-		private static void RunJob(string jobFile, string modFile, string sumFile)
+		private static void RunJob(string jobFile, string expectedModFile, string actualModFile, string expectedSumFile,
+			string actualSumFile)
 		{
 			var fileWriter = new FileOutputWriter(jobFile);
 			var sumWriter = new SummaryDataContainer(fileWriter);
@@ -323,24 +324,26 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 			Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
 
-			//todo mk-2016-02-25: test against actual correct mod and sum files!
-			Assert.IsTrue(File.Exists(modFile), "Mod file not found.");
-			Assert.IsTrue(File.Exists(sumFile), "Sum file not found.");
+			ResultFileHelper.TestModFile(expectedModFile, actualModFile);
+			ResultFileHelper.TestSumFile(expectedSumFile, actualSumFile);
 		}
 
 		[TestMethod]
 		public void MeasuredSpeed_Run()
 		{
-			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeed.vecto", @"TestData\MeasuredSpeed\MeasuredSpeed_MeasuredSpeed.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeed.vsum");
+			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeed.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeed_MeasuredSpeed.vmod",
+				@"TestData\MeasuredSpeed\MeasuredSpeed_MeasuredSpeed.vmod",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeed.vsum", @"TestData\MeasuredSpeed\MeasuredSpeed.vsum");
 		}
 
 		[TestMethod]
 		public void MeasuredSpeedAux_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedAux.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedAux_MeasuredSpeedAux.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedAux_MeasuredSpeedAux.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedAux.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedAux.vsum");
 		}
 
 
@@ -348,8 +351,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public void MeasuredSpeedVair_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVair.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedVair_MeasuredSpeedVair.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedVair_MeasuredSpeedVair.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedVair.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedVair.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVair.vsum");
 		}
 
 
@@ -357,8 +361,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public void MeasuredSpeedVairAux_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedVairAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVairAux.vsum");
 		}
 
 
@@ -366,24 +371,27 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public void MeasuredSpeed_Gear_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGear.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedGear.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGear.vsum");
 		}
 
 		[TestMethod]
 		public void MeasuredSpeed_Gear_Aux_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearAux.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedGearAux.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearAux.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGearAux.vsum");
 		}
 
 		[TestMethod]
 		public void MeasuredSpeed_Gear_Vair_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearVair.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod",
-				@"TestData\MeasuredSpeed\MeasuredSpeedGearVair.vsum");
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVair.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGearVair.vsum");
 		}
 
 
@@ -391,7 +399,9 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public void MeasuredSpeed_Gear_VairAux_Run()
 		{
 			RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux.vecto",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
 				@"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod",
+				@"TestData\MeasuredSpeed\Results\MeasuredSpeedGearVairAux.vsum",
 				@"TestData\MeasuredSpeed\MeasuredSpeedGearVairAux.vsum");
 		}
 

VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vecto

@@ -14,6 +14,14 @@
 		"Cycles": [
 			"MeasuredSpeedAux.vdri"
 		],
+		"Aux": [
+			{
+				"ID": "ALT",
+				"Type": "Alternator",
+				"Path": "Alternator.vaux",
+				"Technology": ""
+			}
+		],
 		"VACC": "Driver.vacc",
 		"StartStop": {
 			"Enabled": false,

VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto

@@ -14,6 +14,14 @@
     "Cycles": [
       "MeasuredSpeed_Gear_Rural_VairAux.vdri"
     ],
+    "Aux": [
+      {
+        "ID": "ALT",
+        "Type": "Alternator",
+        "Path": "Alternator.vaux",
+        "Technology": ""
+      }
+    ],
     "VACC": "Driver.vacc",
     "StartStop": {
       "Enabled": false,

VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto

@@ -14,6 +14,14 @@
 		"Cycles": [
 			"MeasuredSpeedVairAux.vdri"
 		],
+		"Aux": [
+			{
+				"ID": "ALT",
+				"Type": "Alternator",
+				"Path": "Alternator.vaux",
+				"Technology": ""
+			}
+		],
 		"VACC": "Driver.vacc",
 		"StartStop": {
 			"Enabled": false,

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+14-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,1298.0000,,,,44.3053,-8.0548,7788.5978,,7788.5978,,7788.5978,,,,,,,27.2326,1.2447,11.7532,-0.2976,5.3382,3.1099,0.3597,-0.0002,1.9832,0.4488,2.1656,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+6-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,1298.0000,,,,0.3797,44.2984,-8.4708,7965.3302,,7965.3302,,7965.3302,,,,,,,27.2303,1.2013,11.7514,-0.3130,5.3376,3.1097,0.3597,-0.0002,2.3629,0.4331,2.1655,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+4-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,1298.0000,,,,42.1780,-8.5851,7666.7738,,7666.7738,,7666.7738,,,,,,,27.2489,1.1417,11.1889,-0.3744,5.3555,3.1158,0.3598,0.0000,1.9832,0.4116,1.5459,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+2-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,1298.0000,,,,0.3984,42.1780,-8.9766,7850.1194,,7850.1194,,7850.1194,,,,,,,27.2488,1.0940,11.1889,-0.3915,5.3555,3.1158,0.3598,0.0000,2.3816,0.3945,1.5458,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+10-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,1298.0000,,,,34.2473,-9.8890,6251.3983,,6251.3983,,6251.3983,,,,,,,20.1200,1.6711,8.5047,-0.5988,2.2254,3.1158,0.3598,0.0000,1.9832,0.6025,1.5778,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+12-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,1298.0000,,,,0.3984,34.2459,-10.3286,6425.9646,,6425.9646,,6425.9646,,,,,,,20.1200,1.5967,8.5044,-0.6255,2.2254,3.1158,0.3598,0.0000,2.3816,0.5757,1.5776,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+8-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,1298.0000,,,,36.0191,-8.8062,6300.2654,,6300.2654,,6300.2654,,,,,,,20.1375,1.8191,8.9748,-0.4721,2.2237,3.1116,0.3596,-0.0002,1.9832,0.6559,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838

VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum

+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_ALT [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+0-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,1298.0000,,,,0.3794,36.0530,-9.2445,6468.1691,,6468.1691,,6468.1691,,,,,,,20.1371,1.7457,8.9732,-0.4982,2.2237,3.1115,0.3596,-0.0002,2.3626,0.6294,2.1232,0.0000,0.0000,8862.0000,0.0000,0.0000,,,,,,,14.4838