From 0dffd73f48795310b110e020530e7d20fa0b4986 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Wed, 30 Mar 2022 12:01:37 +0200 Subject: [PATCH] ParallelHybridTests: Corrected new AddComponent for Gearbox and Retarder --- .../Integration/Hybrid/ParallelHybridTest.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs index f1b1ee675f..4046925b57 100644 --- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs @@ -1473,22 +1473,20 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid cycle .AddComponent(new Driver(container, runData.DriverData, new DefaultDriverStrategy(container))) .AddComponent(new Vehicle(container, runData.VehicleData, runData.AirdragData)) - .AddComponent(new Wheels(container, runData.VehicleData.DynamicTyreRadius, - runData.VehicleData.WheelsInertia)) + .AddComponent(new Wheels(container, runData.VehicleData.DynamicTyreRadius, runData.VehicleData.WheelsInertia)) .AddComponent(ctl) .AddComponent(new Brakes(container)) - .AddComponent(GetElectricMachine(PowertrainPosition.HybridP4, runData.ElectricMachinesData, container, - es, ctl)) + .AddComponent(GetElectricMachine(PowertrainPosition.HybridP4, runData.ElectricMachinesData, container, es, ctl)) .AddComponent(new AxleGear(container, runData.AxleGearData)) - .AddComponent(GetElectricMachine(PowertrainPosition.HybridP3, runData.ElectricMachinesData, container, - es, ctl)) + .AddComponent(runData.Retarder.Type == RetarderType.AxlegearInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) + .AddComponent(GetElectricMachine(PowertrainPosition.HybridP3, runData.ElectricMachinesData, container, es, ctl)) .AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null) - .AddComponent((IGearbox)gearbox, runData.Retarder, container) - .AddComponent(GetElectricMachine(PowertrainPosition.HybridP2, runData.ElectricMachinesData, container, - es, ctl)) + .AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) + .AddComponent((IGearbox)gearbox, container) + .AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) + .AddComponent(GetElectricMachine(PowertrainPosition.HybridP2, runData.ElectricMachinesData, container, es, ctl)) .AddComponent(clutch) - .AddComponent(GetElectricMachine(PowertrainPosition.HybridP1, runData.ElectricMachinesData, container, - es, ctl)) + .AddComponent(GetElectricMachine(PowertrainPosition.HybridP1, runData.ElectricMachinesData, container, es, ctl)) .AddComponent(engine, idleController) .AddAuxiliaries(container, runData); @@ -1597,7 +1595,9 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid //.AddComponent(GetElectricMachine(PowertrainPosition.HybridP3, runData.ElectricMachinesData, container, // es, ctl)) .AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null) - .AddComponent(gearbox, runData.Retarder, container) + .AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) + .AddComponent(gearbox, container) + .AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) //.AddComponent(GetElectricMachine(PowertrainPosition.HybridP2, runData.ElectricMachinesData, container, // es, ctl)) .AddComponent(clutch) -- GitLab