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

Timestamp:

09/02/21 16:42:16 (3 years ago)

Author:

dpiringe

Message:

#3026

• added a first version of a new feature called ResultCollectionPostProcessors, which should transform/process the results of an optimizer run
  • created a new interface IResultCollectionPostProcessor
  • created a new class SymRegPythonPostProcessor, which formats all ISymbolicRegressionSolution with the usage of the SymbolicDataAnalysisExpressionPythonFormatter
  • changed the generation and instantiation of templates to handle this new feature
  • the template files contains a new area PostProcessors
  • added functionality in Runner to use these new type of result processing
  • added a new tab in ExportJsonDialog to configure PostProcessors

Location:

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

Files:

• ExportJsonDialog.Designer.cs (modified) (6 diffs)
• ExportJsonDialog.cs (modified) (6 diffs)

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

@@ -1 @@
-namespace HeuristicLab.JsonInterface.OptimizerIntegration {
+using HeuristicLab.Core;
+
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   partial class ExportJsonDialog {
     /// <summary>
@@ -38 +40 @@
       this.tabPage1 = new System.Windows.Forms.TabPage();
       this.tabPage2 = new System.Windows.Forms.TabPage();
+      this.tabPage3 = new System.Windows.Forms.TabPage();
       this.label1 = new System.Windows.Forms.Label();
       this.textBoxTemplateName = new System.Windows.Forms.TextBox();
@@ -172 +175 @@
       this.splitContainer2.SplitterDistance = 380;
       this.splitContainer2.TabIndex = 9;
+      // postProcessorListView
+      this.postProcessorListView = new Core.Views.CheckedItemListView<IResultCollectionPostProcessor>();
+      this.postProcessorListView.Content = new CheckedItemList<IResultCollectionPostProcessor>();
+      this.postProcessorListView.Content.Add(new SymRegPythonPostProcessor());
+      this.postProcessorListView.Location = new System.Drawing.Point(0, 6);
+      this.postProcessorListView.Dock = System.Windows.Forms.DockStyle.Fill;
       // 
       // tabControl1
@@ -180 +189 @@
       this.tabControl1.Controls.Add(this.tabPage1);
       this.tabControl1.Controls.Add(this.tabPage2);
+      this.tabControl1.Controls.Add(this.tabPage3);
       this.tabControl1.Location = new System.Drawing.Point(12, 38);
       this.tabControl1.Name = "tabControl1";
@@ -207 +217 @@
       this.tabPage2.Text = "Results";
       this.tabPage2.UseVisualStyleBackColor = true;
+      // 
+      // tabPage3
+      // 
+      this.tabPage3.Controls.Add(this.postProcessorListView);
+      this.tabPage3.Location = new System.Drawing.Point(4, 22);
+      this.tabPage3.Name = "tabPage3";
+      this.tabPage3.Size = new System.Drawing.Size(802, 505);
+      this.tabPage3.TabIndex = 2;
+      this.tabPage3.Text = "Post Processors";
+      this.tabPage3.UseVisualStyleBackColor = true;
       // 
       // label1
@@ -289 +309 @@
     private System.Windows.Forms.GroupBox groupBox;
     private System.Windows.Forms.Panel panelResultDetails;
+    private System.Windows.Forms.TabPage tabPage3;
+    private Core.Views.CheckedItemListView<IResultCollectionPostProcessor> postProcessorListView;
   }
 }

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

@@ -4 +4 @@
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
@@ -20 +22 @@
     private IOptimizer Optimizer { get; set; }
     private IList<IJsonItemVM> VMs { get; set; }
+    private ICheckedItemList<IResultCollectionPostProcessor> PostProcessors { get; set; }
     #endregion
 
@@ -27 +30 @@
       set {
         content = value;
-
+        //CheckedItemListView
         #region Clear
         VMs = new List<IJsonItemVM>();
@@ -33 +36 @@
         treeViewResults.Nodes.Clear();
         #endregion
-
         Optimizer = content as IOptimizer;
         if(Optimizer != null) {
@@ -59 +61 @@
     public ExportJsonDialog() {
       InitializeComponent();
+      this.PostProcessors = this.postProcessorListView.Content;
       this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       InitCache();
@@ -71 +74 @@
       if (FolderBrowserDialog.ShowDialog() == DialogResult.OK) {
         try {
+          //foreach(var x in PostProcessors.CheckedItems)
+            
           JsonTemplateGenerator.GenerateTemplate(
             Path.Combine(FolderBrowserDialog.SelectedPath, textBoxTemplateName.Text), 
-            Optimizer, Root);
+            Optimizer, Root, PostProcessors.CheckedItems.Select(x => x.Value));
           Close();
         } catch (Exception ex) {