Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 31915991 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

remove no longer needed parameter

parent 1db2f458
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,6 @@ using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
......@@ -58,14 +57,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
set { CurrentState.TorqueConverterLocked = value; }
}
public ATGearbox(IVehicleContainer container, GearboxData gearboxModelData, IShiftStrategy strategy,
VectoRunData runData)
: base(container, gearboxModelData, runData)
public ATGearbox(IVehicleContainer container, IShiftStrategy strategy, VectoRunData runData)
: base(container, runData)
{
_strategy = strategy;
_strategy.Gearbox = this;
LastShift = -double.MaxValue.SI<Second>();
TorqueConverter = new TorqueConverter(this, _strategy, container, gearboxModelData.TorqueConverterData,
TorqueConverter = new TorqueConverter(this, _strategy, container, ModelData.TorqueConverterData,
runData);
}
......
......@@ -54,11 +54,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected KilogramSquareMeter EngineInertia;
protected AbstractGearbox(IVehicleContainer container, GearboxData gearboxModelData, VectoRunData runData)
: base(container)
protected AbstractGearbox(IVehicleContainer container, VectoRunData runData): base(container)
{
ModelData = gearboxModelData;
EngineInertia = runData != null && runData.EngineData != null
ModelData = runData.GearboxData;
EngineInertia = runData.EngineData != null
? runData.EngineData.Inertia
: 0.SI<KilogramSquareMeter>();
}
......
......@@ -55,14 +55,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected internal readonly TorqueConverter TorqueConverter;
public CycleGearbox(IVehicleContainer container, GearboxData gearboxModelData, VectoRunData runData)
: base(container, gearboxModelData, runData)
public CycleGearbox(IVehicleContainer container, VectoRunData runData)
: base(container, runData)
{
if (!gearboxModelData.Type.AutomaticTransmission()) {
if (!ModelData.Type.AutomaticTransmission()) {
return;
}
var strategy = new CycleShiftStrategy(ModelData, null);
TorqueConverter = new TorqueConverter(this, strategy, container, gearboxModelData.TorqueConverterData, runData);
TorqueConverter = new TorqueConverter(this, strategy, container, ModelData.TorqueConverterData, runData);
if (TorqueConverter == null) {
throw new VectoException("Torque Converter required for AT transmission!");
}
......
......@@ -37,7 +37,6 @@ using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
......@@ -74,9 +73,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return _engageTime.IsSmallerOrEqual(absTime);
}
public Gearbox(IVehicleContainer container, GearboxData gearboxModelData, IShiftStrategy strategy,
KilogramSquareMeter engineInertia)
: base(container, gearboxModelData, engineInertia)
public Gearbox(IVehicleContainer container, IShiftStrategy strategy, VectoRunData runData) : base(container, runData)
{
_strategy = strategy;
_strategy.Gearbox = this;
......@@ -349,7 +346,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var shiftAllowed = !inAngularVelocity.IsEqual(0) && !DataBus.VehicleSpeed.IsEqual(0);
if (response is ResponseSuccess && shiftAllowed) {
var shiftRequired = _strategy.ShiftRequired(absTime, dt, outTorque, outAngularVelocity, inTorque, response.EngineSpeed,
var shiftRequired = _strategy.ShiftRequired(absTime, dt, outTorque, outAngularVelocity, inTorque,
response.EngineSpeed,
Gear, _engageTime);
if (shiftRequired) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment