From 3be435b780726039c0bb431e0a9690eb0e583f9c Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 22 Mar 2022 15:23:00 +0100
Subject: [PATCH] PowertrainBuilder: Reformated BuildFullPowertrainConventional
---
.../Simulation/Impl/PowertrainBuilder.cs | 23 ++++++-------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 08293e74e1..61376cc116 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -335,30 +335,21 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
-
- // DistanceBasedDrivingCycle --> driver --> vehicle --> wheels
- // --> axleGear --> (retarder) --> gearBox --> (retarder) --> clutch --> engine <-- Aux
var cycle = new DistanceBasedDrivingCycle(container, data.Cycle);
- var powertrain = cycle
- .AddComponent(new Driver(container, data.DriverData, new DefaultDriverStrategy(container)))
+ var engine = new StopStartCombustionEngine(container, data.EngineData);
+ var idleController = GetIdleController(data.PTO, engine, container);
+ cycle.IdleController = idleController as IdleControllerSwitcher;
+ cycle.AddComponent(new Driver(container, data.DriverData, new DefaultDriverStrategy(container)))
.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(GetGearbox(container), data.Retarder, container);
- if (data.GearboxData.Type.ManualTransmission()) {
- powertrain = powertrain.AddComponent(new Clutch(container, data.EngineData));
- }
-
- var engine = new StopStartCombustionEngine(container, data.EngineData);
- var idleController = GetIdleController(data.PTO, engine, container);
- cycle.IdleController = idleController as IdleControllerSwitcher;
-
- powertrain.AddComponent(engine, idleController)
+ .AddComponent(GetGearbox(container), data.Retarder, container)
+ .AddComponent(data.GearboxData.Type.ManualTransmission() ? new Clutch(container, data.EngineData) : null)
+ .AddComponent(engine, idleController)
.AddAuxiliaries(container, data);
-
return container;
}
--
GitLab