From bec017e49f12dd72a638a63cf838b4ef5d9f5eac Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 14 Apr 2022 17:39:32 +0200
Subject: [PATCH] Code formatting
---
.../Models/SimulationComponent/Impl/Driver.cs | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index a6317382f6..5994508c37 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -979,27 +979,23 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
var limitApplied = false;
var retVal = new OperatingPoint(operatingPoint);
- var originalAcceleration = retVal.Acceleration;
- //if (((limits & LimitationMode.LimitDecelerationLookahead) != 0) &&
- // retVal.Acceleration < DriverData.LookAheadCoasting.Deceleration) {
- // retVal.Acceleration = DriverData.LookAheadCoasting.Deceleration;
- // limitApplied = true;
- //}
+
var accelerationLimits = DriverData.AccelerationCurve.Lookup(DataBus.VehicleInfo.VehicleSpeed);
- //if (retVal.Acceleration > accelerationLimits.Acceleration) {
+
if (limits != LimitationMode.NoLimitation && operatingPoint.Acceleration > accelerationLimits.Acceleration) {
retVal.Acceleration = accelerationLimits.Acceleration;
limitApplied = true;
}
- if (((limits & LimitationMode.LimitDecelerationDriver) != 0) &&
- retVal.Acceleration < accelerationLimits.Deceleration) {
+
+ if ((limits & LimitationMode.LimitDecelerationDriver) != 0
+ && retVal.Acceleration < accelerationLimits.Deceleration) {
retVal.Acceleration = accelerationLimits.Deceleration;
limitApplied = true;
}
+
if (limitApplied) {
- retVal.SimulationInterval =
- ComputeTimeInterval(retVal.Acceleration, retVal.SimulationDistance)
- .SimulationInterval;
+ retVal.SimulationInterval =
+ ComputeTimeInterval(retVal.Acceleration, retVal.SimulationDistance).SimulationInterval;
Log.Debug("Limiting acceleration from {0} to {1}, dt: {2}", operatingPoint.Acceleration,
retVal.Acceleration, retVal.SimulationInterval);
}
--
GitLab