From 947c97f614963cf81cf77b5f317c48a04e81cba9 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Fri, 8 Oct 2021 15:58:34 +0200
Subject: [PATCH] DefaultDriverStrategy reformating (no functional changes)
---
.../Impl/DefaultDriverStrategy.cs | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index cf599b4138..b06463f767 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -349,7 +349,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
// check if within PCC segment and update state ----------------------------
var distance = Driver.DataBus.MileageCounter.Distance;
var withinPCCSegment = PCCSegments.Current != null
- && distance.IsBetween(PCCSegments.Current.StartDistance, PCCSegments.Current.EndDistance);
+ && PCCSegments.Current.StartDistance <= distance
+ && distance <= PCCSegments.Current.EndDistance;
if (!withinPCCSegment) {
_PCCState = PCCStates.OutsideSegment;
@@ -370,7 +371,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
endEnergyUseCase1 = CalculateEnergy(endCycleEntry.Altitude, endCycleEntry.VehicleTargetSpeed, Driver.DataBus.VehicleInfo.TotalMass);
}
var vehicleSpeed = Driver.DataBus.VehicleInfo.VehicleSpeed;
- var coastingForce = CalculateCoastingForce(targetVelocity, vehicleSpeed);
+ var coastingForce = CalculateCoastingForce(targetVelocity, vehicleSpeed, PCCSegments.Current.Altitude, endUseCase1);
var energyCoastingEndUseCase1 = coastingForce * (endUseCase1 - distance);
var currentEnergy = CalculateEnergy(Driver.DataBus.DrivingCycleInfo.Altitude, vehicleSpeed, Driver.DataBus.VehicleInfo.TotalMass);
var energyCoastingLow = coastingForce * (PCCSegments.Current.DistanceAtLowestSpeed - distance);
@@ -411,11 +412,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- private Newton CalculateCoastingForce(MeterPerSecond targetVelocity, MeterPerSecond vehicleSpeed)
+ private Newton CalculateCoastingForce(MeterPerSecond targetVelocity, MeterPerSecond vehicleSpeed, Meter targetAltitude, Meter targetDistance)
{
var dataBus = Driver.DataBus;
var airDragForce = Driver.DataBus.VehicleInfo.AirDragResistance(vehicleSpeed, targetVelocity);
var rollResistanceForce = Driver.DataBus.VehicleInfo.RollingResistance(dataBus.DrivingCycleInfo.RoadGradient);
+
+ //mk20211008 shouldn't we calculate it the same as in ComputeCoastingDistance?
+ //var rollResistanceForce = Driver.DataBus.VehicleInfo.RollingResistance(
+ // ((targetAltitude - Driver.DataBus.DrivingCycleInfo.Altitude) / (targetDistance - Driver.DataBus.MileageCounter.Distance))
+ // .Value().SI<Radian>());
+
+ var gearboxLoss = Driver.DataBus.GearboxInfo.GearboxLoss();
+ var axleLoss = Driver.DataBus.AxlegearInfo.AxlegearLoss();
+ var emDragLoss = CalculateElectricMotorDragLoss();
var iceDragLoss = 0.SI<Watt>();
if (dataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
if (ADAS.EcoRoll == EcoRollType.None && ATEcoRollReleaseLockupClutch) {
@@ -427,13 +437,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- var emDragLoss = CalculateElectricMotorDragLoss();
- var gearboxLoss = Driver.DataBus.GearboxInfo.GearboxLoss();
- var axleLoss = Driver.DataBus.AxlegearInfo.AxlegearLoss();
-
- var coastingResistanceForce = airDragForce
- + rollResistanceForce
- + (gearboxLoss + axleLoss + emDragLoss - iceDragLoss) / vehicleSpeed;
+ var totalComponentLossPowers = gearboxLoss + axleLoss + emDragLoss - iceDragLoss;
+ var coastingResistanceForce = airDragForce + rollResistanceForce + totalComponentLossPowers / vehicleSpeed;
return coastingResistanceForce;
}
--
GitLab