Merge pull request #5 in VECTO/vecto-dev from...

Merge pull request #5 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev:feature/VECTO-974-implementing-engine-stop-start-at-vehicle-stop to develop * commit 'edb29c7e': adding new versions of .vmod and .vsum files with new columns (ESS, FC-correction, ...) adding new required model data elements, adding new required entries in mod-data correcting error in testcase after refactoring set distance based result only if distance is valid linear regression: handle casees where only 1 entry or null is given, refacotr duplicate code

Merge pull request #5 in VECTO/vecto-dev from...
6c7bf4c7 · Markus Quaritsch · c0c46d54 · edb29c7e · 6c7bf4c7 · 6c7bf4c7
Commit 6c7bf4c7 authored 5 years ago by Markus Quaritsch
--- a/VectoCommon/VectoCommon/Utils/VectoMath.cs
+++ b/VectoCommon/VectoCommon/Utils/VectoMath.cs
@@ -339,6 +339,12 @@ namespace TUGraz.VectoCommon.Utils

 		public static void LeastSquaresFitting<T>(IEnumerable<T> entries, Func<T, double> getX, Func<T, double> getY,
 			out double k, out double d, out double r)
+		{
+
+			LeastSquaresFitting(entries?.Select(x => new Point(getX(x), getY(x))), out k, out d, out r);
+		}
+
+		public static void LeastSquaresFitting(IEnumerable<Point> entries, out double k, out double d, out double r)
 		{
 			// algoritm taken from http://mathworld.wolfram.com/LeastSquaresFitting.html (eqn. 27 & 28)
 			var count = 0;
@@ -347,39 +353,12 @@ namespace TUGraz.VectoCommon.Utils
 			var sumXSquare = 0.0;
 			var sumYSquare = 0.0;
 			var sumXY = 0.0;
-			foreach (var entry in entries) {
-				var x = getX(entry);
-				var y = getY(entry);
-				sumX += x;
-				sumY += y;
-				sumXSquare += x * x;
-				sumYSquare += y * y;
-				sumXY += x * y;
-				count++;
-			}
-			if (count == 0) {
+			if (entries == null) {
 				k = 0;
 				d = 0;
 				r = 0;
 				return;
 			}
-			var ssxx = sumXSquare - sumX * sumX / count;
-			var ssxy = sumXY - sumX * sumY / count;
-			var ssyy = sumYSquare - sumY * sumY / count;
-			k = ssxy / ssxx;
-			d = (sumY - k * sumX) / count;
-			r = ssxy * ssxy / ssxx / ssyy;
-		}
-
-		public static void LeastSquaresFitting(IEnumerable<Point> entries, out double k, out double d, out double r)
-		{
-			// algoritm taken from http://mathworld.wolfram.com/LeastSquaresFitting.html (eqn. 27 & 28)
-			var count = 0;
-			var sumX = 0.0;
-			var sumY = 0.0;
-			var sumXSquare = 0.0;
-			var sumYSquare = 0.0;
-			var sumXY = 0.0;
 			foreach (var entry in entries) {
 				var x = entry.X;
 				var y = entry.Y;
@@ -396,6 +375,12 @@ namespace TUGraz.VectoCommon.Utils
 				r = 0;
 				return;
 			}
+			if (count == 1) {
+				k = 0;
+				d = sumY;
+				r = 0;
+				return;
+			}
 			var ssxx = sumXSquare - sumX * sumX / count;
 			var ssxy = sumXY - sumX * sumY / count;
 			var ssyy = sumYSquare - sumY * sumY / count;

--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -523,13 +523,14 @@ namespace TUGraz.VectoCore.OutputData
 			var fcEssCorr = fcModSum + correction * workESS;

 			row[FCESS_H_CORR] = duration != null ? (fcEssCorr / duration).ConvertToGrammPerHour() : null;
-			row[FCESS_KM_CORR] = distance != null ? (fcEssCorr / distance).ConvertToGrammPerKiloMeter() : null;

 			var fcFinal = fcEssCorr;

 			row[FCFINAL_H] = (fcFinal / duration).ConvertToGrammPerHour();

 			if (distance != null && distance.IsGreater(0)) {
+				row[FCESS_KM_CORR] = (fcEssCorr / distance).ConvertToGrammPerKiloMeter();
+
 				row[FCFINAL_KM] = (fcFinal / distance).ConvertToGrammPerKiloMeter();

 				if (modData.FuelData.FuelDensity != null) {

--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -132,8 +132,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 			var fcVolumePerMeter = modContainer.FuelData.FuelDensity == null ? null :
 				(fcFinal / modContainer.FuelData.FuelDensity)
 				.Cast<VolumePerMeter>();
-			var co2PerMeter = distance == null ? null : fcFinal / modContainer.FuelData.CO2PerFuelWeight / distance;
-			var energyPerMeter = distance == null ? null : fcFinal * modContainer.FuelData.LowerHeatingValueVecto / distance;
+			var co2PerMeter = distance == null ? null : fcFinal * modContainer.FuelData.CO2PerFuelWeight;
+			var energyPerMeter = distance == null ? null : fcFinal * modContainer.FuelData.LowerHeatingValueVecto;

 //			Console.WriteLine("FC-Map g/m: {0}, FC-Final g/m {1}, FC-Final l/100km: {2}, CO2 g/m: {3}, Energy J/m: {4}",
 			Console.WriteLine("{0}, {1}, {2}, {3}, {4}",

--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -113,6 +113,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 				modData[ModalResultField.dist] = i.SI<Meter>();
 				modData[ModalResultField.P_eng_out] = 0.SI<Watt>();
 				modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
+				modData[ModalResultField.IgnitionOn] = false;
 				container.CommitSimulationStep(t, dt);
 				t += dt;
 			}

--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -257,10 +257,19 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 				EngineData =
 					new CombustionEngineData {
 						IdleSpeed = 560.RPMtoRad(),
+						EngineStartTime = DeclarationData.Engine.DefaultEngineStartTime,
+						Inertia = 1.SI<KilogramSquareMeter>(),
 						FullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>() { { 0, fullLoadCurve }, { 1, fullLoadCurve } }
 					},
 				GearboxData = new GearboxData { Gears = new Dictionary<uint, GearData> { { 1, new GearData { Ratio = 6.2 } } } },
-				Retarder = new RetarderData()
+				Retarder = new RetarderData(),
+				DriverData = new DriverData() {
+					EngineStopStart = new DriverData.EngineStopStartData() {
+						UtilityFactor = DeclarationData.Driver.EngineStopStartUtilityFactor,
+						EngineOffStandStillThreshold = DeclarationData.Driver.EngineOffStandStillThreshold,
+						MaxEngineOffTimespan =  DeclarationData.Driver.MaxEngineOffTimespan
+					}
+				}
 			};

 			// call builder (actual test)
@@ -319,6 +328,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 				AxleGearData = new AxleGearData { AxleGear = new GearData { Ratio = 2.3 } },
 				EngineData = new CombustionEngineData {
 					IdleSpeed = 560.RPMtoRad(),
+					Inertia = 1.SI<KilogramSquareMeter>(),
+					EngineStartTime = DeclarationData.Engine.DefaultEngineStartTime,
 					FullLoadCurves = new Dictionary<uint, EngineFullLoadCurve> {
 						{ 0, fullLoadCurve },
 						{ 1, fullLoadCurve },
@@ -334,7 +345,14 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 					},
 					StartSpeed = 2.SI<MeterPerSecond>()
 				},
-				Retarder = new RetarderData()
+				Retarder = new RetarderData(),
+				DriverData = new DriverData() {
+					EngineStopStart = new DriverData.EngineStopStartData() {
+						EngineOffStandStillThreshold = DeclarationData.Driver.EngineOffStandStillThreshold,
+						UtilityFactor = DeclarationData.Driver.EngineStopStartUtilityFactor,
+						MaxEngineOffTimespan = DeclarationData.Driver.MaxEngineOffTimespan,
+					}
+				}
 			};

 			// call builder (actual test)

--- a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
@@ -48,6 +48,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using NUnit.Framework;
+using TUGraz.VectoCore.Models.Declaration;

 namespace TUGraz.VectoCore.Tests.Models.Simulation
 {
@@ -160,10 +161,19 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 				EngineData =
 					new CombustionEngineData {
 						IdleSpeed = 560.RPMtoRad(),
+						Inertia = 1.SI<KilogramSquareMeter>(),
+						EngineStartTime = DeclarationData.Engine.DefaultEngineStartTime,
 						FullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>() { { 0, fullLoadCurve }, { 1, fullLoadCurve } }
 					},
 				GearboxData = new GearboxData { Gears = new Dictionary<uint, GearData> { { 2, new GearData { Ratio = 3.5 } } } },
-				Retarder = new RetarderData()
+				Retarder = new RetarderData(),
+				DriverData = new DriverData() {
+					EngineStopStart = new DriverData.EngineStopStartData() {
+						UtilityFactor = DeclarationData.Driver.EngineStopStartUtilityFactor,
+						EngineOffStandStillThreshold = DeclarationData.Driver.EngineOffStandStillThreshold,
+						MaxEngineOffTimespan = DeclarationData.Driver.MaxEngineOffTimespan
+					}
+				}
 			};

 			// call builder (actual test)

--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
@@ -159,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		}
 	}

-	public class MockEngine : VectoSimulationComponent, IEngineInfo
+	public class MockEngine : VectoSimulationComponent, IEngineInfo, IEngineControl
 	{
 		public MockEngine(IVehicleContainer container) : base(container) {}

@@ -203,5 +203,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		}

 		protected override void DoCommitSimulationStep() {}
+
+		#region Implementation of IEngineControl
+
+		public bool IgnitionOn { get; set; }
+
+		#endregion
 	}
 }
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -253,6 +253,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var driverData = MockSimulationDataFactory.CreateDriverDataFromFile(JobFile);
 			var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());

+			new MockEngine(vehicleContainer);
+
 			var cycle = new MockDrivingCycle(vehicleContainer, null);

 			driver.Connect(vehicle.OutPort());
@@ -317,6 +319,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		{
 			var vehicleContainer = new VehicleContainer(ExecutionMode.Engineering);
 			var vehicle = new MockVehicle(vehicleContainer);
+			new MockEngine(vehicleContainer);

 			var driverData = MockSimulationDataFactory.CreateDriverDataFromFile(JobFile);
 			var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy());

--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -90,7 +90,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 				WHTCRural = 1,
 				WHTCMotorway = 1,
 				FullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>() { { 0, FullLoadCurveReader.Create(fullLoad) } },
