Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 3eb3b2cb authored by Michael KRISPER's avatar Michael KRISPER
Browse files

PowertrainBuilder reverted back to 2 serial hybrid strategies

parent 824d977e
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment