DebugData

VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs

@@ -102,10 +102,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			Initialize();
 			IResponse response;
 			var iterationCount = 0;
+
 			try {
-				
 				do {
 					response = DoSimulationStep();
+					DebugData.Clear();
 					debug.Add($"[VR.R] ---- ITERATION {iterationCount++} ---- ", response);
 					if (response is ResponseSuccess) {
 						Container.CommitSimulationStep(AbsTime, dt);
@@ -165,11 +166,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				throw ex;
 			}
 
-			Container.RunStatus = Container.RunData.Exempted || Container.RunData.MultistageRun
-				? Status.Success
-				: CyclePort.Progress < 1
-					? (response is ResponseBatteryEmpty ? Status.REESSEmpty : Status.Aborted)
-					: Status.Success;
+			if (Container.RunData.Exempted || Container.RunData.MultistageRun)
+				Container.RunStatus = Status.Success;
+			else if (CyclePort.Progress < 1)
+				Container.RunStatus = response is ResponseBatteryEmpty ? Status.REESSEmpty : Status.Aborted;
+			else
+				Container.RunStatus = Status.Success;
 			Container.FinishSimulationRun();
 			WritingResultsDone = true;
 			if (Progress.IsSmaller(1, 1e-9) && !(response is ResponseBatteryEmpty)) {

VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -1263,7 +1263,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					DataBus.Brakes.BrakePower = 0.SI<Watt>();
 					response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
 						gradient, targetDistance: targetDistance);
-					debug.Add("[DMB-DB-4] Brake", response);
+					debug.Add($"[DMB-DB-4-{i}] Brake", response);
 				}
 
 				if (response == null) {

VectoCore/VectoCore/Utils/DebugData.cs

@@ -51,6 +51,9 @@ namespace TUGraz.VectoCore.Utils
 
 		public DebugData(bool globalDebug = true) => _globalDebug = globalDebug;
 
+		[Conditional("DEBUG")]
+		public static void Clear() => GlobalData.Clear();
+		
 		[Conditional("DEBUG")]
 		public void Add(dynamic value)
 		{