From fa87a30ec4b36e3dd1b14f71e519845c884cfb24 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 29 Jul 2016 13:02:16 +0200
Subject: [PATCH] renaming parameter
---
.../SimulationComponent/Impl/AMTShiftStrategy.cs | 14 +++++++-------
.../SimulationComponent/Impl/ShiftStrategy.cs | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
index 382fb9de85..d2edb373da 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
@@ -89,11 +89,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
PreviousGear = Gearbox.Gear;
}
- public override uint InitGear(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outEngineSpeed)
+ public override uint InitGear(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
if (DataBus.VehicleSpeed.IsEqual(0)) {
for (var gear = (uint)Data.Gears.Count; gear > 1; gear--) {
- var inAngularSpeed = outEngineSpeed * Data.Gears[gear].Ratio;
+ var inAngularSpeed = outAngularVelocity * Data.Gears[gear].Ratio;
var ratedSpeed = Data.Gears[gear].FullLoadCurve != null
? Data.Gears[gear].FullLoadCurve.RatedSpeed
@@ -102,7 +102,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
continue;
}
- var response = Gearbox.Initialize(gear, outTorque, outEngineSpeed);
+ var response = Gearbox.Initialize(gear, outTorque, outAngularVelocity);
var fullLoadPower = response.EnginePowerRequest - response.DeltaFullLoad;
var reserve = 1 - response.EnginePowerRequest / fullLoadPower;
@@ -117,9 +117,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return 1;
}
for (var gear = (uint)Data.Gears.Count; gear > 1; gear--) {
- var response = Gearbox.Initialize(gear, outTorque, outEngineSpeed);
+ var response = Gearbox.Initialize(gear, outTorque, outAngularVelocity);
- var inAngularSpeed = outEngineSpeed * Data.Gears[gear].Ratio;
+ var inAngularSpeed = outAngularVelocity * Data.Gears[gear].Ratio;
var fullLoadPower = response.EnginePowerRequest - response.DeltaFullLoad;
var reserve = 1 - response.EnginePowerRequest / fullLoadPower;
var inTorque = response.ClutchPowerRequest / inAngularSpeed;
@@ -211,8 +211,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
// if a gear is skipped but acceleration is less than 0.1, try for next gear. if acceleration is still below 0.1 don't shift!
if (nextGear > currentGear &&
- EstimateAccelerationForGear(currentGear + 1, outAngularVelocity).IsSmaller(Gearbox.ModelData.UpshiftMinAcceleration))
- {
+ EstimateAccelerationForGear(currentGear + 1, outAngularVelocity)
+ .IsSmaller(Gearbox.ModelData.UpshiftMinAcceleration)) {
return currentGear;
}
nextGear = currentGear + 1;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
index 03002d7bfd..9a1aad7709 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public abstract bool ShiftRequired(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
NewtonMeter inTorque, PerSecond inAngularSpeed, uint gear, Second lastShiftTime);
- public abstract uint InitGear(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outEngineSpeed);
+ public abstract uint InitGear(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity);
public Gearbox Gearbox { get; set; }
--
GitLab