Changeset 18065 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective

Timestamp:

10/08/21 16:28:53 (3 years ago)

Author:

dpiringe

Message:

#3136

• modified InfixExpressionParser to fully support SubFunctionSymbol
  • created a SubFunctionTreeNode to store the function arguments
• modified StructureTemplateView to regenerate the content state
• first implementation for the main tree build up logic

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (5 diffs)

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

@@ -24 +24 @@
     private const string GrammarParameterName = "Grammar";
     private const string StructureTemplateParameterName = "Structure Template";
-
+    private const string MainTreeResultParameterName = "Main Tree";
     #endregion
 
@@ -31 +31 @@
     public IFixedValueParameter<StringValue> StructureDefinitionParameter => (IFixedValueParameter<StringValue>)Parameters[StructureDefinitionParameterName];
     public IFixedValueParameter<StructureTemplate> StructureTemplateParameter => (IFixedValueParameter<StructureTemplate>)Parameters[StructureTemplateParameterName];
-    public IValueParameter<ISymbolicDataAnalysisGrammar> GrammarParameter => (IValueParameter<ISymbolicDataAnalysisGrammar>)Parameters[GrammarParameterName]; // könnte auch weg?
+    public IValueParameter<ISymbolicDataAnalysisGrammar> GrammarParameter => (IValueParameter<ISymbolicDataAnalysisGrammar>)Parameters[GrammarParameterName];
+    public IResultParameter<ISymbolicExpressionTree> MainTreeResultParameter => (IResultParameter<ISymbolicExpressionTree>)Parameters[MainTreeResultParameterName];
     #endregion
 
@@ -76 +77 @@
       varSym.Enabled = true;
 
+      var structureTemplate = new StructureTemplate();
+      structureTemplate.Changed += (sender, args) => {
+        foreach (var e in Encoding.Encodings.ToArray())
+          Encoding.Remove(e);
+
+        foreach(var sf in structureTemplate.SubFunctions.Values) {
+          Encoding.Add(new SymbolicExpressionTreeEncoding(sf.Name, sf.Grammar, sf.MaximumSymbolicExpressionTreeLength, sf.MaximumSymbolicExpressionTreeDepth));
+        }
+      };
+
       Parameters.Add(new ValueParameter<RegressionProblemData>(ProblemDataParameterName, problemData));
-      Parameters.Add(new FixedValueParameter<StringValue>(StructureDefinitionParameterName, new StringValue("e^f(x)/F(y)")));
-      Parameters.Add(new FixedValueParameter<StructureTemplate>(StructureTemplateParameterName, new StructureTemplate()));
+      Parameters.Add(new FixedValueParameter<StructureTemplate>(StructureTemplateParameterName, structureTemplate));
       Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, grammar));
-      var parser = new InfixExpressionParser();
-      var tree = parser.Parse(StructureDefinition); 
-      
-      GetSubFunctions(tree);
+      Parameters.Add(new ResultParameter<ISymbolicExpressionTree>(MainTreeResultParameterName, ""));
+      MainTreeResultParameter.DefaultValue = new SymbolicExpressionTree();
     }
 
@@ -90 +98 @@
     [StorableConstructor]
     protected StructuredSymbolicRegressionSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
+    #endregion
 
+    #region Cloning
     public override IDeepCloneable Clone(Cloner cloner) =>
       new StructuredSymbolicRegressionSingleObjectiveProblem(this, cloner);
     #endregion
 
-    public void GetSubFunctions(ISymbolicExpressionTree tree) {
-      int count = 1;
-      foreach(var node in tree.IterateNodesPrefix())
-        if(node.Symbol is SubFunctionSymbol)
-          Encoding.Add(new SymbolicExpressionTreeEncoding($"f{count++}", Grammar/*new LinearScalingGrammar()*/, 25, 8));
-    }
+    public override double Evaluate(Individual individual, IRandom random) {
+      var templateTree = (ISymbolicExpressionTree)StructureTemplate.Tree.Clone();
+      var subFunctionDict = StructureTemplate.SubFunctions;
+          
+      // build main tree
+      foreach (var n in templateTree.IterateNodesPrefix()) {
+        if(n is SubFunctionTreeNode subFunctionTreeNode) {
+          if(subFunctionDict.TryGetValue(subFunctionTreeNode, out SubFunction subFunction)) {
+            var subFunctionTree = individual.SymbolicExpressionTree(subFunction.Name);
+            var parent = n.Parent;
+            // remove all subtrees
 
-    public override double Evaluate(Individual individual, IRandom random) {
-      Console.WriteLine(StructureTemplate.Template);
+            var subtreeCount = parent.SubtreeCount;
+            for (int idx = 0; idx < subtreeCount; ++idx)
+              parent.RemoveSubtree(idx);
+
+            // add new tree
+            parent.AddSubtree(subFunctionTree.Root);
+          }
+        }
+      }
+
+      MainTreeResultParameter.ActualValue = templateTree;
+      /*
       foreach (var kvp in individual.Values) {
         if(kvp.Value is SymbolicExpressionTree tree) {
@@ -111 +136 @@
             }
           }
-          Console.WriteLine(tree);
         }
       }
+      */
       return 0.0;
     }