Changeset 18075 for branches

Timestamp:

10/29/21 16:56:22 (3 years ago)

Author:

dpiringe

Message:

#3136

• added a hidden interpreter parameter for StructuredSymbolicRegressionSingleObjectiveProblem
• fixed a bug which crashed the application by changing ProblemData with different variables
• fixed a bug which crashed the application by running the problem with an empty StructureTemplate
• added a better output of exceptions of type AggregateException
• added and resize event handler to repaint nodes of type SubFunctionTreeNode
• code cleanup

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (11 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (4 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs

@@ -12 +12 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -17 +18 @@
   [Item(Name = "Structured Symbolic Regression Single Objective Problem (single-objective)", Description = "A problem with a structural definition and unfixed subfunctions.")]
   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 150)]
-  public class StructuredSymbolicRegressionSingleObjectiveProblem : SingleObjectiveBasicProblem<MultiEncoding>, IRegressionProblem, IProblemInstanceConsumer<RegressionProblemData> {
+  public class StructuredSymbolicRegressionSingleObjectiveProblem : SingleObjectiveBasicProblem<MultiEncoding>, IRegressionProblem, IProblemInstanceConsumer<IRegressionProblemData> {
 
     #region Constants
     private const string ProblemDataParameterName = "ProblemData";
-    private const string StructureDefinitionParameterName = "Structure Definition";
     private const string StructureTemplateParameterName = "Structure Template";
+    private const string InterpreterParameterName = "Interpreter";
 
     private const string StructureTemplateDescriptionText = 
@@ -33 +34 @@
     #region Parameters
     public IValueParameter<IRegressionProblemData> ProblemDataParameter => (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName];
-    public IFixedValueParameter<StringValue> StructureDefinitionParameter => (IFixedValueParameter<StringValue>)Parameters[StructureDefinitionParameterName];
     public IFixedValueParameter<StructureTemplate> StructureTemplateParameter => (IFixedValueParameter<StructureTemplate>)Parameters[StructureTemplateParameterName];
+    public IValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter> InterpreterParameter => (IValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>)Parameters[InterpreterParameterName];
     #endregion
 
@@ -46 +47 @@
     }
 
-    public string StructureDefinition {
-      get => StructureDefinitionParameter.Value.Value;
-      set => StructureDefinitionParameter.Value.Value = value;
-    }
-
-    public StructureTemplate StructureTemplate {
-      get => StructureTemplateParameter.Value;
-    }
-
-    public ISymbolicDataAnalysisExpressionTreeInterpreter Interpreter { get; } = new SymbolicDataAnalysisExpressionTreeInterpreter();
+    public StructureTemplate StructureTemplate => StructureTemplateParameter.Value;
+
+    public ISymbolicDataAnalysisExpressionTreeInterpreter Interpreter => InterpreterParameter.Value;
 
     IParameter IDataAnalysisProblem.ProblemDataParameter => ProblemDataParameter;
@@ -74 +68 @@
       structureTemplate.Changed += OnTemplateChanged;
 
-      Parameters.Add(new ValueParameter<IRegressionProblemData>(ProblemDataParameterName, problemData));
-      Parameters.Add(new FixedValueParameter<StructureTemplate>(StructureTemplateParameterName, 
-        StructureTemplateDescriptionText, structureTemplate));
-
-
+      Parameters.Add(new ValueParameter<IRegressionProblemData>(
+        ProblemDataParameterName, 
+        problemData));
+
+      Parameters.Add(new FixedValueParameter<StructureTemplate>(
+        StructureTemplateParameterName, 
+        StructureTemplateDescriptionText, 
+        structureTemplate));
+
+      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>(
+        InterpreterParameterName, 
+        new SymbolicDataAnalysisExpressionTreeInterpreter()) 
+        { Hidden = true });
+
+      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
     }
 
@@ -93 +97 @@
     #endregion
 
