From fc77e1454577245f9bcf9313cd9713fce8832b8d Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 11 Apr 2022 16:24:25 +0200
Subject: [PATCH] merge again
---
.../Simulation/Impl/PowertrainBuilder.cs | 19 ++++++++++---------
.../Integration/Hybrid/ParallelHybridTest.cs | 4 ++++
.../Integration/Hybrid/SerialHybridTest.cs | 3 +--
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 2ac260ec15..9f3e562259 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -869,7 +869,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
//-->Engine E4
new DummyGearboxInfo(container);
new ATClutchInfo(container);
-
+
powertrain.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE4,
data.ElectricMachinesData, container, es, ctl));
break;
@@ -878,11 +878,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
//-->AxleGear-->(AxlegearInputRetarder)-->Engine E3
new DummyGearboxInfo(container);
new ATClutchInfo(container);
-
+
powertrain
.AddComponent(new AxleGear(container, data.AxleGearData))
.AddComponent(GetRetarder(RetarderType.AxlegearInputRetarder, data.Retarder, container))
- .AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE3,
+ .AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE3,
data.ElectricMachinesData, container, es, ctl));
break;
@@ -894,7 +894,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
} else {
gearbox = new Gearbox(container, ctl.ShiftStrategy);
}
-
+
ctl.Gearbox = gearbox;
new DummyEngineInfo(container);
@@ -904,7 +904,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionOutputRetarder, data.Retarder, container))
.AddComponent(gearbox)
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
- .AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2,
+ .AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2,
data.ElectricMachinesData, container, es, ctl));
break;
@@ -987,7 +987,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
case CycleType.EngineOnly: break;
default: throw new VectoException("Wrong CycleType for SimplePowertrain");
}
-
+
vehicle.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
.AddComponent(ctl)
.AddComponent(new Brakes(container))
@@ -1065,7 +1065,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(data.AxleGearData is null ? null : new AxleGear(container, data.AxleGearData))
.AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
.AddComponent(data.GearboxData is null ? null : GetSimpleGearbox(container, data))
- .AddComponent(GetElectricMachine(data.ElectricMachinesData.First(x => x.Item1 != PowertrainPosition.GEN).Item1,
+ .AddComponent(GetElectricMachine(data.ElectricMachinesData.First(x => x.Item1 != PowertrainPosition.GEN).Item1,
data.ElectricMachinesData, container, es, new DummyElectricMotorControl()));
}
@@ -1279,8 +1279,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return new APTNShiftStrategy(container);
case VectoSimulationJobType.ConventionalVehicle when container.IsTestPowertrain:
return null;
- default:
- throw new ArgumentException("APT-N Gearbox is only applicable on hybrids and battery electric vehicles.");
+ default:
+ throw new ArgumentException("APT-N Gearbox is only applicable on hybrids and battery electric vehicles.");
+ }
default:
throw new ArgumentOutOfRangeException("GearboxType", runData.GearboxData.Type, "VECTO can not automatically derive shift strategy for GearboxType.");
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
index c97c31755c..7384a69ec0 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
@@ -1782,7 +1782,11 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
.AddComponent(new AxleGear(container, runData.AxleGearData))
.AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null)
.AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+<<<<<<< HEAD
.AddComponent(new Gearbox(container, new AMTShiftStrategyOptimized(container)))
+=======
+ .AddComponent(gearbox)
+>>>>>>> cf118898c (Corrected bugs after merging)
.AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
.AddComponent(new SwitchableClutch(container, runData.EngineData))
.AddComponent(engine, engine.IdleController)
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index eecebf5b50..e17e989c80 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -639,8 +639,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
.AddComponent((IGearbox)gearbox)
.AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2, runData.ElectricMachinesData,
- container,
- es, ctl));
+ container, es, ctl));
ctl.Gearbox = gearbox;
break;
--
GitLab