updated all measured speed test data

VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs

@@ -265,6 +265,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		protected IEnumerator<DrivingCycleData.DrivingCycleEntry> RightSample { get; set; }
 		protected IEnumerator<DrivingCycleData.DrivingCycleEntry> LeftSample { get; set; }
 		protected Gearbox Gearbox;
+		private bool initialize;
 
 		protected Second AbsTime { get; set; }
 
@@ -378,6 +379,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			AbsTime = first.Time;
 
+			initialize = true;
+
 			if (first.VehicleTargetSpeed.IsEqual(0)) {
 				var retVal = NextComponent.Initialize(DataBus.StartSpeed, first.RoadGradient, DataBus.StartAcceleration);
 				if (!(retVal is ResponseSuccess)) {
@@ -387,6 +390,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			var response = NextComponent.Initialize(first.VehicleTargetSpeed, first.RoadGradient);
 			response.AbsTime = AbsTime;
+
+			initialize = false;
 			return response;
 		}
 
@@ -440,7 +445,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public bool VehicleStopped
 		{
-			get { return LeftSample.Current.VehicleTargetSpeed.IsEqual(0); }
+			get { return !initialize && LeftSample.Current.VehicleTargetSpeed.IsEqual(0); }
 		}
 
 		public DrivingBehavior DrivingBehavior

VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs

@@ -30,7 +30,6 @@ using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TUGraz.VectoCore.Exceptions;
-using TUGraz.VectoCore.Models.SimulationComponent;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
@@ -212,7 +211,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 			// call builder (actual test)
 			var builder = new PowertrainBuilder(null);
-			var jobContainer = builder.Build(data);
+			builder.Build(data);
 		}
 
 
@@ -282,7 +281,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		[TestMethod]
 		public void MeasuredSpeed_Run_Gear()
 		{
-			var jobFile = @"TestData\MeasuredSpeed\MeasuredSpeed_Gear.vecto";
+			var jobFile = @"TestData\MeasuredSpeed\MeasuredSpeedGear.vecto";
 			var fileWriter = new FileOutputWriter(jobFile);
 			var sumWriter = new SummaryDataContainer(fileWriter);
 			var jobContainer = new JobContainer(sumWriter);
@@ -329,7 +328,5 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 			Assert.Fail("Implement this test!");
 		}
-
-//		#endregion
 	}
 }
\ No newline at end of file

VectoCoreTest/TestData/MeasuredSpeed/Demo_Rigid.vcdb

-0,1
-5,1.05
-10,1.1
-15,1.14
-20,1.165
-25,1.17
-30,1.16
-90,0
-180,-1.5

VectoCoreTest/TestData/MeasuredSpeed/Demo_Vehicle_ChassisDyno.vveh

-{
-	"Header": {
-		"CreatedBy": "Michael Krisper",
-		"Date": "04.02.2016 16:39:02",
-		"AppVersion": "3.0.2",
-		"FileVersion": 7
-	},
-	"Body": {
-		"SavedInDeclMode": false,
-		"VehCat": "Rigid",
-		"CurbWeight": 8862.0,
-		"CurbWeightExtra": 0.0,
-		"Loading": 0.0,
-		"MassMax": 11990.0,
-		"CdA": 6.16498344,
-		"rdyn": 520.0,
-		"WheelsInertia": 216.2271,
-		"WheelsDiaEff": 0.848974,
-		"Rim": "-",
-		"CdCorrMode": "Off",
-		"CdCorrFile": "<NOFILE>",
-		"Retarder": {
-			"Type": "None",
-			"Ratio": 1.0,
-			"File": "<NOFILE>"
-		},
-		"AxleConfig": {
-			"Type": "4x2",
-			"Axles": [
-				{
-					"Inertia": 6.0,
-					"Wheels": "245/70 R19.5",
-					"AxleWeightShare": 0.4,
-					"TwinTyres": false,
-					"RRCISO": 0.007144311,
-					"FzISO": 20800.0
-				},
-				{
-					"Inertia": 6.0,
-					"Wheels": "245/70 R19.5",
-					"AxleWeightShare": 0.6,
-					"TwinTyres": false,
-					"RRCISO": 0.008081271,
-					"FzISO": 20800.0
-				}
-			]
-		}
-	}
-}
\ No newline at end of file

VectoCoreTest/TestData/MeasuredSpeed/Dummy.vacc → VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc

-0,100,-100
+0   ,100,-100
 1000,100,-100
\ No newline at end of file

VectoCoreTest/TestData/MeasuredSpeed/Demo_Engine.veng → VectoCoreTest/TestData/MeasuredSpeed/Engine.veng

 {
   "Header": {
     "CreatedBy": "Michael Krisper",
-    "Date": "04.02.2016 16:38:55",
+    "Date": "2016-02-16T17:04:46+01:00",
     "AppVersion": "3.0.2",
     "FileVersion": 3
   },
@@ -9,11 +9,11 @@
     "SavedInDeclMode": false,
     "ModelName": "Demo Engine",
     "Displacement": 6000.0,
-	"IdlingSpeed": 600.0,
-	"Inertia": 2.8,
-    "FullLoadCurve": "Demo_EngineFullload.vfld",
-	"FuelMap": "Demo_EngineFcmap.vmap",
-	"WHTC-Urban": 1,
+	  "IdlingSpeed": 600.0,
+	  "Inertia": 2.8,
+    "FullLoadCurve": "FullLoadCurve.vfld",
+	  "FuelMap": "FuelConsumption.vmap",
+	  "WHTC-Urban": 1,
     "WHTC-Rural": 1,
     "WHTC-Motorway": 1
   }

VectoCoreTest/TestData/MeasuredSpeed/Demo_Gearbox.vgbx → VectoCoreTest/TestData/MeasuredSpeed/Gearbox.vgbx

 {
   "Header": {
     "CreatedBy": "Michael Krisper",
-    "Date": "04.02.2016 16:38:57",
+    "Date": "2016-02-16T17:05:02+01:00",
     "AppVersion": "3.0.2",
     "FileVersion": 5
   },
@@ -13,46 +13,46 @@
     "Gears": [
       {
         "Ratio": 4.3,
-        "LossMap": "Axle.vtlm"
+        "LossMap": "Gear_Axle_loss.vtlm"
       },
       {
         "Ratio": 6.696,
-        "LossMap": "Indirect Gear.vtlm",
+        "LossMap": "Gear_Indirect_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.806,
-        "LossMap": "Indirect Gear.vtlm",
+        "LossMap": "Gear_Indirect_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.289,
-        "LossMap": "Indirect Gear.vtlm",
+        "LossMap": "Gear_Indirect_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.48,
-        "LossMap": "Indirect Gear.vtlm",
+        "LossMap": "Gear_Indirect_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
-        "LossMap": "Direct Gear.vtlm",
+        "LossMap": "Gear_Direct_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 0.728,
-        "LossMap": "Indirect Gear.vtlm",
+        "LossMap": "Gear_Indirect_loss.vtlm",
         "TCactive": false,
         "ShiftPolygon": "ShiftPolygons.vgbs",
         "FullLoadCurve": "<NOFILE>"

VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.vecto → VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vecto

 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (eed25180-b54a-46f8-a51e-2182e6c955c5)",
-    "Date": "07.10.2013 16:39:00",
-    "AppVersion": "1.4",
+    "CreatedBy": "Michael Krisper",
+    "Date": "2016-02-16T16:57:05+01:00",
+    "AppVersion": "3.0.2",
     "FileVersion": 2
   },
   "Body": {
     "SavedInDeclMode": false,
-    "VehicleFile": "Demo_Vehicle_ChassisDyno.vveh",
-    "EngineFile": "Demo_Engine.veng",
-    "GearboxFile": "Demo_Gearbox.vgbx",
+    "EngineOnlyMode": false,
+    "VehicleFile": "Vehicle.vveh",
+    "EngineFile": "Engine.veng",
+    "GearboxFile": "Gearbox.vgbx",
     "Cycles": [
-      "ChassisDyno_Motorway.vdri",
-      "ChassisDyno_Rural.vdri",
-      "ChassisDyno_Urban.vdri"
+      "MeasuredSpeed_Motorway.vdri",
+      "MeasuredSpeed_Rural.vdri",
+      "MeasuredSpeed_Urban.vdri"
     ],
     "Aux": [
       {
         "ID": "Alt",
         "Type": "Alternator",
-        "Path": "Demo_AuxAlternator.vaux",
-		"Technology": ""
+        "Path": "Alternator.vaux",
+        "Technology": ""
       }
     ],
-    "VACC": "Dummy.vacc",
-    "EngineOnlyMode": false,
+    "VACC": "Driver.vacc",
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,

VectoCoreTest/TestData/MeasuredSpeed/Demo_TestTrackCycle.vecto → VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear.vecto

 {
 	"Header": {
-		"CreatedBy": "Raphael Luz IVT TU-Graz (eed25180-b54a-46f8-a51e-2182e6c955c5)",
-		"Date": "07.10.2013 16:39:08",
-		"AppVersion": "1.4",
+		"CreatedBy": "Michael Krisper",
+		"Date": "2016-02-16T16:57:05+01:00",
+		"AppVersion": "3.0.2",
 		"FileVersion": 2
 	},
 	"Body": {
 		"SavedInDeclMode": false,
-		"VehicleFile": "Demo_Vehicle_TestTrack.vveh",
-		"EngineFile": "Demo_Engine.veng",
-		"GearboxFile": "Demo_Gearbox.vgbx",
+		"EngineOnlyMode": false,
+		"VehicleFile": "Vehicle.vveh",
+		"EngineFile": "Engine.veng",
+		"GearboxFile": "Gearbox.vgbx",
 		"Cycles": [
-			"TestTrackCycle_ActualSpeed.vdri"
+			"MeasuredSpeed.vdri"
 		],
 		"Aux": [
 			{
 				"ID": "Alt",
 				"Type": "Alternator",
-				"Path": "Demo_AuxAlternator.vaux",
+				"Path": "Alternator.vaux",
 				"Technology": ""
 			}
 		],
-		"VACC": "Dummy.vacc",
-		"EngineOnlyMode": false,
+		"VACC": "Driver.vacc",
 		"StartStop": {
 			"Enabled": false,
 			"MaxSpeed": 5.0,