Changeset 18046

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

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (3 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.Designer.cs (modified) (6 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (6 diffs)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (3 diffs)
• HeuristicLab.JsonInterface/Interfaces/IResultCollectionPostProcessor.cs (added)
• HeuristicLab.JsonInterface/JsonTemplateGenerator.cs (modified) (5 diffs)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (3 diffs)
• HeuristicLab.JsonInterface/ResultCollectionPostProcessors (added)
• HeuristicLab.JsonInterface/ResultCollectionPostProcessors/SymRegPythonPostProcessor.cs (added)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -22 +22 @@
       Task task = optimizer.StartAsync();
       while (!task.IsCompleted) {
-        WriteResultsToFile(outputFile, optimizer, configuredResultItem);
+        WriteResultsToFile(outputFile, optimizer, configuredResultItem, instantiatorResult.PostProcessors);
         Thread.Sleep(100);
       }
 
-      WriteResultsToFile(outputFile, optimizer, configuredResultItem);
+      WriteResultsToFile(outputFile, optimizer, configuredResultItem, instantiatorResult.PostProcessors);
     }
 
-    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem) {
+    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem, IEnumerable<IResultCollectionPostProcessor> postProcessors) {
       if (optimizer.Runs.Count > 0) 
-        File.WriteAllText(file, FetchResults(optimizer, configuredResultItem));
+        File.WriteAllText(file, FetchResults(optimizer, configuredResultItem, postProcessors));
     }
       
@@ -41 +41 @@
       ResultFormatter?.Where(x => x.GetType().FullName == fullName).Last();
 
-    private static string FetchResults(IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItems) {
+    private static string FetchResults(IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItems, IEnumerable<IResultCollectionPostProcessor> postProcessors) {
       JArray arr = new JArray();
       IEnumerable<string> configuredResults = configuredResultItems.Select(x => x.Name);
@@ -66 +66 @@
             obj.Add(result.Item1.Name, formatter.Format(result.Item2));
         }
+
+        IDictionary<string, string> resultDict = new Dictionary<string, string>();
+        foreach (var processor in postProcessors) {
+          processor.Apply(run.Results, resultDict);
+        }
+        foreach(var kvp in resultDict) {
+          obj.Add(kvp.Key, kvp.Value);
+        }
       }
       return SingleLineArrayJsonWriter.Serialize(arr);

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) {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

@@ -53 +53 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -82 +83 @@
     <Compile Include="Interfaces\IValueJsonItem.cs" />
     <Compile Include="Interfaces\IValueLookupJsonItem.cs" />
+    <Compile Include="Interfaces\IResultCollectionPostProcessor.cs" />
     <Compile Include="JsonItems\ArrayJsonItem.cs" />
     <Compile Include="JsonItems\BoolJsonItems.cs" />
@@ -103 +105 @@
     <Compile Include="JsonItems\ValueJsonItem.cs" />
     <Compile Include="JsonItems\ValueLookupJsonItem.cs" />
+    <Compile Include="ResultCollectionPostProcessors\SymRegPythonPostProcessor.cs" />
     <Compile Include="ResultFormatters\MatlabResultFormatter.cs" />
     <Compile Include="ResultFormatters\PythonResultFormatter.cs" />

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateGenerator.cs

@@ -5 +5 @@
 using System.IO;
 using HeuristicLab.Core;
+using System.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -18 +19 @@
     /// <param name="optimizer">the optimizer object to serialize</param>
     /// <param name="rootItem">Root JsonItem for serialization, considers only active JsonItems for serialization</param>
-    public static void GenerateTemplate(string templatePath, IOptimizer optimizer, IJsonItem rootItem) {
+    public static void GenerateTemplate(string templatePath, IOptimizer optimizer, IJsonItem rootItem, IEnumerable<IResultCollectionPostProcessor> postProcessors) {
       // clear all runs
       optimizer.Runs.Clear();
@@ -31 +32 @@
       JArray parameterItems = new JArray();
       JArray resultItems = new JArray();
+      JArray postProcessorItems = new JArray();
+      // postProcessors.Select(x => new JObject().Add("Name", JToken.Parse(x.GetType().Name))
+      foreach (var proc in postProcessors) {
+        var tmp = new JObject();
+        tmp.Add("Name", proc.GetType().Name);
+        postProcessorItems.Add(tmp);
+      }
+
       IList<IJsonItem> jsonItems = new List<IJsonItem>();
      
@@ -67 +76 @@
       template[Constants.Parameters] = parameterItems;
       template[Constants.Results] = resultItems;
+      template["PostProcessors"] = postProcessorItems;
       #endregion
 
@@ -76 +86 @@
     #region Helper    
     private static void PopulateJsonItems(IJsonItem item, IList<IJsonItem> jsonItems) {
-      foreach(var x in item) {
+      foreach(var x in item) { // TODO: dieses konstrukt notwendig?
         if (x.Active && !(x is EmptyJsonItem) && !(x is UnsupportedJsonItem)) {
           jsonItems.Add(x);

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

@@ -6 +6 @@
 using HEAL.Attic;
 using HeuristicLab.Optimization;
+using HeuristicLab.PluginInfrastructure;
 using Newtonsoft.Json.Linq;
 
@@ -13 +14 @@
       Optimizer = optimizer;
       ConfiguredResultItems = configuredResultItems;
+      PostProcessors = Enumerable.Empty<IResultCollectionPostProcessor>();
+    }
+
+    public InstantiatorResult(IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItems, IEnumerable<IResultCollectionPostProcessor> postProcessors) {
+      Optimizer = optimizer;
+      ConfiguredResultItems = configuredResultItems;
+      PostProcessors = postProcessors;
     }
 
     public IOptimizer Optimizer { get; }
     public IEnumerable<IResultJsonItem> ConfiguredResultItems { get; }
+    public IEnumerable<IResultCollectionPostProcessor> PostProcessors { get; }
   }
 
@@ -85 +94 @@
       JsonItemConverter.Inject(optimizer, rootItem);
 
-      return new InstantiatorResult(optimizer, CollectResults());
+      IList<IResultCollectionPostProcessor> postProcessorList = new List<IResultCollectionPostProcessor>();
+      var postProcessors = ApplicationManager.Manager.GetInstances<IResultCollectionPostProcessor>();
+      foreach (JObject obj in Template["PostProcessors"]) {
+        //string name = obj.Property("Name").Value.ToString();
+        foreach(var proc in postProcessors) {
+          if (proc.GetType().Name == obj["Name"].ToString())
+            postProcessorList.Add(proc);
+        }
+      }
+
+      return new InstantiatorResult(optimizer, CollectResults(), postProcessorList);
     }