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

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/ResultCollectionProcessors

Files:

• AbstractProcessors (added)
• AbstractProcessors/RunCollectionSRSolutionFormatter.cs (added)
• FilterResultCollectionProcessor.cs (modified) (4 diffs)
• RunCollectionSRSolutionGraphVizFormatter.cs (added)
• RunCollectionSRSolutionLatexFormatter.cs (added)
• RunCollectionSRSolutionPythonFormatter.cs (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionProcessors/SymRegPythonProcessor.cs) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionProcessors/FilterResultCollectionProcessor.cs

@@ -12 +12 @@
 
 namespace HeuristicLab.JsonInterface {
+  /*
   [StorableType("4AF9EF94-2EF3-4F54-8B8D-942454CF8DDF")]
-  public class FilterResultCollectionProcessor : ParameterizedNamedItem, IResultCollectionProcessor {
+  public class FilterResultCollectionProcessor : ParameterizedNamedItem, IRunCollectionModifier {
 
     #region Constants
     private const string FilterStringParameterName = "Filters";
+    private const string Filter2StringParameterName = "Filters2";
     #endregion
 
@@ -22 +24 @@
     public IFixedValueParameter<StringValue> FilterStringParameter =>
       (IFixedValueParameter<StringValue>)Parameters[FilterStringParameterName];
+    public IFixedValueParameter<ItemList<StringValue>> Filter2StringParameter =>
+      (IFixedValueParameter<ItemList<StringValue>>)Parameters[Filter2StringParameterName];
     #endregion
 
@@ -29 +33 @@
     public FilterResultCollectionProcessor() {
       Parameters.Add(new FixedValueParameter<StringValue>(FilterStringParameterName, "", new StringValue()));
+      Parameters.Add(new FixedValueParameter<ItemList<StringValue>>(Filter2StringParameterName, "", new ItemList<StringValue>()));
     }
     public FilterResultCollectionProcessor(FilterResultCollectionProcessor original, Cloner cloner) : base(original, cloner) { }
@@ -39 +44 @@
       var filters = FilterStringParameter.Value.Value.Split(';');
       
-      
-      /*
-      foreach (var filter in FilterStringParameter.Value) {
-        if (results.ContainsKey(filter.Value))
-          results.Remove(filter.Value);
-      }*/
+      foreach (var filter in filters) {
+        if (results.ContainsKey(filter))
+          results.Remove(filter);
+      }
     }
-  }
+  }*/
 }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionProcessors/RunCollectionSRSolutionPythonFormatter.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Collections;
-using HeuristicLab.Common;
+using HeuristicLab.Common;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HEAL.Attic;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
-using HEAL.Attic;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.JsonInterface {
+  [Item(Name = "RunCollection SymbolicRegressionSolution Python Formatter")]
   [StorableType("844F2887-B7A0-4BD4-89B8-F9155C65D214")]
-  public class SymRegPythonProcessor : ParameterizedNamedItem, IResultCollectionProcessor {
+  public class RunCollectionSRSolutionPythonFormatter : RunCollectionSRSolutionFormatter {
+    protected override ISymbolicExpressionTreeStringFormatter Formatter =>
+      new SymbolicDataAnalysisExpressionPythonFormatter();
 
     #region Constructors & Cloning
     [StorableConstructor]
-    protected SymRegPythonProcessor(StorableConstructorFlag _) : base(_) { }
-    public SymRegPythonProcessor() { }
-    public SymRegPythonProcessor(SymRegPythonProcessor original, Cloner cloner) : base(original, cloner) { }
+    protected RunCollectionSRSolutionPythonFormatter(StorableConstructorFlag _) : base(_) { }
+    public RunCollectionSRSolutionPythonFormatter() { Suffix = "Python"; }
+    public RunCollectionSRSolutionPythonFormatter(RunCollectionSRSolutionPythonFormatter original, Cloner cloner) : base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymRegPythonProcessor(this, cloner);
+      return new RunCollectionSRSolutionPythonFormatter(this, cloner);
     }
     #endregion
-
-    public void Apply(IObservableDictionary<string, IItem> results) {
-      var formatter = new SymbolicDataAnalysisExpressionPythonFormatter();
-      var resultCopy = new ObservableDictionary<string, IItem>(results);
-      foreach (var kvp in resultCopy) {
-        if (kvp.Value is ISymbolicRegressionSolution sol) {
-          results.Add($"{kvp.Key} - Python" , new StringValue(formatter.Format(sol.Model.SymbolicExpressionTree)));
-        }
-      }
-    }
   }
 }