remove development features from GUI (SoC override, hybrid strategy override,...

remove development features from GUI (SoC override, hybrid strategy override, iterative runs override)

VECTO/Configuration.vb

@@ -42,9 +42,6 @@ Public Class Configuration
 	Private Const FormatVersion As Short = 2
 
 	'Test Settings 2nd amendment
-	Public InitialSOCOverrideValue As Double
-	Public InitialSOCOverride As Boolean
-	Public ChargeSustainingIterationModeDeActivated As Boolean
     Private _body as String = "Body"
     Private _mod1Hz as String = "Mod1Hz"
     Private _modOut as String = "ModOut"
@@ -88,9 +85,6 @@ Public Class Configuration
         OutputFolder = ""
 		Multithreaded = True
 		SaveVectoRunData = False
-		ChargeSustainingIterationModeDeActivated = False
-		InitialSOCOverride = False
-		InitialSOCOverrideValue = 50
 	End Sub
 
 	Public Sub Load()
@@ -125,11 +119,6 @@ Public Class Configuration
                 OutputFolder = If(body(_outputfolder) Is Nothing, "", body(_outputfolder).Value(of string)())
 				SaveVectoRunData = If(body(_saverundata) Is Nothing, False, body.GetEx(Of Boolean)(_saverundata))
 
-				InitialSOCOverride = if(body(_overrideinitialsoc) is nothing, false, body.GetEx(Of Boolean)(_overrideinitialsoc))
-				InitialSOCOverrideValue = if (body(_overrideinitialsoc) Is Nothing, 50, body.GetEx(Of Double)(_overrideinitialsocvalue))
-				ChargeSustainingIterationModeDeActivated = if (body(_csItActive) Is Nothing, true, body.GetEx(Of Boolean)(_csItActive))
-
-
 			End Using
 		Catch ex As Exception
 			GUIMsg(MessageType.Err, "Error while loading settings!")
@@ -158,12 +147,6 @@ Public Class Configuration
         body.Add(_outputfolder, OutputFolder)
 		body.Add(_saverundata, SaveVectoRunData)
 
-		body.Add(_overrideinitialsoc, InitialSOCOverride)
-		body.Add(_overrideinitialsocvalue, InitialSOCOverrideValue)
-		body.Add(_csItActive, ChargeSustainingIterationModeDeActivated)
-
-
-
 		JSONFileWriter.WriteFile(New Dictionary(Of String, Object) From {{"Header", header}, {_body, body}}, FilePath)
 	End Sub
 End Class

VECTO/GUI/MainForm.resx

@@ -223,9 +223,6 @@
   <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>732, 12</value>
   </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>850, 12</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>

VECTO/GUI/MainForm.vb

@@ -1079,38 +1079,6 @@ lbFound:
                 Dim runsFactory As ISimulatorFactory = SimulatorFactory.CreateSimulatorFactory(mode, input, fileWriter)
                 'Remove
 
-               
-                runsFactory.ModifyRunData = Sub(data) 
-                    Dim runData = data
-                    If(cbInitialSOC.Checked And (runData.OVCMode = OvcHevMode.ChargeDepleting))
-                        
-                        Dim initSOC = Double.Parse(tbInitSOCinPercent.Text) / 100
-
-                        
-
-                        If(runData.HybridStrategyParameters IsNot Nothing)
-                            runData.HybridStrategyParameters.InitialSoc = initSOC
-                            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
-                End Sub
-
-               
-
-
-
-
-
                 runsFactory.WriteModalResults = Cfg.ModOut
                 runsFactory.ModalResults1Hz = Cfg.Mod1Hz
                 runsFactory.Validate = cbValidateRunData.Checked
@@ -1123,16 +1091,6 @@ lbFound:
                     fileWriters.Add(run, fileWriter)
                 Next
 
-                ' TODO MQ-20200525: Remove the following loop in production (or after evaluation of LAC!!
-                If not string.IsNullOrWhiteSpace(tbMinSpeedLAC.Text) then
-                    'for Each run as JobContainer.RunEntry In jobContainer.Runs
-                    '    dim tmpDriver as DriverData = CType(run.Run, VectoRun).GetContainer().RunData.DriverData
-                    '    tmpDriver.LookAheadCoasting.Enabled = True
-                    '    tmpDriver.LookAheadCoasting.MinSpeed = tbMinSpeedLAC.Text.ToDouble().KMPHtoMeterPerSecond()
-                    'Next
-                end if
-
-                    
                 sender.ReportProgress(0,
                                       New VectoProgress _
                                          With {.Target = "ListBox",
@@ -1572,10 +1530,6 @@ lbFound:
         cbSaveVectoRunData.Checked = Cfg.SaveVectoRunData
         tbOutputFolder.Text = Cfg.OutputFolder
 
-        'Test Settings for 2nd amendment
-        cbCSIteratingModeDeactivated.Checked = Cfg.ChargeSustainingIterationModeDeActivated
-        cbInitialSOC.Checked = Cfg.InitialSOCOverride
-        tbInitSOCinPercent.Text = Cfg.InitialSOCOverrideValue.ToString()
     End Sub
 
     'Update config class from options in GUI, e.g. before running calculations 
@@ -1586,16 +1540,6 @@ lbFound:
         Cfg.SaveVectoRunData = cbSaveVectoRunData.Checked
         Cfg.OutputFolder = tbOutputFolder.Text
 
-        Cfg.ChargeSustainingIterationModeDeActivated = cbCSIteratingModeDeactivated.Checked
-        Cfg.InitialSOCOverride =  cbInitialSOC.Checked 
-
-        Dim initSoc as Double
-        Dim parsingOk = Double.TryParse(tbInitSOCinPercent.Text, initSoc)
-        Cfg.InitialSOCOverrideValue = If(parsingOk, initSoc, 0d)
-
-        
-        'Test Settings for 2nd amendment
-        '
     End Sub
 
 #End Region
@@ -2305,7 +2249,7 @@ lbFound:
         OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_S)
     End Sub
 
-    Private Sub tbInitSOCinPercent_TextChanged(sender As Object, e As EventArgs) Handles tbInitSOCinPercent.TextChanged
+    Private Sub tbInitSOCinPercent_TextChanged(sender As Object, e As EventArgs) 
         
     End Sub
 End Class
\ No newline at end of file