-				ConsumptionMap = FuelConsumptionMapReader.Create(fuelConsumption)
+				ConsumptionMap = FuelConsumptionMapReader.Create(fuelConsumption),
+				EngineStartTime = 1.SI<Second>()
 			};
 			data.FullLoadCurves[0].EngineData = data;


--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 				modData[ModalResultField.P_brake_loss] = 3000.SI<Watt>();

 				modData[ModalResultField.FCMap] = 1e-4.SI<KilogramPerSecond>();
-
+				modData[ModalResultField.IgnitionOn] = false;
 				modData[ModalResultField.altitude] = 0.SI<Meter>();
 				modData[ModalResultField.acc] = 0.SI<MeterPerSquareSecond>();
 				modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * 3000.SI<Watt>();
@@ -159,7 +159,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 				modData[ModalResultField.P_eng_out] = (i % 2 == 0 ? 1 : -1) * powerDemand[i % powerDemand.Length];

 				modData[ModalResultField.P_eng_fcmap] = 0.SI<Watt>();
-
+				modData[ModalResultField.IgnitionOn] = false;
 				modData.CommitSimulationStep();
 			}


--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-10-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N.A.,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,,1299.0000,16.8355,46.6572,15.8669,7803.9683,167.2617,7803.9683,167.2617,7803.9683,167.2617,7803.9683,167.2617,7803.9683,167.2617,7803.9683,167.2617,20.0074,,,523.5290,,,27.2234,37.8263,13.6490,0.2243,0.0000,1.9832,1.9832,0.0062,0.0000,0.0000,0.3210,0.0000,0.0000,1.8492,0.4613,0.0000,5.3351,3.1090,0.3597,0.0000,0.3187,-0.3298,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1128.6316,1962.5826,28.0000,14.3957,4.3880,0.0000,39.8768,N/A,0.408650989768115,,,,,NOT CERTIFIED,N/A,0.974735559270519,,,,,,NOT CERTIFIED,N/A,0.859560044220361,N.A.,NOT CERTIFIED,16.6282,7.9292,0.7698,1.0778,5.1578,48.0370,20.4003
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+17-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8292,46.6398,15.8669,7792.0165,167.0678,7792.0165,167.0678,7792.0165,167.0678,7792.0165,167.0678,7792.0165,167.0678,7792.0165,167.0678,7792.0165,167.0678,19.9842,,,522.9223,,,27.2066,37.7856,13.6343,0.2218,0.0000,1.9832,1.9832,0.0062,0.0000,0.0000,0.3147,0.0000,0.0000,1.8488,0.4613,0.0000,5.3307,3.1079,0.3597,0.0000,0.0000,0.0000,186.2428,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.3030,1796.5316,28.0000,14.3957,5.0038,0.0000,39.9538,N/A,0.408837798243935,,,,,NOT CERTIFIED,N/A,0.975239902135381,,,,,,NOT CERTIFIED,N/A,0.859479016229579,N/A,NOT CERTIFIED,16.6282,7.9292,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: CPTHWNjz3AhVSSjSqZ8ICAdAIbyp/8NEmDpavan8vP8=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-11-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N.A.,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,,,1299.0000,16.8340,46.6532,15.8669,7981.4998,171.0817,7981.4998,171.0817,7981.4998,171.0817,7981.4998,171.0817,7981.4998,171.0817,7981.4998,171.0817,20.4643,,,535.4856,,,27.2196,38.7884,13.9961,0.2085,0.0000,1.9832,0.3805,2.3637,0.0061,0.0000,0.0000,0.3210,0.0000,0.0000,1.8490,0.4454,0.0000,5.3340,3.1088,0.3597,0.0000,0.3179,-0.3298,23.4026,22.7868,39.4149,80.5095,1.1306,1.6261,1128.3702,1962.5826,28.0000,14.3957,4.6189,0.0000,39.7998,N/A,0.409724399990302,,,,,NOT CERTIFIED,N/A,0.974734905416368,,,,,,NOT CERTIFIED,N/A,0.85955057069604,N.A.,NOT CERTIFIED,16.6282,7.9292,0.7698,1.0778,5.1578,48.0370,20.4003
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+18-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,,,,1299.0000,16.8273,46.6346,15.8669,7968.9680,170.8809,7968.9680,170.8809,7968.9680,170.8809,7968.9680,170.8809,7968.9680,170.8809,7968.9680,170.8809,7968.9680,170.8809,20.4403,,,534.8573,,,27.2018,38.7448,13.9804,0.2060,0.0000,1.9832,0.3799,2.3631,0.0061,0.0000,0.0000,0.3147,0.0000,0.0000,1.8486,0.4454,0.0000,5.3293,3.1075,0.3597,0.0000,0.0000,0.0000,186.4851,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1122.0137,1796.5316,28.0000,14.3957,5.1578,0.0000,39.9538,N/A,0.409907973132376,,,,,NOT CERTIFIED,N/A,0.9752391884656,,,,,,NOT CERTIFIED,N/A,0.859467442056309,N/A,NOT CERTIFIED,16.6282,7.9292,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: NDDU1gnja43PqKsk0xng+GVWqRWDNwiL0TjSBM0x8Cg=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-6-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N.A.,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,522.0799,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,N/A,0.40846343437036,,,,,NOT CERTIFIED,N/A,0.974391308464303,,,,,,NOT CERTIFIED,N/A,0.857838912545838,N.A.,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+13-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,522.0799,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,0.0000,0.0000,0.0000,185.9065,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,N/A,0.40846343437036,,,,,NOT CERTIFIED,N/A,0.974391308464303,,,,,,NOT CERTIFIED,N/A,0.857838912545838,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: XiEQf7GzxSXPSRPwkl2gzL5jM1suNUZ04/nXoD5bKkw=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-3-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N.A.,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N.A.,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,AT Serial,5.8000,,,,,,,,,,379.0000,2.8864,27.4168,0.0036,10195.7605,371.8806,10195.7605,371.8806,10195.7605,371.8806,10195.7605,371.8806,10195.7605,371.8806,10195.7605,371.8806,44.4833,9.2674,,1163.9864,242.4972,,40.8256,50.2342,5.2885,0.3359,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4834,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,N/A,0.415388128599559,Standard values,,0.944291203456837,0,NOT CERTIFIED,N/A,0.954404388483107,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N.A.,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
+10-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,,,379.0000,2.8864,27.4168,0.0036,10195.7771,371.8813,10195.7771,371.8813,10195.7771,371.8813,10195.7771,371.8813,10195.7771,371.8813,10195.7771,371.8813,10195.7771,371.8813,44.4834,9.2674,,1163.9883,242.4976,,40.8256,50.2341,5.2885,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,0.0000,0.0000,0.0000,172.2256,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4864,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,N/A,0.415386883370585,Standard values,,0.944292881396557,0,NOT CERTIFIED,N/A,0.954404167013616,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: BDtxpx1Qe+dPfysomKR1bqvxqUz1nXcH1UFAO2g3DTU=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-4-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N.A.,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N.A.,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,AT Serial,6.2000,,,,,,,,,,272.0000,1.0234,13.5450,-0.0054,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,65.0838,13.5591,,1703.0351,354.7990,,23.2896,32.9211,2.4874,0.3400,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3906,0.0000,0.0000,0.0450,0.9508,0.0000,0.0338,0.3587,-0.0001,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,980.1285,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,N/A,0.376608447494719,Standard values,,0.984723198703428,0,NOT CERTIFIED,N/A,0.843309288731401,,,,,,NOT CERTIFIED,N/A,0.98,N.A.,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+11-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,,,272.0000,1.0234,13.5450,-0.0054,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,7369.8574,544.1007,65.0838,13.5591,,1703.0351,354.7990,,23.2896,32.9211,2.4874,0.3400,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3906,0.0000,0.0000,0.0450,0.9508,0.0000,0.0338,0.3587,-0.0001,0.0000,0.0000,0.0000,177.7982,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,980.1285,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,N/A,0.376608447494719,Standard values,,0.984723198703428,0,NOT CERTIFIED,N/A,0.843309288731401,,,,,,NOT CERTIFIED,N/A,0.98,N/A,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
+#@ SHA256: W66lqYVxqIZ9lYcwzvAFBfhWyrY1BEqriDfUhlsIeyU=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
-# VECTO 3.3.1.1492-RC - 15.02.2019 09:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ADAS [g/h],FC-ADAS [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-5-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N.A.,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,532.4196,,,27.2199,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,N/A,0.410575873210009,,,,,NOT CERTIFIED,N/A,0.974385958482671,,,,,,NOT CERTIFIED,N/A,0.857785140124264,N.A.,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+# VECTO-DEV 0.1.0.1600-RC - 23.05.2019 14:44
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],k_vehline [g/kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+12-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,532.4196,,,27.2199,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,0.0000,0.0000,0.0000,186.9375,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,N/A,0.410575873210009,,,,,NOT CERTIFIED,N/A,0.974385958482671,,,,,,NOT CERTIFIED,N/A,0.857785140124264,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: cD6e3OM+G59cNrEACcAQHXLOMuvDgR2ad6VLH5PVs50=
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod