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

Timestamp:

09/08/21 15:53:37 (3 years ago)

Author:

dpiringe

Message:

#3026

• added a new protected virtual property in CheckedItemListView to be able to change the text of the groupBox
• removed event handling in ResultCollectionPostProcessorControl and overwrote the new property GroupBoxText
• added a new section in ExportJsonDialog for result collection processors
• renamed IResultCollectionPostProcessor to IResultCollectionProcessor + all connected classes
• added/changed the workflow of ResultCollectionProcessors in JsonTemplateGenerator and JsonTemplateInstantiator
  • also changed Constants.cs -> added a new section in template ResultCollectionProcessorItems

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionProcessors

Files:

• . (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionPostProcessors)
• FilterResultCollectionProcessor.cs (added)
• SymRegPythonPostProcessor.cs (deleted)
• SymRegPythonProcessor.cs (copied) (copied from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultCollectionPostProcessors/SymRegPythonPostProcessor.cs) (1 diff)

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

@@ -11 +11 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 using HEAL.Attic;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.JsonInterface {
   [StorableType("844F2887-B7A0-4BD4-89B8-F9155C65D214")]
-  public class SymRegPythonPostProcessor : Item, IResultCollectionPostProcessor {
+  public class SymRegPythonProcessor : ParameterizedNamedItem, IResultCollectionProcessor {
 
+    #region Constructors & Cloning
     [StorableConstructor]
-    protected SymRegPythonPostProcessor(StorableConstructorFlag _) : base(_) {
+    protected SymRegPythonProcessor(StorableConstructorFlag _) : base(_) { }
+    public SymRegPythonProcessor() { }
+    public SymRegPythonProcessor(SymRegPythonProcessor original, Cloner cloner) : base(original, cloner) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymRegPythonProcessor(this, cloner);
     }
+    #endregion
 
-    public SymRegPythonPostProcessor() { }
-    public SymRegPythonPostProcessor(SymRegPythonPostProcessor old, Cloner cloner) { }
-
-    public void Apply(IObservableDictionary<string, IItem> results, IDictionary<string, string> output) {
+    public void Apply(IObservableDictionary<string, IItem> results) {
       var formatter = new SymbolicDataAnalysisExpressionPythonFormatter();
-      foreach (var kvp in results) {
+      var resultCopy = new ObservableDictionary<string, IItem>(results);
+      foreach (var kvp in resultCopy) {
         if (kvp.Value is ISymbolicRegressionSolution sol) {
-          output.Add(kvp.Key, formatter.Format(sol.Model.SymbolicExpressionTree));
+          results.Add($"{kvp.Key} - Python" , new StringValue(formatter.Format(sol.Model.SymbolicExpressionTree)));
         }
       }
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymRegPythonPostProcessor(this, cloner);
-    }
   }
 }