diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs index 3187d536e1997c40dee99afc2f72b3f86def3760..2edb5fed86fd7fa185d8ebd3f58cc1bc724b2cb7 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs +++ b/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)) { diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs index 9a22dbb6b9b8540136a1387fdb1b6b186aa038c1..dd9f6ff97fa6a07d7c138a0b95fbf06e6f59a838 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs +++ b/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) { diff --git a/VectoCore/VectoCore/Utils/DebugData.cs b/VectoCore/VectoCore/Utils/DebugData.cs index 377097346fe503ec16f1fc0bd7fce342c927663f..f286def640435a06eeef5c0b424b2f9364621fad 100644 --- a/VectoCore/VectoCore/Utils/DebugData.cs +++ b/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) {