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 ce13ad1c authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #780 in VECTO/vecto-sim from...

Merge pull request #780 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1040-gear-6-lossmap-data-was-extrapolated-in-declaration-mode to develop

* commit 'b888486b':
  driverstrategy: switch to braking phase immediately if nextdrivingaction.action is set to braking (instead of doing the same calculations again
parents 459e7a23 b888486b
Branches
Tags
No related merge requests found
...@@ -664,6 +664,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -664,6 +664,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var brakingDistance = Driver.ComputeDecelerationDistance(DriverStrategy.BrakeTrigger.NextTargetSpeed) + var brakingDistance = Driver.ComputeDecelerationDistance(DriverStrategy.BrakeTrigger.NextTargetSpeed) +
DefaultDriverStrategy.BrakingSafetyMargin; DefaultDriverStrategy.BrakingSafetyMargin;
DriverStrategy.BrakeTrigger.BrakingStartDistance = DriverStrategy.BrakeTrigger.TriggerDistance - brakingDistance; DriverStrategy.BrakeTrigger.BrakingStartDistance = DriverStrategy.BrakeTrigger.TriggerDistance - brakingDistance;
if (DriverStrategy.BrakeTrigger.Action == DrivingBehavior.Braking) {
Phase = BrakingPhase.Brake;
}
if (Phase == BrakingPhase.Coast) { if (Phase == BrakingPhase.Coast) {
var resp = CheckSwitchingToBraking(ds, currentDistance); var resp = CheckSwitchingToBraking(ds, currentDistance);
if (resp != null) { if (resp != null) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment