From 3eb3b2cb45c038cab73cef85cfee78e33312b27b Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 19 Jul 2022 14:04:09 +0200
Subject: [PATCH] PowertrainBuilder reverted back to 2 serial hybrid strategies
---
.../VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs | 6 +++---
.../VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index ace82db767..966448ffbe 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -542,8 +542,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
var strategy = data.GearboxData != null && data.GearboxData.Type.AutomaticTransmission()
- ? (IHybridControlStrategy)new SerialHybridStrategy<APTNGearbox>(data, container)
- : new SerialHybridStrategy<Gearbox>(data, container);
+ ? (IHybridControlStrategy)new SerialHybridStrategyAT(data, container)
+ : new SerialHybridStrategy(data, container);
var aux = new ElectricAuxiliary(container);
aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
@@ -957,7 +957,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var container = new VehicleContainer(data.ExecutionMode, modData, _sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
- var strategy = new SerialHybridStrategy<Gearbox>(data, container);
+ var strategy = new SerialHybridStrategy(data, container);
var ctl = new SerialHybridController(container, strategy, es);
var engine = new StopStartCombustionEngine(container, data.EngineData);
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index 24cc137eb5..8a6f72a615 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -684,7 +684,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
var container = new VehicleContainer(ExecutionMode.Engineering, modData,
x => { sumData?.Write(x, 1, 1, runData); }) { RunData = runData };
- var strategy = new SerialHybridStrategy<Gearbox>(runData, container);
+ var strategy = new SerialHybridStrategy(runData, container);
var es = new ElectricSystem(container);
var battery = new BatterySystem(container, batteryData);
battery.Initialize(initialBatCharge);
--
GitLab