From 71c6b0c2948e5a889ebcd9a3f800a558f25c2855 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Tue, 22 Mar 2022 15:22:36 +0100 Subject: [PATCH] PowertrainBuilder: Reformated BuildMeasuredSpeedGear --- .../Models/Simulation/Impl/PowertrainBuilder.cs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index a382b8ca11..08293e74e1 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -295,25 +295,18 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl } var container = new VehicleContainer(ExecutionMode.Engineering, _modData, _sumWriter) { RunData = data }; - - // MeasuredSpeedDrivingCycle --> vehicle --> wheels --> brakes - // --> axleGear --> (retarder) --> CycleGearBox --> (retarder) --> CycleClutch --> engine <-- Aux - var powertrain = new MeasuredSpeedDrivingCycle(container, data.Cycle) + new MeasuredSpeedDrivingCycle(container, data.Cycle) .AddComponent(new Vehicle(container, data.VehicleData, data.AirdragData)) .AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia)) .AddComponent(new Brakes(container)) .AddComponent(new AxleGear(container, data.AxleGearData)) .AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null) - .AddComponent(new CycleGearbox(container, data)); - new ATClutchInfo(container); - if (data.GearboxData.Type.ManualTransmission()) { - powertrain = powertrain.AddComponent(new Clutch(container, data.EngineData)); - } - - powertrain.AddComponent(new StopStartCombustionEngine(container, data.EngineData)) + .AddComponent(new CycleGearbox(container, data)) + .AddComponent(data.GearboxData.Type.ManualTransmission() ? new Clutch(container, data.EngineData) : null) + .AddComponent(new StopStartCombustionEngine(container, data.EngineData)) .AddAuxiliaries(container, data); - + new ATClutchInfo(container); return container; } -- GitLab