changes in driverstrategy: perform updates for drive action when switching from brake to drive

VectoCore/Models/Simulation/IVectoRun.cs

@@ -10,6 +10,8 @@ namespace TUGraz.VectoCore.Models.Simulation
 		/// </summary>
 		void Run();
 
+		string Name { get; }
+
 		/// <summary>
 		/// Return the vehicle container.
 		/// </summary>

VectoCore/Models/Simulation/Impl/DistanceRun.cs

@@ -9,8 +9,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 {
 	public class DistanceRun : VectoRun
 	{
-		public string Name { get; protected set; }
-
 		public DistanceRun(string name, IVehicleContainer container) : base(container)
 		{
 			Name = name;

VectoCore/Models/Simulation/Impl/VectoRun.cs

@@ -12,6 +12,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 	/// </summary>
 	public abstract class VectoRun : LoggingObject, IVectoRun
 	{
+		public string Name { get; protected set; }
+
 		protected Second AbsTime = 0.SI<Second>();
 		protected Second dt = 1.SI<Second>();
 		protected SummaryFileWriter SumWriter { get; set; }
@@ -49,16 +51,16 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				} while (response is ResponseSuccess);
 			} catch (VectoSimulationException vse) {
 				Container.FinishSimulation();
-				throw new VectoSimulationException("absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}", vse, AbsTime,
-					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, vse.Message);
+				throw new VectoSimulationException("{6} - absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4} | {5}", vse,
+					AbsTime, Container.Distance, dt, Container.VehicleSpeed, Container.Gear, vse.Message, Name);
 			} catch (VectoException ve) {
 				Container.FinishSimulation();
-				throw new VectoSimulationException("absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}", ve, AbsTime,
-					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, ve.Message);
+				throw new VectoSimulationException("{6} - absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4} | {5}", ve,
+					AbsTime, Container.Distance, dt, Container.VehicleSpeed, Container.Gear, ve.Message, Name);
 			} catch (Exception e) {
 				Container.FinishSimulation();
-				throw new VectoSimulationException("absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}", e, AbsTime,
-					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, e.Message);
+				throw new VectoSimulationException("{6} - absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4} | {5}", e, AbsTime,
+					Container.Distance, dt, Container.VehicleSpeed, Container.Gear, e.Message, Name);
 			}
 			Container.FinishSimulation();
 			Log.Info("VectoJob finished.");

VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -42,9 +42,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public IResponse Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
 		{
-			//DrivingBehaviorEntry nextAction = null;
-			switch (CurrentDrivingMode) {
-				case DrivingMode.DrivingModeDrive:
+			if (CurrentDrivingMode == DrivingMode.DrivingModeBrake) {
+				if (Driver.DataBus.Distance.IsGreaterOrEqual(BrakeTrigger.TriggerDistance)) {
+					CurrentDrivingMode = DrivingMode.DrivingModeDrive;
+					NextDrivingAction = null;
+					DrivingModes[CurrentDrivingMode].ResetMode();
+					Log.Debug("Switching to DrivingMode DRIVE");
+				}
+			}
+			if (CurrentDrivingMode == DrivingMode.DrivingModeDrive) {
 				var currentDistance = Driver.DataBus.Distance;
 				UpdateDrivingAction(currentDistance);
 				if (NextDrivingAction != null) {
@@ -55,9 +61,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						Log.Debug("Switching to DrivingMode BRAKE");
 
 						BrakeTrigger = NextDrivingAction;
-							break;
-						}
-						if ((currentDistance + ds).IsGreater(NextDrivingAction.ActionDistance)) {
+						//break;
+					} else if ((currentDistance + ds).IsGreater(NextDrivingAction.ActionDistance)) {
 						Log.Debug("Current simulation interval exceeds next action distance at {0}. reducing maxDistance to {1}",
 							NextDrivingAction.ActionDistance, NextDrivingAction.ActionDistance - currentDistance);
 						return new ResponseDrivingCycleDistanceExceeded() {
@@ -66,14 +71,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						};
 					}
 				}
-					break;
-				case DrivingMode.DrivingModeBrake:
-					if (Driver.DataBus.Distance.IsGreaterOrEqual(BrakeTrigger.TriggerDistance)) {
-						CurrentDrivingMode = DrivingMode.DrivingModeDrive;
-						DrivingModes[CurrentDrivingMode].ResetMode();
-						Log.Debug("Switching to DrivingMode DRIVE");
-					}
-					break;
 			}
 
 			var retVal = DrivingModes[CurrentDrivingMode].Request(absTime, ds, targetVelocity, gradient);
@@ -142,6 +139,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				}
 			} else {
 				// update action distance for current 'next action'
+				if (Driver.DataBus.VehicleSpeed > NextDrivingAction.NextTargetSpeed) {
 					switch (NextDrivingAction.Action) {
 						case DrivingBehavior.Coasting:
 							var coastingDistance = Formulas.DecelerationDistance(Driver.DataBus.VehicleSpeed,
@@ -156,6 +154,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						default:
 							throw new ArgumentOutOfRangeException();
 					}
+				}
 
 				if (nextAction != null) {
 					if (nextAction.HasEqualTrigger(NextDrivingAction)) {
@@ -457,7 +456,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						}).
 						Case<ResponseOverload>(r => {
 							// limiting deceleration while coast may result in an overload => issue brakes to decelerate with driver's max deceleration
+							if (DataBus.ClutchClosed(absTime)) {
 								response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
+							} else {
+								response = Driver.DrivingActionRoll(absTime, ds, targetVelocity, gradient);
+							}
 							//Phase = BrakingPhase.Brake;
 						}).
 						Case<ResponseGearShift>(r => {

VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs

@@ -854,8 +854,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycleData = new string[] {
 				// <s>,<v>,<grad>,<stop>
 				"  0,  60, -1.4,     0",
-				"198,  60, -1.7,     0",
-				"200,   0, -1.7,     4",
+				"298,  60, -1.7,     0",
+				"300,   0, -1.7,     4",
 			};
 			var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
 

VectoCoreTest/Utils/GraphWriter.cs

@@ -120,7 +120,6 @@ namespace TUGraz.VectoCore.Tests.Utils
 						IsDockedInsideChartArea = false,
 						DockedToChartArea = yfield.ToString(),
 						Font = new Font("Verdana", 14),
-						
 					};
 					chart.Legends.Add(legend);