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

Timestamp:

10/12/21 09:41:38 (20 months ago)

Author:

dpiringe

Message:

#3136

• added a simple way of evaluation (using r^{2 evaluator)}
• added a simple analyzing logic for "Best Tree"
• added a connection to SubFunction in SubFunctionTreeNode

File:

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

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HEAL.Attic;
@@ -33 +30 @@
     public ISymbolicExpressionTree Tree => tree;
 
-    //[Storable]
-    //private IDictionary<SubFunctionTreeNode, SubFunction> subFunctions;
     [Storable]
     public IDictionary<SubFunctionTreeNode, SubFunction> SubFunctions { get; private set; } = new Dictionary<SubFunctionTreeNode, SubFunction>();
-      //subFunctions == null ? new Dictionary<SubFunctionTreeNode, SubFunction>() : subFunctions;
 
     protected InfixExpressionParser Parser { get; set; } = new InfixExpressionParser();
@@ -49 +43 @@
 
     #region Constructors
-    public StructureTemplate() {
-      Template = "f(x)*f(y)+5";
-    }
+    public StructureTemplate() { }
 
     [StorableConstructor]
@@ -66 +58 @@
     private void GetSubFunctions(ISymbolicExpressionTree tree) {
       int count = 1;
+      SubFunctions.Clear();
       foreach (var node in tree.IterateNodesPrefix())
         if (node is SubFunctionTreeNode subFunctionTreeNode) { 
@@ -72 +65 @@
             FunctionArguments = subFunctionTreeNode.FunctionArguments 
           };
+          subFunctionTreeNode.SubFunction = subFunction;
           SubFunctions.Add(subFunctionTreeNode, subFunction);
         }
-
     }
   }