From 1953502aa25ea9f91e03c4ad7736466f04edcbb3 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 22 Jun 2017 14:06:26 +0200
Subject: [PATCH] extending driver strategy to handle unexpected responses
---
.../Impl/DefaultDriverStrategy.cs | 28 +++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index dc532e61df..b9791e6430 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -573,11 +573,29 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Case<ResponseUnderload>(r => {
response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
gradient, r);
- response.Switch().Case<ResponseGearShift>(() => {
- DataBus.BrakePower = 0.SI<Watt>();
- response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
- gradient, r);
- });
+ response.Switch().
+ Case<ResponseGearShift>(() => {
+ DataBus.BrakePower = 0.SI<Watt>();
+ response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
+ gradient, r);
+ }).
+ Case<ResponseOverload>(() => {
+ DataBus.BrakePower = 0.SI<Watt>();
+ if (DataBus.GearboxType.AutomaticTransmission() || DataBus.ClutchClosed(absTime)) {
+ if (DataBus.VehicleSpeed.IsGreater(0)) {
+ response = Driver.DrivingActionAccelerate(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+ } else {
+ if (RetryDistanceExceeded) {
+ response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
+ } else {
+ RetryDistanceExceeded = true;
+ response = new ResponseDrivingCycleDistanceExceeded() { MaxDistance = ds / 2 };
+ }
+ }
+ } else {
+ response = Driver.DrivingActionRoll(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+ }
+ });
});
return response;
}
--
GitLab