diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index b28db35e1e8bc4966816d3807315a98652700208..99d28a37eb3a0ca668324d8a7fca28dcf65092fd 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -46,6 +46,7 @@ Imports TUGraz.VectoCommon.Resources Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore Imports TUGraz.VectoCore.InputData.FileIO.XML +Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponents Imports TUGraz.VectoCore.Models.Simulation Imports TUGraz.VectoCore.Models.Simulation.Data Imports TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory @@ -1060,14 +1061,20 @@ lbFound: Dim initSOC = Double.Parse(tbInitSOCinPercent.Text) / 100 + + If(runData.HybridStrategyParameters IsNot Nothing) runData.HybridStrategyParameters.InitialSoc = initSOC - runData.HybridStrategyParameters.TargetSoC = initSOC - 1 + runData.HybridStrategyParameters.TargetSoC = initSOC - 0.01 End If If(runData.BatteryData IsNot Nothing) runData.BatteryData.InitialSoc = initSOC End If + + If(runData.SuperCapData IsNot Nothing) + runData.SuperCapData.InitialSoC = initSOC + End If End If runData.IterativeRunStrategy.Enabled = Not cbCSIteratingModeDeactivated.Checked