From 627ba3d3de93db305c6718628a9fcae89e68d44a Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Thu, 2 Feb 2023 15:20:47 +0100 Subject: [PATCH] added settings to override initial soc for Charge depleting runs, and disable charge sustaining iterating mode --- VECTO/Configuration.vb | 95 ++-- VECTO/GUI/MainForm.Designer.vb | 464 +++++++++++------- VECTO/GUI/MainForm.resx | 63 +-- VECTO/GUI/MainForm.vb | 52 +- VECTO/My Project/Resources.Designer.vb | 146 +++--- VECTO/VECTO.vbproj | 3 +- ...eclarationHeavyLorryVehicleDataProvider.cs | 3 +- .../AbstractIterativeRunStrategy.cs | 1 + .../IIterativeRunStrategy.cs | 6 + .../OVCHevIterativeRunStrategy.cs | 3 +- .../Models/Simulation/ISimulatorFactory.cs | 6 + .../Impl/SimulatorFactory/SimulatorFactory.cs | 21 +- 12 files changed, 512 insertions(+), 351 deletions(-) diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb index 63d54dcd94..a9c1697a5b 100644 --- a/VECTO/Configuration.vb +++ b/VECTO/Configuration.vb @@ -36,11 +36,34 @@ Public Class Configuration public OutputFolder As String + Public Const DefaultFuelType As FuelType = FuelType.DieselCI Private Const FormatVersion As Short = 2 - Public Sub New() + 'Test Settings 2nd amendment + Public InitialSOCOverrideValue As Double + Public InitialSOCOverride As Boolean + Public ChargeSustainingIterationModeActivated As Boolean + Private _body as String = "Body" + Private _mod1Hz as String = "Mod1Hz" + Private _modOut as String = "ModOut" + Private _logSize as String = "LogSize" + Private _airdensity as String = "AirDensity" + Private _fueldensity as String = "FuelDensity" + Private _co2Perfc as String = "CO2perFC" + Private _openCmd as String = "OpenCmd" + Private _opencmdname as String = "OpenCmdName" + Private _firstrun as String = "FirstRun" + Private _declmode as String = "DeclMode" + Private _validaterundata as String = "ValidateRunData" + Private _outputfolder as String = "OutputFolder" + Private _saverundata as String = "SaveRunData" + Private _overrideinitialsoc as String = "OverrideInitialSOC" + Private _overrideinitialsocvalue as String = "OverrideInitialSOCValue" + Private _csItActive as String = "CS_it_Active" + + Public Sub New() SetDefault() End Sub @@ -81,23 +104,29 @@ Public Class Configuration Using reader As TextReader = File.OpenText(FilePath) Dim content As JToken = JToken.ReadFrom(New JsonTextReader(reader)) - Dim body As JToken = content.GetEx("Body") + Dim body As JToken = content.GetEx(_body) Try - Mod1Hz = body.GetEx(Of Boolean)("Mod1Hz") + Mod1Hz = body.GetEx(Of Boolean)(_mod1Hz) Catch End Try - ModOut = body.GetEx(Of Boolean)("ModOut") - LogSize = body.GetEx(Of Double)("LogSize") - AirDensity = body.GetEx(Of Double)("AirDensity") - FuelDens = body.GetEx(Of Double)("FuelDensity") - Co2PerFc = body.GetEx(Of Double)("CO2perFC") - OpenCmd = body.GetEx(Of String)("OpenCmd") - OpenCmdName = body.GetEx(Of String)("OpenCmdName") - FirstRun = body.GetEx(Of Boolean)("FirstRun") - DeclMode = body.GetEx(Of Boolean)("DeclMode") - ValidateRunData = IsNothing(body("ValidateRunData")) OrElse body.GetEx(Of Boolean)("ValidateRunData") - OutputFolder = If(body("OutputFolder") Is Nothing, "", body("OutputFolder").Value(of string)()) - SaveVectoRunData = body.GetEx(Of Boolean)("SaveRunData") + ModOut = body.GetEx(Of Boolean)(_modOut) + LogSize = body.GetEx(Of Double)(_logSize) + AirDensity = body.GetEx(Of Double)(_airdensity) + FuelDens = body.GetEx(Of Double)(_fueldensity) + Co2PerFc = body.GetEx(Of Double)(_co2Perfc) + OpenCmd = body.GetEx(Of String)(_openCmd) + OpenCmdName = body.GetEx(Of String)(_opencmdname) + FirstRun = body.GetEx(Of Boolean)(_firstrun) + DeclMode = body.GetEx(Of Boolean)(_declmode) + ValidateRunData = IsNothing(body(_validaterundata)) OrElse body.GetEx(Of Boolean)(_validaterundata) + OutputFolder = If(body(_outputfolder) Is Nothing, "", body(_outputfolder).Value(of string)()) + SaveVectoRunData = body.GetEx(Of Boolean)(_saverundata) + + InitialSOCOverride = body.GetEx(Of Boolean)(_overrideinitialsoc) + InitialSOCOverrideValue = body.GetEx(Of Double)(_overrideinitialsocvalue) + ChargeSustainingIterationModeActivated = body.GetEx(Of Boolean)(_csItActive) + + End Using Catch ex As Exception GUIMsg(MessageType.Err, "Error while loading settings!") @@ -112,21 +141,27 @@ Public Class Configuration header.Add("FileVersion", FormatVersion) Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object) - body.Add("ModOut", ModOut) - body.Add("Mod1Hz", Mod1Hz) - body.Add("LogSize", LogSize) - body.Add("AirDensity", AirDensity) - body.Add("FuelDensity", FuelDens) - body.Add("CO2perFC", Co2PerFc) - body.Add("OpenCmd", OpenCmd) - body.Add("OpenCmdName", OpenCmdName) - body.Add("FirstRun", FirstRun) - body.Add("DeclMode", DeclMode) - body.Add("ValidateRunData", ValidateRunData) - body.Add("OutputFolder", OutputFolder) - body.Add("SaveRunData", SaveVectoRunData) - - JSONFileWriter.WriteFile(New Dictionary(Of String, Object) From {{"Header", header}, {"Body", body}}, FilePath) + body.Add(_modOut, ModOut) + body.Add(_mod1Hz, Mod1Hz) + body.Add(_logSize, LogSize) + body.Add(_airdensity, AirDensity) + body.Add(_fueldensity, FuelDens) + body.Add(_co2Perfc, Co2PerFc) + body.Add(_openCMD, OpenCmd) + body.Add(_opencmdname, OpenCmdName) + body.Add(_firstrun, FirstRun) + body.Add(_declMode, DeclMode) + body.Add(_validaterundata, ValidateRunData) + body.Add(_outputfolder, OutputFolder) + body.Add(_saverundata, SaveVectoRunData) + + body.Add(_overrideinitialsoc, InitialSOCOverride) + body.Add(_overrideinitialsocvalue, InitialSOCOverrideValue) + body.Add(_csItActive, ChargeSustainingIterationModeActivated) + + + + JSONFileWriter.WriteFile(New Dictionary(Of String, Object) From {{"Header", header}, {_body, body}}, FilePath) End Sub End Class diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb index 6798323e81..8eed34093a 100644 --- a/VECTO/GUI/MainForm.Designer.vb +++ b/VECTO/GUI/MainForm.Designer.vb @@ -53,12 +53,17 @@ Partial Class MainForm Me.BtGENup = New System.Windows.Forms.Button() Me.ChBoxAllGEN = New System.Windows.Forms.CheckBox() Me.LvGEN = New System.Windows.Forms.ListView() - Me.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) - Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColGENpath = New System.Windows.Forms.ColumnHeader() + Me.ColGENstatus = New System.Windows.Forms.ColumnHeader() Me.ButtonGENremove = New System.Windows.Forms.Button() Me.ButtonGENadd = New System.Windows.Forms.Button() Me.TabPgOptions = New System.Windows.Forms.TabPage() Me.PanelOptAllg = New System.Windows.Forms.Panel() + Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.tbInitSOCinPercent = New System.Windows.Forms.TextBox() + Me.cbInitialSOC = New System.Windows.Forms.CheckBox() + Me.cbCSIteratingMode = New System.Windows.Forms.CheckBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label5 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() @@ -86,9 +91,9 @@ Partial Class MainForm Me.ClearListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.LvMsg = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) - Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader() + Me.ColumnHeader2 = New System.Windows.Forms.ColumnHeader() + Me.ColumnHeader3 = New System.Windows.Forms.ColumnHeader() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() @@ -130,6 +135,7 @@ Partial Class MainForm CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit Me.TabPgOptions.SuspendLayout Me.PanelOptAllg.SuspendLayout + Me.GroupBox6.SuspendLayout Me.GroupBox5.SuspendLayout Me.GroupBox4.SuspendLayout Me.GroupBox3.SuspendLayout @@ -148,51 +154,52 @@ Partial Class MainForm ' Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24) Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall}) - Me.StatusBAR.Location = New System.Drawing.Point(0, 648) + Me.StatusBAR.Location = New System.Drawing.Point(0, 751) Me.StatusBAR.Name = "StatusBAR" - Me.StatusBAR.Size = New System.Drawing.Size(1045, 22) + Me.StatusBAR.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0) + Me.StatusBAR.Size = New System.Drawing.Size(1219, 22) Me.StatusBAR.TabIndex = 7 Me.StatusBAR.Text = "StatusBAR" ' 'ToolStripLbStatus ' Me.ToolStripLbStatus.Name = "ToolStripLbStatus" - Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17) - Me.ToolStripLbStatus.Spring = True + Me.ToolStripLbStatus.Size = New System.Drawing.Size(1202, 17) + Me.ToolStripLbStatus.Spring = true Me.ToolStripLbStatus.Text = "Status Text" Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'ToolStripProgBarJob ' Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripProgBarJob.AutoSize = False + Me.ToolStripProgBarJob.AutoSize = false Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob" - Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16) + Me.ToolStripProgBarJob.Size = New System.Drawing.Size(117, 16) Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous Me.ToolStripProgBarJob.ToolTipText = "overall progress" - Me.ToolStripProgBarJob.Visible = False + Me.ToolStripProgBarJob.Visible = false ' 'ToolStripProgBarOverall ' Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripProgBarOverall.AutoSize = False + Me.ToolStripProgBarOverall.AutoSize = false Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall" - Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16) + Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(117, 16) Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous Me.ToolStripProgBarOverall.ToolTipText = "job progress" - Me.ToolStripProgBarOverall.Visible = False + Me.ToolStripProgBarOverall.Visible = false ' 'TabControl1 ' Me.TabControl1.Controls.Add(Me.TabPageGEN) Me.TabControl1.Controls.Add(Me.TabPgOptions) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControl1.Location = New System.Drawing.Point(3, 3) + Me.TabControl1.Location = New System.Drawing.Point(4, 3) Me.TabControl1.Margin = New System.Windows.Forms.Padding(0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.Padding = New System.Drawing.Point(0, 0) Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1042, 326) + Me.TabControl1.Size = New System.Drawing.Size(1215, 376) Me.TabControl1.TabIndex = 10 ' 'TabPageGEN @@ -209,133 +216,142 @@ Partial Class MainForm Me.TabPageGEN.Controls.Add(Me.LvGEN) Me.TabPageGEN.Controls.Add(Me.ButtonGENremove) Me.TabPageGEN.Controls.Add(Me.ButtonGENadd) - Me.TabPageGEN.Location = New System.Drawing.Point(4, 22) + Me.TabPageGEN.Location = New System.Drawing.Point(4, 24) Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0) Me.TabPageGEN.Name = "TabPageGEN" - Me.TabPageGEN.Size = New System.Drawing.Size(1034, 300) + Me.TabPageGEN.Size = New System.Drawing.Size(1207, 348) Me.TabPageGEN.TabIndex = 0 Me.TabPageGEN.Text = "Job Files" - Me.TabPageGEN.UseVisualStyleBackColor = True + Me.TabPageGEN.UseVisualStyleBackColor = true ' 'btnImportXML ' - Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnImportXML.Location = New System.Drawing.Point(460, 260) + Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.btnImportXML.Location = New System.Drawing.Point(537, 298) + Me.btnImportXML.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.btnImportXML.Name = "btnImportXML" - Me.btnImportXML.Size = New System.Drawing.Size(115, 30) + Me.btnImportXML.Size = New System.Drawing.Size(134, 35) Me.btnImportXML.TabIndex = 23 Me.btnImportXML.Text = "Import from XML" - Me.btnImportXML.UseVisualStyleBackColor = True - Me.btnImportXML.Visible = False + Me.btnImportXML.UseVisualStyleBackColor = true + Me.btnImportXML.Visible = false ' 'btnExportXML ' - Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnExportXML.Enabled = False - Me.btnExportXML.Location = New System.Drawing.Point(344, 260) + Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.btnExportXML.Enabled = false + Me.btnExportXML.Location = New System.Drawing.Point(401, 298) + Me.btnExportXML.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.btnExportXML.Name = "btnExportXML" - Me.btnExportXML.Size = New System.Drawing.Size(115, 30) + Me.btnExportXML.Size = New System.Drawing.Size(134, 35) Me.btnExportXML.TabIndex = 22 Me.btnExportXML.Text = "Export as XML" - Me.btnExportXML.UseVisualStyleBackColor = True + Me.btnExportXML.UseVisualStyleBackColor = true Me.btnExportXML.Visible = false ' 'Label6 ' - Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(814, 261) + Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.Label6.AutoSize = true + Me.Label6.Location = New System.Drawing.Point(949, 299) + Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(217, 13) + Me.Label6.Size = New System.Drawing.Size(249, 15) Me.Label6.TabIndex = 21 Me.Label6.Text = "(Double-Click to Edit, Right-Click for Options)" ' 'btStartV3 ' - Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point) Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btStartV3.Location = New System.Drawing.Point(3, 56) + Me.btStartV3.Location = New System.Drawing.Point(4, 65) + Me.btStartV3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.btStartV3.Name = "btStartV3" - Me.btStartV3.Size = New System.Drawing.Size(108, 50) + Me.btStartV3.Size = New System.Drawing.Size(126, 58) Me.btStartV3.TabIndex = 20 Me.btStartV3.Text = "START" Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation") - Me.btStartV3.UseVisualStyleBackColor = True + Me.btStartV3.UseVisualStyleBackColor = true ' 'LbDecl ' - Me.LbDecl.AutoSize = True - Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LbDecl.Location = New System.Drawing.Point(5, 109) + Me.LbDecl.AutoSize = true + Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point) + Me.LbDecl.Location = New System.Drawing.Point(6, 126) + Me.LbDecl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.LbDecl.Name = "LbDecl" Me.LbDecl.Size = New System.Drawing.Size(107, 13) Me.LbDecl.TabIndex = 19 Me.LbDecl.Text = "Declaration Mode" - Me.LbDecl.Visible = False + Me.LbDecl.Visible = false ' 'PictureBox1 ' - Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) - Me.PictureBox1.Location = New System.Drawing.Point(3, 3) + Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image) + Me.PictureBox1.Location = New System.Drawing.Point(4, 3) + Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(108, 47) + Me.PictureBox1.Size = New System.Drawing.Size(126, 54) Me.PictureBox1.TabIndex = 18 - Me.PictureBox1.TabStop = False + Me.PictureBox1.TabStop = false ' 'BtGENdown ' - Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon - Me.BtGENdown.Location = New System.Drawing.Point(307, 260) + Me.BtGENdown.Location = New System.Drawing.Point(358, 298) + Me.BtGENdown.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.BtGENdown.Name = "BtGENdown" - Me.BtGENdown.Size = New System.Drawing.Size(30, 30) + Me.BtGENdown.Size = New System.Drawing.Size(35, 35) Me.BtGENdown.TabIndex = 6 Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row") - Me.BtGENdown.UseVisualStyleBackColor = True + Me.BtGENdown.UseVisualStyleBackColor = true ' 'BtGENup ' - Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon - Me.BtGENup.Location = New System.Drawing.Point(276, 260) + Me.BtGENup.Location = New System.Drawing.Point(322, 298) + Me.BtGENup.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.BtGENup.Name = "BtGENup" - Me.BtGENup.Size = New System.Drawing.Size(30, 30) + Me.BtGENup.Size = New System.Drawing.Size(35, 35) Me.BtGENup.TabIndex = 4 Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row") - Me.BtGENup.UseVisualStyleBackColor = True + Me.BtGENup.UseVisualStyleBackColor = true ' 'ChBoxAllGEN ' - Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ChBoxAllGEN.AutoSize = True - Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 267) + Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.ChBoxAllGEN.AutoSize = true + Me.ChBoxAllGEN.Location = New System.Drawing.Point(227, 306) + Me.ChBoxAllGEN.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ChBoxAllGEN.Name = "ChBoxAllGEN" - Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17) + Me.ChBoxAllGEN.Size = New System.Drawing.Size(74, 19) Me.ChBoxAllGEN.TabIndex = 16 Me.ChBoxAllGEN.Text = "Select All" Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None") - Me.ChBoxAllGEN.UseVisualStyleBackColor = True + Me.ChBoxAllGEN.UseVisualStyleBackColor = true ' 'LvGEN ' - Me.LvGEN.AllowDrop = True - Me.LvGEN.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.LvGEN.CheckBoxes = True + Me.LvGEN.AllowDrop = true + Me.LvGEN.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.LvGEN.CheckBoxes = true Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus}) - Me.LvGEN.FullRowSelect = True - Me.LvGEN.GridLines = True + Me.LvGEN.FullRowSelect = true + Me.LvGEN.GridLines = true Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable - Me.LvGEN.HideSelection = False - Me.LvGEN.LabelEdit = True - Me.LvGEN.Location = New System.Drawing.Point(114, 3) + Me.LvGEN.LabelEdit = true + Me.LvGEN.Location = New System.Drawing.Point(133, 3) + Me.LvGEN.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.LvGEN.Name = "LvGEN" - Me.LvGEN.Size = New System.Drawing.Size(917, 256) + Me.LvGEN.Size = New System.Drawing.Size(1068, 292) Me.LvGEN.TabIndex = 14 - Me.LvGEN.UseCompatibleStateImageBehavior = False + Me.LvGEN.UseCompatibleStateImageBehavior = false Me.LvGEN.View = System.Windows.Forms.View.Details ' 'ColGENpath @@ -350,51 +366,107 @@ Partial Class MainForm ' 'ButtonGENremove ' - Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point) Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon - Me.ButtonGENremove.Location = New System.Drawing.Point(147, 260) + Me.ButtonGENremove.Location = New System.Drawing.Point(172, 298) + Me.ButtonGENremove.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ButtonGENremove.Name = "ButtonGENremove" - Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30) + Me.ButtonGENremove.Size = New System.Drawing.Size(38, 35) Me.ButtonGENremove.TabIndex = 2 Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries") - Me.ButtonGENremove.UseVisualStyleBackColor = True + Me.ButtonGENremove.UseVisualStyleBackColor = true ' 'ButtonGENadd ' - Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point) Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon - Me.ButtonGENadd.Location = New System.Drawing.Point(113, 260) + Me.ButtonGENadd.Location = New System.Drawing.Point(132, 298) + Me.ButtonGENadd.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ButtonGENadd.Name = "ButtonGENadd" - Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30) + Me.ButtonGENadd.Size = New System.Drawing.Size(38, 35) Me.ButtonGENadd.TabIndex = 1 Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File") - Me.ButtonGENadd.UseVisualStyleBackColor = True + Me.ButtonGENadd.UseVisualStyleBackColor = true ' 'TabPgOptions ' Me.TabPgOptions.Controls.Add(Me.PanelOptAllg) - Me.TabPgOptions.Location = New System.Drawing.Point(4, 22) + Me.TabPgOptions.Location = New System.Drawing.Point(4, 24) + Me.TabPgOptions.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.TabPgOptions.Name = "TabPgOptions" - Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3) - Me.TabPgOptions.Size = New System.Drawing.Size(1034, 300) + Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.TabPgOptions.Size = New System.Drawing.Size(1207, 348) Me.TabPgOptions.TabIndex = 2 Me.TabPgOptions.Text = "Options" - Me.TabPgOptions.UseVisualStyleBackColor = True + Me.TabPgOptions.UseVisualStyleBackColor = true ' 'PanelOptAllg ' + Me.PanelOptAllg.Controls.Add(Me.GroupBox6) Me.PanelOptAllg.Controls.Add(Me.GroupBox5) Me.PanelOptAllg.Controls.Add(Me.GroupBox4) Me.PanelOptAllg.Controls.Add(Me.GroupBox3) Me.PanelOptAllg.Controls.Add(Me.GroupBox2) Me.PanelOptAllg.Controls.Add(Me.GroupBox1) - Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6) + Me.PanelOptAllg.Location = New System.Drawing.Point(7, 7) + Me.PanelOptAllg.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.PanelOptAllg.Name = "PanelOptAllg" - Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290) + Me.PanelOptAllg.Size = New System.Drawing.Size(1192, 335) Me.PanelOptAllg.TabIndex = 0 ' + 'GroupBox6 + ' + Me.GroupBox6.Controls.Add(Me.Label1) + Me.GroupBox6.Controls.Add(Me.tbInitSOCinPercent) + Me.GroupBox6.Controls.Add(Me.cbInitialSOC) + Me.GroupBox6.Controls.Add(Me.cbCSIteratingMode) + Me.GroupBox6.Location = New System.Drawing.Point(217, 187) + Me.GroupBox6.Name = "GroupBox6" + Me.GroupBox6.Size = New System.Drawing.Size(300, 144) + Me.GroupBox6.TabIndex = 21 + Me.GroupBox6.TabStop = false + Me.GroupBox6.Text = "2nd Amendment Test Settings" + ' + 'Label1 + ' + Me.Label1.AutoSize = true + Me.Label1.Location = New System.Drawing.Point(232, 63) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(25, 15) + Me.Label1.TabIndex = 3 + Me.Label1.Text = "[%]" + ' + 'tbInitSOCinPercent + ' + Me.tbInitSOCinPercent.Location = New System.Drawing.Point(181, 59) + Me.tbInitSOCinPercent.Name = "tbInitSOCinPercent" + Me.tbInitSOCinPercent.Size = New System.Drawing.Size(44, 23) + Me.tbInitSOCinPercent.TabIndex = 2 + ' + 'cbInitialSOC + ' + Me.cbInitialSOC.AutoSize = true + Me.cbInitialSOC.Location = New System.Drawing.Point(9, 63) + Me.cbInitialSOC.Name = "cbInitialSOC" + Me.cbInitialSOC.Size = New System.Drawing.Size(148, 19) + Me.cbInitialSOC.TabIndex = 1 + Me.cbInitialSOC.Text = "CD Initial SOC Override" + Me.cbInitialSOC.UseVisualStyleBackColor = true + ' + 'cbCSIteratingMode + ' + Me.cbCSIteratingMode.AutoSize = true + Me.cbCSIteratingMode.Checked = true + Me.cbCSIteratingMode.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbCSIteratingMode.Location = New System.Drawing.Point(10, 24) + Me.cbCSIteratingMode.Name = "cbCSIteratingMode" + Me.cbCSIteratingMode.Size = New System.Drawing.Size(253, 19) + Me.cbCSIteratingMode.TabIndex = 0 + Me.cbCSIteratingMode.Text = "OVC HEV Charge Sustaining Iterative Mode" + Me.cbCSIteratingMode.UseVisualStyleBackColor = true + ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.Label5) @@ -402,54 +474,61 @@ Partial Class MainForm Me.GroupBox5.Controls.Add(Me.tbMinSpeedLAC) Me.GroupBox5.Controls.Add(Me.Label3) Me.GroupBox5.Controls.Add(Me.Label2) - Me.GroupBox5.Location = New System.Drawing.Point(183, 57) + Me.GroupBox5.Location = New System.Drawing.Point(214, 66) + Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(260, 100) + Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.GroupBox5.Size = New System.Drawing.Size(303, 115) Me.GroupBox5.TabIndex = 20 - Me.GroupBox5.TabStop = False + Me.GroupBox5.TabStop = false Me.GroupBox5.Text = "Look-Ahead Coasting Override" - Me.GroupBox5.Visible = False + Me.GroupBox5.Visible = false ' 'Label5 ' - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(7, 48) + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point) + Me.Label5.Location = New System.Drawing.Point(8, 55) + Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(247, 36) + Me.Label5.Size = New System.Drawing.Size(288, 42) Me.Label5.TabIndex = 4 - Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh" & + Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh"& _ "aviour." ' 'Label4 ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(10, 44) + Me.Label4.AutoSize = true + Me.Label4.Location = New System.Drawing.Point(12, 51) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(0, 13) + Me.Label4.Size = New System.Drawing.Size(0, 15) Me.Label4.TabIndex = 3 ' 'tbMinSpeedLAC ' - Me.tbMinSpeedLAC.Location = New System.Drawing.Point(96, 17) + Me.tbMinSpeedLAC.Location = New System.Drawing.Point(112, 20) + Me.tbMinSpeedLAC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.tbMinSpeedLAC.Name = "tbMinSpeedLAC" - Me.tbMinSpeedLAC.Size = New System.Drawing.Size(56, 20) + Me.tbMinSpeedLAC.Size = New System.Drawing.Size(65, 23) Me.tbMinSpeedLAC.TabIndex = 2 ' 'Label3 ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(158, 20) + Me.Label3.AutoSize = true + Me.Label3.Location = New System.Drawing.Point(184, 23) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(38, 13) + Me.Label3.Size = New System.Drawing.Size(44, 15) Me.Label3.TabIndex = 1 Me.Label3.Text = "[km/h]" ' 'Label2 ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(7, 19) + Me.Label2.AutoSize = true + Me.Label2.Location = New System.Drawing.Point(8, 22) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(61, 13) + Me.Label2.Size = New System.Drawing.Size(66, 15) Me.Label2.TabIndex = 1 Me.Label2.Text = "Min Speed:" ' @@ -457,28 +536,32 @@ Partial Class MainForm ' Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse) Me.GroupBox4.Controls.Add(Me.tbOutputFolder) - Me.GroupBox4.Location = New System.Drawing.Point(183, 4) + Me.GroupBox4.Location = New System.Drawing.Point(214, 5) + Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(260, 46) + Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.GroupBox4.Size = New System.Drawing.Size(303, 53) Me.GroupBox4.TabIndex = 19 - Me.GroupBox4.TabStop = False + Me.GroupBox4.TabStop = false Me.GroupBox4.Text = "Output Directory" ' 'BtTCfileBrowse ' Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon - Me.BtTCfileBrowse.Location = New System.Drawing.Point(227, 14) + Me.BtTCfileBrowse.Location = New System.Drawing.Point(265, 16) + Me.BtTCfileBrowse.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.BtTCfileBrowse.Name = "BtTCfileBrowse" - Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtTCfileBrowse.Size = New System.Drawing.Size(28, 28) Me.BtTCfileBrowse.TabIndex = 27 - Me.BtTCfileBrowse.TabStop = False - Me.BtTCfileBrowse.UseVisualStyleBackColor = True + Me.BtTCfileBrowse.TabStop = false + Me.BtTCfileBrowse.UseVisualStyleBackColor = true ' 'tbOutputFolder ' - Me.tbOutputFolder.Location = New System.Drawing.Point(6, 17) + Me.tbOutputFolder.Location = New System.Drawing.Point(7, 20) + Me.tbOutputFolder.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.tbOutputFolder.Name = "tbOutputFolder" - Me.tbOutputFolder.Size = New System.Drawing.Size(215, 20) + Me.tbOutputFolder.Size = New System.Drawing.Size(250, 23) Me.tbOutputFolder.TabIndex = 0 ' 'GroupBox3 @@ -486,117 +569,130 @@ Partial Class MainForm Me.GroupBox3.Controls.Add(Me.cbSaveVectoRunData) Me.GroupBox3.Controls.Add(Me.cbActVmod) Me.GroupBox3.Controls.Add(Me.cbValidateRunData) - Me.GroupBox3.Location = New System.Drawing.Point(3, 177) + Me.GroupBox3.Location = New System.Drawing.Point(4, 204) + Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(173, 110) + Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.GroupBox3.Size = New System.Drawing.Size(202, 127) Me.GroupBox3.TabIndex = 18 - Me.GroupBox3.TabStop = False + Me.GroupBox3.TabStop = false Me.GroupBox3.Text = "Misc" ' 'cbSaveVectoRunData ' - Me.cbSaveVectoRunData.AutoSize = True - Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86) + Me.cbSaveVectoRunData.AutoSize = true + Me.cbSaveVectoRunData.Location = New System.Drawing.Point(8, 99) + Me.cbSaveVectoRunData.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData" - Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17) + Me.cbSaveVectoRunData.Size = New System.Drawing.Size(173, 19) Me.cbSaveVectoRunData.TabIndex = 19 Me.cbSaveVectoRunData.Text = "Export ModelData (EXPERT!)" - Me.cbSaveVectoRunData.UseVisualStyleBackColor = True + Me.cbSaveVectoRunData.UseVisualStyleBackColor = true ' 'cbActVmod ' - Me.cbActVmod.Location = New System.Drawing.Point(6, 34) + Me.cbActVmod.Location = New System.Drawing.Point(7, 39) + Me.cbActVmod.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.cbActVmod.Name = "cbActVmod" - Me.cbActVmod.Size = New System.Drawing.Size(167, 52) + Me.cbActVmod.Size = New System.Drawing.Size(195, 60) Me.cbActVmod.TabIndex = 18 Me.cbActVmod.Text = "Output values in vmod at beginning and end of simulation interval (EXPERT!)" - Me.cbActVmod.UseVisualStyleBackColor = True + Me.cbActVmod.UseVisualStyleBackColor = true ' 'cbValidateRunData ' - Me.cbValidateRunData.AutoSize = True - Me.cbValidateRunData.Checked = True + Me.cbValidateRunData.AutoSize = true + Me.cbValidateRunData.Checked = true Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19) + Me.cbValidateRunData.Location = New System.Drawing.Point(7, 22) + Me.cbValidateRunData.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.cbValidateRunData.Name = "cbValidateRunData" - Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17) + Me.cbValidateRunData.Size = New System.Drawing.Size(94, 19) Me.cbValidateRunData.TabIndex = 17 Me.cbValidateRunData.Text = "Validate Data" - Me.cbValidateRunData.UseVisualStyleBackColor = True + Me.cbValidateRunData.UseVisualStyleBackColor = true ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.ChBoxModOut) Me.GroupBox2.Controls.Add(Me.ChBoxMod1Hz) - Me.GroupBox2.Location = New System.Drawing.Point(3, 82) + Me.GroupBox2.Location = New System.Drawing.Point(4, 95) + Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(173, 89) + Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.GroupBox2.Size = New System.Drawing.Size(202, 103) Me.GroupBox2.TabIndex = 16 - Me.GroupBox2.TabStop = False + Me.GroupBox2.TabStop = false Me.GroupBox2.Text = "Output" ' 'ChBoxModOut ' - Me.ChBoxModOut.AutoSize = True - Me.ChBoxModOut.Checked = True + Me.ChBoxModOut.AutoSize = true + Me.ChBoxModOut.Checked = true Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19) + Me.ChBoxModOut.Location = New System.Drawing.Point(7, 22) + Me.ChBoxModOut.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ChBoxModOut.Name = "ChBoxModOut" - Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17) + Me.ChBoxModOut.Size = New System.Drawing.Size(128, 19) Me.ChBoxModOut.TabIndex = 0 Me.ChBoxModOut.Text = "Write modal results" - Me.ChBoxModOut.UseVisualStyleBackColor = True + Me.ChBoxModOut.UseVisualStyleBackColor = true ' 'ChBoxMod1Hz ' - Me.ChBoxMod1Hz.AutoSize = True - Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42) + Me.ChBoxMod1Hz.AutoSize = true + Me.ChBoxMod1Hz.Location = New System.Drawing.Point(7, 48) + Me.ChBoxMod1Hz.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz" - Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17) + Me.ChBoxMod1Hz.Size = New System.Drawing.Size(133, 19) Me.ChBoxMod1Hz.TabIndex = 16 Me.ChBoxMod1Hz.Text = "Modal results in 1Hz" - Me.ChBoxMod1Hz.UseVisualStyleBackColor = True + Me.ChBoxMod1Hz.UseVisualStyleBackColor = true ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.RbDev) Me.GroupBox1.Controls.Add(Me.RbDecl) - Me.GroupBox1.Location = New System.Drawing.Point(3, 3) + Me.GroupBox1.Location = New System.Drawing.Point(4, 3) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(173, 72) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.GroupBox1.Size = New System.Drawing.Size(202, 83) Me.GroupBox1.TabIndex = 15 - Me.GroupBox1.TabStop = False + Me.GroupBox1.TabStop = false Me.GroupBox1.Text = "Mode" ' 'RbDev ' - Me.RbDev.AutoSize = True - Me.RbDev.Checked = True - Me.RbDev.Location = New System.Drawing.Point(6, 42) + Me.RbDev.AutoSize = true + Me.RbDev.Checked = true + Me.RbDev.Location = New System.Drawing.Point(7, 48) + Me.RbDev.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.RbDev.Name = "RbDev" - Me.RbDev.Size = New System.Drawing.Size(111, 17) + Me.RbDev.Size = New System.Drawing.Size(122, 19) Me.RbDev.TabIndex = 1 - Me.RbDev.TabStop = True + Me.RbDev.TabStop = true Me.RbDev.Text = "Engineering Mode" - Me.RbDev.UseVisualStyleBackColor = True + Me.RbDev.UseVisualStyleBackColor = true ' 'RbDecl ' - Me.RbDecl.AutoSize = True - Me.RbDecl.Location = New System.Drawing.Point(6, 19) + Me.RbDecl.AutoSize = true + Me.RbDecl.Location = New System.Drawing.Point(7, 22) + Me.RbDecl.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.RbDecl.Name = "RbDecl" - Me.RbDecl.Size = New System.Drawing.Size(109, 17) + Me.RbDecl.Size = New System.Drawing.Size(119, 19) Me.RbDecl.TabIndex = 0 - Me.RbDecl.TabStop = True + Me.RbDecl.TabStop = true Me.RbDecl.Text = "Declaration Mode" - Me.RbDecl.UseVisualStyleBackColor = True + Me.RbDecl.UseVisualStyleBackColor = true ' 'ConMenFilelist ' Me.ConMenFilelist.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem}) Me.ConMenFilelist.Name = "ConMenFilelist" - Me.ConMenFilelist.ShowImageMargin = False + Me.ConMenFilelist.ShowImageMargin = false Me.ConMenFilelist.Size = New System.Drawing.Size(151, 114) ' 'ShowInFolderMenuItem @@ -631,22 +727,21 @@ Partial Class MainForm ' 'LvMsg ' - Me.LvMsg.AllowColumnReorder = True + Me.LvMsg.AllowColumnReorder = true Me.LvMsg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.LvMsg.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3}) Me.LvMsg.Dock = System.Windows.Forms.DockStyle.Fill - Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LvMsg.FullRowSelect = True - Me.LvMsg.GridLines = True + Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point) + Me.LvMsg.FullRowSelect = true + Me.LvMsg.GridLines = true Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable - Me.LvMsg.HideSelection = False - Me.LvMsg.LabelWrap = False + Me.LvMsg.LabelWrap = false Me.LvMsg.Location = New System.Drawing.Point(0, 0) Me.LvMsg.Margin = New System.Windows.Forms.Padding(0) Me.LvMsg.Name = "LvMsg" - Me.LvMsg.Size = New System.Drawing.Size(1045, 283) + Me.LvMsg.Size = New System.Drawing.Size(1219, 327) Me.LvMsg.TabIndex = 0 - Me.LvMsg.UseCompatibleStateImageBehavior = False + Me.LvMsg.UseCompatibleStateImageBehavior = false Me.LvMsg.View = System.Windows.Forms.View.Details ' 'ColumnHeader1 @@ -666,10 +761,10 @@ Partial Class MainForm ' 'SplitContainer1 ' - Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.SplitContainer1.Location = New System.Drawing.Point(0, 27) + Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 31) Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0) Me.SplitContainer1.Name = "SplitContainer1" Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal @@ -677,13 +772,14 @@ Partial Class MainForm 'SplitContainer1.Panel1 ' Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1) - Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2) + Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(4, 3, 0, 2) ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg) - Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618) - Me.SplitContainer1.SplitterDistance = 331 + Me.SplitContainer1.Size = New System.Drawing.Size(1219, 713) + Me.SplitContainer1.SplitterDistance = 381 + Me.SplitContainer1.SplitterWidth = 5 Me.SplitContainer1.TabIndex = 12 ' 'ToolStrip1 @@ -694,7 +790,7 @@ Partial Class MainForm Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31) + Me.ToolStrip1.Size = New System.Drawing.Size(1219, 31) Me.ToolStrip1.TabIndex = 11 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -882,7 +978,7 @@ Partial Class MainForm ' Me.CmDEV.ImageScalingSize = New System.Drawing.Size(24, 24) Me.CmDEV.Name = "CmDEV" - Me.CmDEV.ShowImageMargin = False + Me.CmDEV.ShowImageMargin = false Me.CmDEV.Size = New System.Drawing.Size(36, 4) ' 'TmProgSec @@ -894,7 +990,7 @@ Partial Class MainForm Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24) Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.ShowImageMargin = False + Me.CmOpenFile.ShowImageMargin = false Me.CmOpenFile.Size = New System.Drawing.Size(174, 70) ' 'OpenWithToolStripMenuItem @@ -918,19 +1014,18 @@ Partial Class MainForm 'MainForm ' Me.AcceptButton = Me.btStartV3 - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1045, 670) + Me.ClientSize = New System.Drawing.Size(1219, 773) Me.Controls.Add(Me.ToolStrip1) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.StatusBAR) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MinimumSize = New System.Drawing.Size(785, 485) + Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) + Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.MinimumSize = New System.Drawing.Size(913, 554) Me.Name = "MainForm" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "VECTO" - Me.StatusBAR.ResumeLayout(false) Me.StatusBAR.PerformLayout Me.TabControl1.ResumeLayout(false) @@ -939,6 +1034,8 @@ Partial Class MainForm CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit Me.TabPgOptions.ResumeLayout(false) Me.PanelOptAllg.ResumeLayout(false) + Me.GroupBox6.ResumeLayout(false) + Me.GroupBox6.PerformLayout Me.GroupBox5.ResumeLayout(false) Me.GroupBox5.PerformLayout Me.GroupBox4.ResumeLayout(false) @@ -1059,4 +1156,9 @@ End Sub Friend WithEvents JobEditorIEPC_E_VehicleToolStripMenuItem As ToolStripMenuItem Friend WithEvents JobEditorIEPC_S_VehicleToolStripMenuItem As ToolStripMenuItem Friend WithEvents JobEditorIHPCVehicleToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GroupBox6 As GroupBox + Friend WithEvents cbCSIteratingMode As CheckBox + Friend WithEvents Label1 As Label + Friend WithEvents tbInitSOCinPercent As TextBox + Friend WithEvents cbInitialSOC As CheckBox End Class diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx index 8d7d8721a8..3e15f7bfac 100644 --- a/VECTO/GUI/MainForm.resx +++ b/VECTO/GUI/MainForm.resx @@ -1,64 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> <root> - <!-- - Microsoft ResX Schema - - Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes - associated with the data types. - - Example: - - ... ado.net/XML headers & schema ... - <resheader name="resmimetype">text/microsoft-resx</resheader> - <resheader name="version">2.0</resheader> - <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> - <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> - <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> - <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> - <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> - <value>[base64 mime encoded serialized .NET Framework object]</value> - </data> - <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> - <comment>This is a comment</comment> - </data> - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> @@ -223,6 +163,9 @@ <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> diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index 4c96c8426a..ccd4ed192b 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -47,6 +47,7 @@ Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore Imports TUGraz.VectoCore.InputData.FileIO.XML Imports TUGraz.VectoCore.Models.Simulation +Imports TUGraz.VectoCore.Models.Simulation.Data Imports TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory Imports TUGraz.VectoCore.OutputData Imports TUGraz.VectoCore.OutputData.FileIO @@ -1050,12 +1051,42 @@ lbFound: Dim fileWriter As FileOutputWriter = New FileOutputWriter(outFile) Dim runsFactory As ISimulatorFactory = SimulatorFactory.CreateSimulatorFactory(mode, input, fileWriter) + 'Remove + + + runsFactory.ModifyRunData = Sub(data) + Dim runData = data + If(cbInitialSOC.Checked And (runData.OVCMode = VectoRunData.OvcHevMode.ChargeDepleting)) + + Dim initSOC = Double.Parse(tbInitSOCinPercent.Text) / 100 + + If(runData.HybridStrategyParameters IsNot Nothing) + runData.HybridStrategyParameters.InitialSoc = initSOC + runData.HybridStrategyParameters.TargetSoC = initSOC - 1 + End If + + If(runData.BatteryData IsNot Nothing) + runData.BatteryData.InitialSoc = initSOC + End If + End If + + runData.IterativeRunStrategy.Enabled = cbCSIteratingMode.Checked + End Sub + + + + + + + runsFactory.WriteModalResults = Cfg.ModOut runsFactory.ModalResults1Hz = Cfg.Mod1Hz runsFactory.Validate = cbValidateRunData.Checked runsFactory.ActualModalData = cbActVmod.Checked runsFactory.SerializeVectoRunData = cbSaveVectoRunData.Checked + + For Each run as integer In jobContainer.AddRuns(runsFactory) fileWriters.Add(run, fileWriter) Next @@ -1509,6 +1540,10 @@ lbFound: cbSaveVectoRunData.Checked = Cfg.SaveVectoRunData tbOutputFolder.Text = Cfg.OutputFolder + 'Test Settings for 2nd amendment + cbCSIteratingMode.Checked = Cfg.ChargeSustainingIterationModeActivated + cbInitialSOC.Checked = Cfg.InitialSOCOverride + tbInitSOCinPercent.Text = Cfg.InitialSOCOverrideValue.ToString() End Sub 'Update config class from options in GUI, e.g. before running calculations @@ -1518,6 +1553,17 @@ lbFound: Cfg.ValidateRunData = cbValidateRunData.Checked Cfg.SaveVectoRunData = cbSaveVectoRunData.Checked Cfg.OutputFolder = tbOutputFolder.Text + + Cfg.ChargeSustainingIterationModeActivated = cbCSIteratingMode.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 @@ -2233,4 +2279,8 @@ lbFound: Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles JobEditorIEPC_S_VehicleToolStripMenuItem.Click OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_S) End Sub -End Class + + Private Sub tbInitSOCinPercent_TextChanged(sender As Object, e As EventArgs) Handles tbInitSOCinPercent.TextChanged + + End Sub +End Class \ No newline at end of file diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb index 638b661dbe..84df2c20d4 100644 --- a/VECTO/My Project/Resources.Designer.vb +++ b/VECTO/My Project/Resources.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' <auto-generated> -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' </auto-generated> '------------------------------------------------------------------------------ @@ -15,12 +15,12 @@ Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. '''<summary> - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. '''</summary> <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ @@ -33,7 +33,7 @@ Namespace My.Resources Private resourceCulture As Global.System.Globalization.CultureInfo '''<summary> - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. '''</summary> <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager @@ -47,8 +47,8 @@ Namespace My.Resources End Property '''<summary> - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. '''</summary> <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Friend Property Culture() As Global.System.Globalization.CultureInfo @@ -61,7 +61,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _4x2r() As System.Drawing.Bitmap Get @@ -71,7 +71,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _4x2rt() As System.Drawing.Bitmap Get @@ -81,7 +81,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _4x2tt() As System.Drawing.Bitmap Get @@ -91,7 +91,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _6x2r() As System.Drawing.Bitmap Get @@ -101,7 +101,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _6x2rt() As System.Drawing.Bitmap Get @@ -111,7 +111,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property _6x2tt() As System.Drawing.Bitmap Get @@ -121,7 +121,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Actions_arrow_down_icon() As System.Drawing.Bitmap Get @@ -131,7 +131,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Actions_arrow_up_icon() As System.Drawing.Bitmap Get @@ -141,7 +141,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Actions_document_save_as_icon() As System.Drawing.Bitmap Get @@ -151,7 +151,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Actions_document_save_icon() As System.Drawing.Bitmap Get @@ -161,7 +161,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property application_add_icon() As System.Drawing.Bitmap Get @@ -171,7 +171,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap Get @@ -181,7 +181,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap Get @@ -191,7 +191,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus4x2() As System.Drawing.Bitmap Get @@ -201,7 +201,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus4x21() As System.Drawing.Bitmap Get @@ -211,7 +211,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus6x2() As System.Drawing.Bitmap Get @@ -221,7 +221,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus6x21() As System.Drawing.Bitmap Get @@ -231,7 +231,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus8x2() As System.Drawing.Bitmap Get @@ -241,7 +241,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property bus8x21() As System.Drawing.Bitmap Get @@ -251,7 +251,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Delete() As System.Drawing.Bitmap Get @@ -261,7 +261,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property desktop() As System.Drawing.Bitmap Get @@ -271,7 +271,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property driverModelEquation() As System.Drawing.Bitmap Get @@ -281,7 +281,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property export_icon() As System.Drawing.Bitmap Get @@ -291,7 +291,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property F_ENG() As System.Drawing.Bitmap Get @@ -301,7 +301,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property F_GBX() As System.Drawing.Bitmap Get @@ -311,7 +311,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property F_Graph() As System.Drawing.Bitmap Get @@ -321,7 +321,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property F_VECTO() As System.Drawing.Bitmap Get @@ -331,7 +331,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property F_VEH() As System.Drawing.Bitmap Get @@ -341,7 +341,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property favorites() As System.Drawing.Bitmap Get @@ -351,7 +351,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property file_history() As System.Drawing.Bitmap Get @@ -361,7 +361,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Help_icon() As System.Drawing.Bitmap Get @@ -371,7 +371,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). '''</summary> Friend ReadOnly Property Icon2() As System.Drawing.Icon Get @@ -381,7 +381,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Information_icon() As System.Drawing.Bitmap Get @@ -391,7 +391,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property IVT_91x44() As System.Drawing.Bitmap Get @@ -401,7 +401,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property IVT_About() As System.Drawing.Bitmap Get @@ -411,7 +411,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property JRC_About() As System.Drawing.Bitmap Get @@ -421,7 +421,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property minus_circle_icon() As System.Drawing.Bitmap Get @@ -431,7 +431,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Misc_Tools_icon() As System.Drawing.Bitmap Get @@ -441,7 +441,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property new_dir() As System.Drawing.Bitmap Get @@ -451,7 +451,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap Get @@ -461,7 +461,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property P_fan_eqn() As System.Drawing.Bitmap Get @@ -471,7 +471,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap Get @@ -481,7 +481,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Play_icon_gray() As System.Drawing.Bitmap Get @@ -491,7 +491,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property plus_circle_icon() As System.Drawing.Bitmap Get @@ -501,7 +501,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap Get @@ -511,7 +511,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property rigid8x4() As System.Drawing.Bitmap Get @@ -521,7 +521,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property rigid8x41() As System.Drawing.Bitmap Get @@ -531,7 +531,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Status_dialog_password_icon() As System.Drawing.Bitmap Get @@ -541,7 +541,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap Get @@ -551,7 +551,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property TUG_91x34() As System.Drawing.Bitmap Get @@ -561,7 +561,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property TUG_About() As System.Drawing.Bitmap Get @@ -571,7 +571,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property Undef() As System.Drawing.Bitmap Get @@ -581,7 +581,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property up_directory() As System.Drawing.Bitmap Get @@ -591,7 +591,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property van() As System.Drawing.Bitmap Get @@ -601,7 +601,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property van1() As System.Drawing.Bitmap Get @@ -611,7 +611,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_About() As System.Drawing.Bitmap Get @@ -621,7 +621,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_ENG() As System.Drawing.Bitmap Get @@ -631,7 +631,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_GBX() As System.Drawing.Bitmap Get @@ -641,7 +641,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_Mainform() As System.Drawing.Bitmap Get @@ -651,7 +651,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_VECTO() As System.Drawing.Bitmap Get @@ -661,7 +661,7 @@ Namespace My.Resources End Property '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. '''</summary> Friend ReadOnly Property VECTO_VEH() As System.Drawing.Bitmap Get diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index 91bf52b2a4..64a884120c 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -8,7 +8,8 @@ <OptionStrict>On</OptionStrict> <UseWindowsForms>true</UseWindowsForms> <MyType>WindowsForms</MyType> - <TargetFrameworks>net45;net48;net6.0-windows</TargetFrameworks> + <TargetFramework>net6.0-windows</TargetFramework> + <!--<TargetFrameworks>net45;net48;net6.0-windows</TargetFrameworks>--> <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks> <TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks> <TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">net45;net48;net6.0-windows</TargetFrameworks> diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs index c71beae349..833ff342c7 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Xml; using System.Xml.Linq; using TUGraz.VectoCommon.InputData; @@ -92,7 +93,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 public override VectoSimulationJobType VehicleType { - get => VectoSimulationJobType.ParallelHybridVehicle; + get => Components.ElectricMachines.Entries.Any(em => em.ElectricMachine.IsIHPC()) ? VectoSimulationJobType.IHPC : VectoSimulationJobType.ParallelHybridVehicle; } } diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/AbstractIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/AbstractIterativeRunStrategy.cs index a90c9ba0ce..064ed9e5e6 100644 --- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/AbstractIterativeRunStrategy.cs +++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/AbstractIterativeRunStrategy.cs @@ -18,6 +18,7 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies public abstract bool RunAgain(int iteration, IModalDataContainer modData, VectoRunData runData); public abstract void UpdateRunData(int iteration, IModalDataContainer modData, VectoRunData runData); + public bool Enabled { get; set; } #endregion } diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/IIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/IIterativeRunStrategy.cs index 1af2a6a33b..7a73c7aef5 100644 --- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/IIterativeRunStrategy.cs +++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/IIterativeRunStrategy.cs @@ -23,6 +23,12 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies /// <param name="modData">The results of the finished run</param> /// <param name="runData">modifies runData</param> void UpdateRunData(int iteration, IModalDataContainer modData, VectoRunData runData); + + + /// <summary> + /// Enables or disables the iterative run strategy + /// </summary> + bool Enabled { get; set; } } public interface IIterativeRunResult diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs index 88d9c931f1..0207a841b6 100644 --- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs +++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs @@ -11,7 +11,8 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies public override bool RunAgain(int iteration, IModalDataContainer modData, VectoRunData runData) { - return iteration < 2; + + return Enabled && iteration < 2; } public override void UpdateRunData(int iteration, IModalDataContainer modData, VectoRunData runData) diff --git a/VectoCore/VectoCore/Models/Simulation/ISimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/ISimulatorFactory.cs index 216be6c25d..c20f77bcf6 100644 --- a/VectoCore/VectoCore/Models/Simulation/ISimulatorFactory.cs +++ b/VectoCore/VectoCore/Models/Simulation/ISimulatorFactory.cs @@ -29,8 +29,10 @@ * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology */ +using System; using System.Collections.Generic; using TUGraz.VectoCore.InputData; +using TUGraz.VectoCore.Models.Simulation.Data; using TUGraz.VectoCore.OutputData; namespace TUGraz.VectoCore.Models.Simulation @@ -51,6 +53,10 @@ namespace TUGraz.VectoCore.Models.Simulation bool CreateFollowUpSimulatorFactory { get; set; } + /// <summary> + /// Only for testing purposes + /// </summary> + Action<VectoRunData> ModifyRunData { get; set; } /// <summary> diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs index 8952d676a1..32f5b1d755 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs @@ -138,6 +138,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory public bool SerializeVectoRunData { get; set; } + + /// <summary> + /// Only for testing purposes + /// </summary> + public Action<VectoRunData> ModifyRunData { get; set; } + + /// <summary> /// Creates powertrain and initializes it with the component's data. /// </summary> @@ -152,9 +159,17 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory } foreach (var data in RunDataFactory.NextRun()) { var current = i++; - var d = data; data.JobRunId = current; - yield return (data.Exempted || data.MultistageRun) ? GetExemptedRun(data) : GetNonExemptedRun(data, current, d, ref warning1Hz, ref firstRun); + + + + if (ModifyRunData != null) { + ModifyRunData(data); + + } + + + yield return (data.Exempted || data.MultistageRun) ? GetExemptedRun(data) : GetNonExemptedRun(data, current, ref warning1Hz, ref firstRun); } } @@ -171,7 +186,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory }); } - protected virtual IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz, ref bool firstRun) + protected virtual IVectoRun GetNonExemptedRun(VectoRunData data, int current, ref bool warning1Hz, ref bool firstRun) { var addReportResult = PrepareReport(data); if (!data.Cycle.CycleType.IsDistanceBased() && ModalResults1Hz && !warning1Hz) { -- GitLab