From 7cd28f1d1e239efd77a6e41e252f93fcc60e410f Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Fri, 19 Feb 2016 12:33:05 +0100 Subject: [PATCH] move dummy retarder after gearbox --- VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs | 4 ++-- VectoCoreTest/Integration/Truck40tPowerTrain.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index db677e3eeb..1e0bc504df 100644 --- a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -93,12 +93,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap)); break; case RetarderData.RetarderType.None: - tmp = AddComponent(tmp, gearbox); tmp = AddComponent(tmp, new DummyRetarder(container)); + tmp = AddComponent(tmp, gearbox); break; case RetarderData.RetarderType.LossesIncludedInTransmission: - tmp = AddComponent(tmp, gearbox); tmp = AddComponent(tmp, new DummyRetarder(container)); + tmp = AddComponent(tmp, gearbox); break; default: throw new ArgumentOutOfRangeException(); diff --git a/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCoreTest/Integration/Truck40tPowerTrain.cs index f65dc1a5da..28b9a3207f 100644 --- a/VectoCoreTest/Integration/Truck40tPowerTrain.cs +++ b/VectoCoreTest/Integration/Truck40tPowerTrain.cs @@ -85,9 +85,9 @@ namespace TUGraz.VectoCore.Tests.Integration tmp = Port.AddComponent(tmp, new Wheels(container, vehicleData.DynamicTyreRadius, vehicleData.WheelsInertia)); tmp = Port.AddComponent(tmp, new Brakes(container)); tmp = Port.AddComponent(tmp, new AxleGear(container, axleGearData)); + tmp = Port.AddComponent(tmp, new DummyRetarder(container)); tmp = Port.AddComponent(tmp, new Gearbox(container, gearboxData, new AMTShiftStrategy(gearboxData, container))); - tmp = Port.AddComponent(tmp, new DummyRetarder(container)); tmp = Port.AddComponent(tmp, clutch); var aux = new EngineAuxiliary(container); -- GitLab