+    private void ProblemDataParameterValueChanged(object sender, EventArgs e) {
+      StructureTemplate.Reset();
+      // InfoBox for Reset?
+    }
+
     private void OnTemplateChanged(object sender, EventArgs args) {
       SetupStructureTemplate();
@@ -103 +112 @@
       foreach (var f in StructureTemplate.SubFunctions.Values) {
         SetupVariables(f);
-        if(!Encoding.Encodings.Any(x => x.Name == f.Name)) // to prevent the same encoding twice
-          Encoding.Add(new SymbolicExpressionTreeEncoding(f.Name, f.Grammar, f.MaximumSymbolicExpressionTreeLength, f.MaximumSymbolicExpressionTreeDepth));
+        if (!Encoding.Encodings.Any(x => x.Name == f.Name)) // to prevent the same encoding twice
+          Encoding.Add(new SymbolicExpressionTreeEncoding(
+            f.Name, 
+            f.Grammar, 
+            f.MaximumSymbolicExpressionTreeLength, 
+            f.MaximumSymbolicExpressionTreeDepth));
       }
     }
@@ -133 +146 @@
         results.Add(new Result("Best Tree", tree));
       }
-        
     }
 
@@ -168 +180 @@
 
     private ISymbolicExpressionTree BuildTree(Individual individual) {
+      if (StructureTemplate.Tree == null)
+        throw new ArgumentException("No structure template defined!");
+
       var templateTree = (ISymbolicExpressionTree)StructureTemplate.Tree.Clone();
 
@@ -175 +190 @@
           var subFunctionTreeNode = n as SubFunctionTreeNode;
           var subFunctionTree = individual.SymbolicExpressionTree(subFunctionTreeNode.Name);
-          //var parent = n.Parent;
-
-          // remove SubFunctionTreeNode
-          //parent.RemoveSubtree(parent.IndexOfSubtree(subFunctionTreeNode));
 
           // add new tree
           var subTree = subFunctionTree.Root.GetSubtree(0)  // Start
                                             .GetSubtree(0); // Offset
-          //parent.AddSubtree(subTree);
           subFunctionTreeNode.AddSubtree(subTree);
         }
@@ -223 +233 @@
     }
 
-    public void Load(RegressionProblemData data) {
-      ProblemData = data;
-      SetupStructureTemplate();
-    }
+    public void Load(IRegressionProblemData data) => ProblemData = data;
   }
 }

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -25 +26 @@
       InitializeComponent();
       infoLabel.Text = "";
+      this.Resize += StructureTemplateViewResize;
       treeChart.SymbolicExpressionTreeNodeClicked += SymbolicExpressionTreeNodeClicked;
       
+    }
+
+    private void StructureTemplateViewResize(object sender, EventArgs e) {
+      PaintTree();
     }
 
@@ -83 +89 @@
           infoLabel.Text = "Template structure successfully parsed.";
           infoLabel.ForeColor = Color.DarkGreen;
+        } catch (AggregateException ex) {
+          infoLabel.Text = string.Join("\n", ex.InnerExceptions.Select(x => x.Message));
+          infoLabel.ForeColor = Color.DarkRed;
         } catch (Exception ex) {
           infoLabel.Text = ex.Message;

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs

@@ -14 +14 @@
     #region Properties
     [Storable]
-    private string template = "";
+    private string template;
     public string Template {
       get => template; 
@@ -38 +38 @@
 
     [Storable]
-    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; } = new Dictionary<string, SubFunction>();
+    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; }
 
     [Storable]
-    private bool applyLinearScaling = false;
+    private bool applyLinearScaling;
     public bool ApplyLinearScaling {
       get => applyLinearScaling;
@@ -61 +61 @@
 
     #region Constructors
-    public StructureTemplate() { }
+    public StructureTemplate() {
+      Reset();
+    }
 
     [StorableConstructor]
@@ -79 +81 @@
     #endregion
 
-    
+    public void Reset() {
+      SubFunctions = new Dictionary<string, SubFunction>();
+      treeWithoutLinearScaling = null;
+      treeWithLinearScaling = null;
+      template = "";
+      applyLinearScaling = false;
+      OnChanged();
+    }
 
     private Dictionary<string, SubFunction> GetSubFunctions() {