Changeset 18055 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration

Timestamp:

09/16/21 15:27:07 (3 years ago)

Author:

dpiringe

Message:

#3026

• added StorableTypeAttribute and StorableConstructorAttribute to all JsonItems
• added a new JsonItem ListJsonItem + Interfaces IListJsonItem
• renamed SymRegPythonProcessor to RunCollectionSRSolutionPythonFormatter
• removed Interface IResultCollectionProcessor -> using the interface IRunCollectionModifier now (has aleady implementations)
• renamed all related variables/fields/properties with a connection to ResultCollectionProcessor
• added new implementations for IRunCollectionModifier

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views

Files:

• ExportJsonDialog.Designer.cs (modified) (7 diffs)
• ExportJsonDialog.cs (modified) (3 diffs)
• ResultCollectionPostProcessorControl.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.Designer.cs

@@ -1 +1 @@
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
@@ -27 +28 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      HeuristicLab.Core.CheckedItemList<HeuristicLab.Optimization.IRunCollectionModifier> checkedItemList_11 = new HeuristicLab.Core.CheckedItemList<HeuristicLab.Optimization.IRunCollectionModifier>();
       this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.exportButton = new System.Windows.Forms.Button();
@@ -41 +43 @@
       this.tabPage2 = new System.Windows.Forms.TabPage();
       this.tabPage3 = new System.Windows.Forms.TabPage();
+      this.postProcessorListControl = new HeuristicLab.JsonInterface.OptimizerIntegration.ResultCollectionPostProcessorControl();
       this.label1 = new System.Windows.Forms.Label();
       this.textBoxTemplateName = new System.Windows.Forms.TextBox();
@@ -58 +61 @@
       this.tabPage1.SuspendLayout();
       this.tabPage2.SuspendLayout();
+      this.tabPage3.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).BeginInit();
@@ -175 +179 @@
       this.splitContainer2.SplitterDistance = 380;
       this.splitContainer2.TabIndex = 9;
-      // postProcessorListView
-      this.postProcessorListControl = new ResultCollectionPostProcessorControl();
-      this.postProcessorListControl.Content = new CheckedItemList<IResultCollectionProcessor>();
-      this.postProcessorListControl.Location = new System.Drawing.Point(0, 6);
-      this.postProcessorListControl.Dock = System.Windows.Forms.DockStyle.Fill;
       // 
       // tabControl1
@@ -224 +223 @@
       this.tabPage3.Size = new System.Drawing.Size(802, 505);
       this.tabPage3.TabIndex = 2;
-      this.tabPage3.Text = "Post Processors";
+      this.tabPage3.Text = "Result Collection Modifiers";
       this.tabPage3.UseVisualStyleBackColor = true;
+      // 
+      // postProcessorListControl
+      // 
+      this.postProcessorListControl.Caption = "View";
+      checkedItemList_11.Capacity = 0;
+      this.postProcessorListControl.Content = checkedItemList_11;
+      this.postProcessorListControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.postProcessorListControl.Location = new System.Drawing.Point(0, 0);
+      this.postProcessorListControl.Name = "postProcessorListControl";
+      this.postProcessorListControl.ReadOnly = false;
+      this.postProcessorListControl.Size = new System.Drawing.Size(802, 505);
+      this.postProcessorListControl.TabIndex = 0;
       // 
       // label1
@@ -282 +293 @@
       this.tabPage1.ResumeLayout(false);
       this.tabPage2.ResumeLayout(false);
+      this.tabPage3.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).EndInit();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

@@ -22 +22 @@
     private IOptimizer Optimizer { get; set; }
     private IList<IJsonItemVM> VMs { get; set; }
-    private ICheckedItemList<IResultCollectionProcessor> PostProcessors { get; set; }
+    private ICheckedItemList<IRunCollectionModifier> RunCollectionModifiers { get; set; }
     #endregion
 
@@ -61 +61 @@
     public ExportJsonDialog() {
       InitializeComponent();
-      this.PostProcessors = this.postProcessorListControl.Content;
+      this.RunCollectionModifiers = this.postProcessorListControl.Content;
       this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       InitCache();
@@ -78 +78 @@
           JsonTemplateGenerator.GenerateTemplate(
             Path.Combine(FolderBrowserDialog.SelectedPath, textBoxTemplateName.Text), 
-            Optimizer, Root, PostProcessors.CheckedItems.Select(x => x.Value));
+            Optimizer, Root, RunCollectionModifiers.CheckedItems.Select(x => x.Value));
           Close();
         } catch (Exception ex) {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ResultCollectionPostProcessorControl.cs

@@ -9 +9 @@
 using System.Windows.Forms;
 using HeuristicLab.Collections;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public partial class ResultCollectionPostProcessorControl : Core.Views.CheckedItemListView<IResultCollectionProcessor> {
+  public partial class ResultCollectionPostProcessorControl : Core.Views.CheckedItemListView<IRunCollectionModifier> {
     public ResultCollectionPostProcessorControl() {
       InitializeComponent();
     }
 
-    protected override string GroupBoxText => "Result Collection Processors";
+    protected override string GroupBoxText => "Run Collection Modifiers";
 
   }