This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 3ac1461a authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Improved DebugData and DebuggerDisplay Output

parent 4adfc30b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 90 additions and 69 deletions
VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
+ 1
− 0
View file @ 3ac1461a
......@@ -18,6 +18,7 @@ namespace TUGraz.VectoCommon.Models {
public GearboxResponse GearboxResponse { get; set; }
}
[DebuggerDisplay("HybridStrategyResponse(Gear: {NextGear})")]
public class HybridStrategyResponse : AbstractComponentResponse, IHybridStrategyResponse
{
public Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>> MechanicalAssistPower;
......
VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
+ 23
− 12
View file @ 3ac1461a
......@@ -30,6 +30,7 @@
*/
using System;
using System.Diagnostics;
using System.Linq;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
......@@ -38,8 +39,6 @@ using TUGraz.VectoCore.Models.SimulationComponent.Impl;
namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
{
public abstract class AbstractResponse : IResponse
{
public AbstractResponse(object source)
......@@ -106,17 +105,17 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public HybridControllerResponse HybridController { get; set; }
public override string ToString()
{
var t = GetType();
return $"{t.Name}{{{t.GetProperties().Select(p => $"{p.Name}: {p.GetValue(this)}").Join()}}}";
}
//public override string ToString()
//{
// var t = GetType();
// return $"{t.Name}{{{t.GetProperties().Select(p => $"{p.Name}: {p.GetValue(this)}").Join()}}}";
//}
}
/// <summary>
/// Response when the Cycle is finished.
/// </summary>
[DebuggerDisplay("CycleFinished")]
public class ResponseCycleFinished : AbstractResponse {
public ResponseCycleFinished(object source) : base(source) { }
}
......@@ -124,10 +123,12 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
/// <summary>
/// Response when a request was successful.
/// </summary>
[DebuggerDisplay("Success({AbsTime,nq}, {Driver.OperatingPoint,nq})")]
public class ResponseSuccess : AbstractResponse {
public ResponseSuccess(object source) : base(source) { }
}
[DebuggerDisplay("BatteryEmpty")]
public class ResponseBatteryEmpty : AbstractResponse
{
public ResponseBatteryEmpty(object source, IElectricSystemResponse electricSupplyResponse) : base(source) { }
......@@ -136,6 +137,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
/// <summary>
/// Response when the request resulted in an engine or gearbox overload.
/// </summary>
[DebuggerDisplay("Overload({Delta,nq})")]
public class ResponseOverload : AbstractResponse
{
public Watt Delta { get; set; }
......@@ -145,6 +147,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
/// <summary>
/// Response when the request resulted in an engine under-load.
/// </summary>
[DebuggerDisplay("Underload({Delta,nq})")]
public class ResponseUnderload : AbstractResponse
{
public Watt Delta { get; set; }
......@@ -154,6 +157,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
/// <summary>
/// Response when the Speed Limit was exceeded.
/// </summary>
[DebuggerDisplay("SpeedLimitExceeded")]
public class ResponseSpeedLimitExceeded : AbstractResponse
{
public ResponseSpeedLimitExceeded(object source) : base(source) { }
......@@ -162,6 +166,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
/// <summary>
/// Response when the request should have another time interval.
/// </summary>
[DebuggerDisplay("FailTimeInterval({DeltaT,nq})")]
public class ResponseFailTimeInterval : AbstractResponse
{
public ResponseFailTimeInterval(object source) : base(source) { }
......@@ -169,12 +174,14 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public Second DeltaT { get; set; }
}
[DebuggerDisplay("DistanceExceeded({MaxDistance,nq})")]
public class ResponseDrivingCycleDistanceExceeded : AbstractResponse
{
public ResponseDrivingCycleDistanceExceeded(object source) : base(source) { }
public Meter MaxDistance { get; set; }
}
[DebuggerDisplay("DryRun({DeltaFullLoad,nq}, {DeltaDragLoad,nq}, {DeltaEngineSpeed,nq})")]
public class ResponseDryRun : AbstractResponse
{
public ResponseDryRun(object source) : base(source) { }
......@@ -191,6 +198,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public PerSecond DeltaEngineSpeed { get; set; }
}
[DebuggerDisplay("GearShift")]
internal class ResponseGearShift : AbstractResponse
{
public ResponseGearShift(object source) : base(source) { }
......@@ -198,11 +206,13 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public ResponseGearShift(object source, IResponse subResponse) : base(source, subResponse) { }
}
[DebuggerDisplay("DifferentGearEngaged")]
internal class ResponseDifferentGearEngaged : AbstractResponse
{
public ResponseDifferentGearEngaged(object source) : base(source) { }
}
[DebuggerDisplay("InvalidOperatingPoint")]
internal class ResponseInvalidOperatingPoint : AbstractResponse
{
public ResponseInvalidOperatingPoint(object source) : base(source) { }
......@@ -212,6 +222,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
internal class ResponseEngineSpeedTooLow : ResponseDryRun {}
*/
[DebuggerDisplay("EngineSpeedTooHigh({DeltaEngineSpeed,nq})")]
internal class ResponseEngineSpeedTooHigh : AbstractResponse
{
public ResponseEngineSpeedTooHigh(object source) : base(source) { }
......
VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
+ 1
− 1
View file @ 3ac1461a
......@@ -85,7 +85,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (loopCount++ > Constants.SimulationSettings.MaximumIterationCountForSimulationStep) {
throw new VectoSimulationException("Maximum iteration count for a single simulation interval reached! Aborting!");
}
debug.Add(new {Response = response});
debug.Add(response);
} while (!(response is ResponseSuccess || response is ResponseCycleFinished || response is ResponseBatteryEmpty));
IterationStatistics.Increment(this, "Distance", Container.MileageCounter.Distance.Value());
......
VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
+ 1
− 0
View file @ 3ac1461a
......@@ -105,6 +105,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
do {
response = DoSimulationStep();
debug.Trim();
debug.Add(response);
if (response is ResponseSuccess) {
Container.CommitSimulationStep(AbsTime, dt);
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+ 3
− 1
View file @ 3ac1461a
......@@ -255,7 +255,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var loop = false;
SetPowershiftLossEnergy(absTime, dt, outTorque, outAngularVelocity);
do {
if (CurrentState.Disengaged || (DataBus.DriverInfo.DriverBehavior == DrivingBehavior.Halted) || (DisengageGearbox && !ModelData.ATEcoRollReleaseLockupClutch)) {
if (CurrentState.Disengaged
|| DataBus.DriverInfo.DriverBehavior == DrivingBehavior.Halted
|| DisengageGearbox && !ModelData.ATEcoRollReleaseLockupClutch) {
// only when vehicle is halted or close before halting or during eco-roll events
retVal = RequestDisengaged(absTime, dt, outTorque, outAngularVelocity, dryRun);
} else {
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+ 38
− 38
View file @ 3ac1461a
......@@ -911,18 +911,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var response = Driver.DrivingActionRoll(absTime, ds, velocity, gradient);
debug.Add(new { a = "[HRD-0] ClutchOpen -> Roll", response });
debug.Add("[HRD-0] ClutchOpen -> Roll", response);
switch (response) {
case ResponseUnderload _ when DataBus.ClutchInfo.ClutchClosed(absTime):
response = HandleRequestEngaged(absTime, ds, velocity, gradient, false, velocity, debug);
break;
case ResponseUnderload _ when !DataBus.ClutchInfo.ClutchClosed(absTime):
response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient, response);
debug.Add(new { a = "[HRD-1] Roll:Underload -> Brake", response });
debug.Add("[HRD-1] Roll:Underload -> Brake", response);
break;
case ResponseSpeedLimitExceeded _:
response = Driver.DrivingActionBrake(absTime, ds, velocity, gradient);
debug.Add(new { a = "[HRD-2] Roll:SpeedLimitExceeded -> Brake", response });
debug.Add("[HRD-2] Roll:SpeedLimitExceeded -> Brake", response);
break;
}
return response;
......@@ -941,12 +941,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission() && !DataBus.ClutchInfo.ClutchClosed(absTime)) {
//TODO mk20210616 the whole statement could be de-nested to switch-pattern matching (with "where") if this first "if" would not be here.
var debugResponse = Driver.DrivingActionRoll(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-0] (Underload&Overspeed)->Roll", second });
debug.Add("[HRE-0] (Underload&Overspeed)->Roll", second);
}
if (DataBus.VehicleInfo.VehicleSpeed.IsGreater(0) && DriverStrategy.IsOverspeedAllowed(targetVelocity, prohibitOverspeed)) {
second = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-1] (Underload&Overspeed)->Coast", second });
debug.Add("[HRE-1] (Underload&Overspeed)->Coast", second);
second = HandleCoastAfterUnderloadWithOverspeed(absTime, ds, gradient, velocityWithOverspeed, debug, second);
} else {
// overrideAction: in case of hybrids with an AT gearbox after an underload we search for braking power because the torque converter
......@@ -964,7 +964,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
: (DrivingAction?)null;
second = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient,
overrideAction: overrideAction);
debug.Add(new { a = "[HRE-2] (Underload&!Overspeed)->Brake", second });
debug.Add("[HRE-2] (Underload&!Overspeed)->Brake", second);
}
break;
case ResponseEngineSpeedTooHigh _:
......@@ -972,7 +972,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
break;
case ResponseSpeedLimitExceeded _:
second = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-3] SpeedLimitExceeded->Brake", second });
debug.Add("[HRE-3] SpeedLimitExceeded->Brake", second);
break;
}
......@@ -985,40 +985,40 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
switch (second) {
case ResponseGearShift _:
third = Driver.DrivingActionRoll(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-4] second: GearShift -> Roll", third });
debug.Add("[HRE-4] second: GearShift -> Roll", third);
switch (third) {
case ResponseOverload _:
third = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-5] third:Overload -> try again Coast", third });
debug.Add("[HRE-5] third:Overload -> try again Coast", third);
break;
case ResponseUnderload _:
// underload may happen if driver limits acceleration when rolling downhill
third = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-6] third:Underload -> Brake", third });
debug.Add("[HRE-6] third:Underload -> Brake", third);
break;
case ResponseSpeedLimitExceeded _:
third = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-7] third:SpeedLimitExceeded -> Brake", third });
debug.Add("[HRE-7] third:SpeedLimitExceeded -> Brake", third);
break;
}
break;
case ResponseOverload _ when DataBus.VehicleInfo.VehicleSpeed.IsGreater(0):
third = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-8] second:Overload -> Coast", third });
debug.Add("[HRE-8] second:Overload -> Coast", third);
switch (third) {
case ResponseGearShift _:
third = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-9] third:GearShift -> try again Coast", third });
debug.Add("[HRE-9] third:GearShift -> try again Coast", third);
break;
case ResponseSpeedLimitExceeded _:
if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission() &&
!DataBus.GearboxInfo.Gear.IsLockedGear()) {
third = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed + 1.KMPHtoMeterPerSecond(), gradient);
debug.Add(new { a = "[HRE-10] third:Overload (AT, Converter gear) -> Coast", third });
debug.Add("[HRE-10] third:Overload (AT, Converter gear) -> Coast", third);
} else {
third = Driver.DrivingActionBrake(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[HRE-11] third:SpeedLimitExceeded -> Brake", third });
debug.Add("[HRE-11] third:SpeedLimitExceeded -> Brake", third);
}
break;
......@@ -1034,11 +1034,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
if (second is ResponseUnderload || second is ResponseSpeedLimitExceeded) {
second = Driver.DrivingActionBrake(absTime, ds, velocity, gradient);
debug.Add(new { a = "[HCAUWO-0] second:(Underload|SpeedLimitExceeded) -> Brake", second });
debug.Add("[HCAUWO-0] second:(Underload|SpeedLimitExceeded) -> Brake", second);
}
if (second is ResponseEngineSpeedTooHigh) {
second = Driver.DrivingActionBrake(absTime, ds, velocity, gradient, second);
debug.Add(new { a = "[HCAUWO-1] second:(EngineSpeedTooHigh|SpeedLimitExceeded) -> Brake with reduced acceleration", second });
debug.Add("[HCAUWO-1] second:(EngineSpeedTooHigh|SpeedLimitExceeded) -> Brake with reduced acceleration", second);
}
return second;
}
......@@ -1048,7 +1048,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
if (DriverStrategy.pccState == PCCStates.UseCase1 || DriverStrategy.pccState == PCCStates.UseCase2) {
var response = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[FAOC-0] Coast", response });
debug.Add("[FAOC-0] Coast", response);
if (response is ResponseSuccess) {
return response;
}
......@@ -1060,27 +1060,27 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//we are driving in overspeed (VehicleSpeed >= targetVelocity)
var response = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[FAOC-1] Coast", response });
debug.Add("[FAOC-1] Coast", response);
if (response is ResponseSuccess
&& response.Driver.Acceleration < 0 && response.Vehicle.VehicleSpeed <= targetVelocity) {
//do accelerate action if we would come below targetVelocity due to coasting
response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[FAOC-2] Accelerate(Success && Acc<0 && VehSpeed <= targetVelocity)", response });
debug.Add("[FAOC-2] Accelerate(Success && Acc<0 && VehSpeed <= targetVelocity)", response);
}
if (response is ResponseOverload
&& DataBus.PowertrainInfo.HasCombustionEngine && !DataBus.EngineInfo.EngineOn) {
response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[FAOC-3] Accelerate(Overload && ICE off)", response });
debug.Add("[FAOC-3] Accelerate(Overload && ICE off)", response);
}
if (response is ResponseOverload
&& !DataBus.PowertrainInfo.HasCombustionEngine) {
response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[FAOC-4] Accelerate(Overload && BEV)", response });
debug.Add("[FAOC-4] Accelerate(Overload && BEV)", response);
}
if (response is ResponseOverload) {
response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[FAOC-5] Accelerate(Overload)", response });
debug.Add("[FAOC-5] Accelerate(Overload)", response);
}
return response;
} else {
......@@ -1088,11 +1088,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission() && DataBus.GearboxInfo.DisengageGearbox) {
var response = Driver.DrivingActionCoast(absTime, ds, velocityWithOverspeed, gradient);
debug.Add(new { a = "[FAOC-6] Coast", response });
debug.Add("[FAOC-6] Coast", response);
return response;
} else {
var response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[FAOC-7] Accelerate", response });
debug.Add("[FAOC-7] Accelerate", response);
return response;
}
}
......@@ -1244,17 +1244,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
response = Driver.DrivingActionAccelerate(absTime, ds, 1.KMPHtoMeterPerSecond(), gradient);
debug.Add(new { a = "[DB-] Accelerate", response });
debug.Add("[DB-] Accelerate", response);
if (response is ResponseUnderload) {
response = Driver.DrivingActionBrake(absTime, ds, 1.KMPHtoMeterPerSecond(), gradient, response,
overrideAction: DrivingAction.Accelerate);
debug.Add(new { a = "[DB-2] Brake", response });
debug.Add("[DB-2] Brake", response);
}
} else {
response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
gradient, targetDistance: targetDistance);
debug.Add(new { a = "[DB-3] Brake", response });
debug.Add("[DB-3] Brake", response);
}
if ((DataBus.GearboxInfo.GearboxType.AutomaticTransmission() || DataBus.HybridControllerInfo != null)
......@@ -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(new { a = "[DB-4] Brake", response });
debug.Add("[DB-4] Brake", response);
}
if (response == null) {
......@@ -1276,10 +1276,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (!DataBus.ClutchInfo.ClutchClosed(absTime)) {
Log.Info("Brake -> Overload -> Clutch is open - Trying roll action");
response = Driver.DrivingActionRoll(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[DB-5] Roll", response });
debug.Add("[DB-5] Roll", response);
if (response is ResponseSpeedLimitExceeded) {
response = Driver.DrivingActionBrake(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[DB-6] Brake", response });
debug.Add("[DB-6] Brake", response);
}
} else {
Log.Info("Brake -> Overload -> Clutch is closed - Trying brake action again");
......@@ -1287,16 +1287,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
DataBus.HybridControllerCtl?.RepeatDrivingAction(absTime);
response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
gradient, targetDistance: targetDistance);
debug.Add(new { a = "[DB-7] Brake", response });
debug.Add("[DB-7] Brake", response);
if (response is ResponseOverload) {
Log.Info("Brake -> Overload -> 2nd Brake -> Overload -> Trying accelerate action");
var gear = DataBus.GearboxInfo.Gear;
if (DataBus.GearboxInfo.GearEngaged(absTime)) {
response = Driver.DrivingActionAccelerate(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
debug.Add(new { a = "[DB-8] Accelerate", response });
debug.Add("[DB-8] Accelerate", response);
} else {
response = Driver.DrivingActionRoll(absTime, ds, targetVelocity, gradient);
debug.Add(new { a = "[DB-9] Roll", response });
debug.Add("[DB-9] Roll", response);
}
switch (response) {
......@@ -1304,14 +1304,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Log.Info("Brake -> Overload -> 2nd Brake -> Accelerate or Roll -> Got GearShift response, performing roll action");
response = Driver.DrivingActionRoll(absTime, ds,
DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
debug.Add(new { a = "[DB-12] Roll", response });
debug.Add("[DB-12] Roll", response);
break;
case ResponseUnderload _:
if (gear.Gear != DataBus.GearboxInfo.Gear.Gear) {
// AT Gearbox switched gears, shift losses are no longer applied, try once more...
response = Driver.DrivingActionAccelerate(absTime, ds,
DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
debug.Add(new { a = "[DB-13] Accelerate", response });
debug.Add("[DB-13] Accelerate", response);
}
break;
}
......@@ -1325,11 +1325,11 @@ 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(new { a = "[DB-14] Brake", response });
debug.Add("[DB-14] Brake", response);
if (response is ResponseOverload) {
Log.Info("Brake -> Gearshift -> Overload -> trying roll action (no gear engaged)");
response = Driver.DrivingActionRoll(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
debug.Add(new { a = "[DB-15] Roll", response });
debug.Add("[DB-15] Roll", response);
}
break;
}
......
VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+ 6
− 4
View file @ 3ac1461a
......@@ -1045,6 +1045,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
return;
}
var debug = new DebugData();
var emPos = ModelData.ElectricMachinesData.First().Item1;
var disengageSpeedThreshold = ModelData.GearboxData.DisengageWhenHaltingSpeed;
var vehiclespeedBelowThreshold = DataBus.VehicleInfo.VehicleSpeed.IsSmaller(disengageSpeedThreshold);
......@@ -1091,7 +1093,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
MechanicalAssistPower = ElectricMotorsOff
};
var firstResponse = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, tmp);
debug.Add("[HBA-0] DryRun", firstResponse);
var engineSpeedTooLow = EngineSpeedTooLow(firstResponse);
var endSpeed = DataBus.VehicleInfo.VehicleSpeed +
......@@ -1122,6 +1124,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
do {
nextGear = GearList.Predecessor(nextGear);
firstResponse = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, tmp);
debug.Add("[HBA-1] DryRun", firstResponse);
} while (GearList.HasPredecessor(nextGear) && firstResponse == null);
}
......@@ -1219,9 +1222,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, VectoMath.Max(firstResponse.ElectricMotor.MaxRecuperationTorque, 0.SI<NewtonMeter>())) }
}
};
var maxRecuperationResponse = RequestDryRun(
absTime, dt, outTorque, outAngularVelocity, nextGear, maxRecuperation);
var maxRecuperationResponse = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, maxRecuperation);
debug.Add("[HBA-2] DryRun maxRecuperationResponse", maxRecuperationResponse);
var deltaDragTqMaxRecuperation = disengaged
? (maxRecuperationResponse as ResponseDryRun).DeltaDragLoadTorque
: maxRecuperationResponse.Engine.TotalTorqueDemand - maxRecuperationResponse.Engine.DragTorque;
......
VectoCore/VectoCore/Utils/DebugData.cs
+ 17
− 13
View file @ 3ac1461a
......@@ -31,34 +31,38 @@
using System.Collections.Generic;
using System.Diagnostics;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
public class DebugData
{
internal readonly List<dynamic> Data;
internal readonly Queue<dynamic> Data;
private const int defaultCapacity = 16;
public DebugData()
{
#if DEBUG
Data = new List<dynamic>();
Data = new Queue<dynamic>(defaultCapacity);
#else
Data = new Queue<dynamic>(0);
#endif
}
[Conditional("DEBUG")]
public void Add(dynamic value)
public void Trim(int maxCount = defaultCapacity)
{
Data.Add(value);
while (Data.Count > maxCount) {
Data.Dequeue();
}
public override string ToString()
{
#if DEBUG
return Data.Join("\n");
#else
return "-";
#endif
}
[Conditional("DEBUG")]
public void Add(object value) => Data.Enqueue(value);
[Conditional("DEBUG")]
public void Add(object value1, object value2) => Data.Enqueue((value1, value2));
[Conditional("DEBUG")]
public void Add(object value1, object value2, object value3) => Data.Enqueue((value1, value2, value3));
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about