From 694d1cd5c9b1716a2e92dfff9b804ea34582a7bd Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 29 Mar 2022 11:08:52 +0200
Subject: [PATCH] PowertrainBuilder: Retarder in BuildMeasuredSpeed

---
 .../Simulation/Impl/PowertrainBuilder.cs      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 93b207a8f0..97878aaa9a 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -264,13 +264,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 		///  └┬Wheels
 		///   └┬Brakes
 		///    └┬AxleGear
-		///     └┬(Angledrive)
-		///      └┬(Transmission Output Retarder)
-		///       └┬Gearbox, ATGearbox, or APTNGearbox
-		///        └┬(Transmission Input Retarder)
-		///         └┬(Clutch if Manual Transmission)
-		///          â””StopStartCombustionEngine
-		///                                   â””(Aux)
+		///     └┬(AxlegearInputRetarder)
+		///      └┬(Angledrive)
+		///       └┬(TransmissionOutputRetarder)
+		///        └┬Gearbox, ATGearbox, or APTNGearbox
+		///         └┬(TransmissionInputRetarder)
+		///          └┬(Clutch)
+		///           â””StopStartCombustionEngine
+		///                                    â””(Aux)
 		/// </code>
 		/// </summary>
 		private IVehicleContainer BuildMeasuredSpeed(VectoRunData data)
@@ -286,8 +287,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
 				.AddComponent(new Brakes(container))
 				.AddComponent(new AxleGear(container, data.AxleGearData))
+				.AddComponent(data.Retarder.Type == RetarderType.AxlegearInputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
 				.AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
-				.AddComponent(GetGearbox(container), data.Retarder, container)
+				.AddComponent(data.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
+				.AddComponent(GetGearbox(container), container)
+				.AddComponent(data.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
 				.AddComponent(data.GearboxData.Type.ManualTransmission() ? new Clutch(container, data.EngineData) : null)
 				.AddComponent(engine, GetIdleController(data.PTO, engine, container))
 				.AddAuxiliaries(container, data);
-- 
GitLab