Changeset 3442 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

04/20/10 15:49:22 (15 years ago)

Author:

gkronber

Message:

Implemented views for DataAnalysisProblems and DataAnalysisSolutions. #938 (Data types and operators for regression problems)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• Creators/ProbabilisticTreeCreator.cs (modified) (7 diffs)
• SymbolicExpressionTree.cs (modified) (1 diff)
• SymbolicExpressionTreeCompiler.cs (modified) (3 diffs)
• SymbolicExpressionTreeCreator.cs (modified) (1 diff)
• SymbolicExpressionTreeNode.cs (modified) (1 diff)
• Symbols/DefunTreeNode.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs

@@ -56 +56 @@
       SymbolicExpressionTree tree = new SymbolicExpressionTree();
       var rootNode = grammar.StartSymbol.CreateTreeNode();
+      if (rootNode.HasLocalParameters) rootNode.ResetLocalParameters(random);
       rootNode.Grammar = grammar;
       tree.Root = PTC2(random, rootNode, maxTreeSize, maxTreeHeight, maxFunctionDefinitions, maxFunctionArguments);
@@ -111 +112 @@
         var dummy = new SymbolicExpressionTreeNode();
         root.AddSubTree(dummy);
-        // dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
         extensionPoints.Add(new TreeExtensionPoint { Parent = root, ChildIndex = i, ExtensionPointDepth = 2 });
       }
@@ -132 +132 @@
           Symbol selectedSymbol = SelectRandomSymbol(random, allowedSymbols);
           SymbolicExpressionTreeNode newTree = selectedSymbol.CreateTreeNode();
+          if (newTree.HasLocalParameters) newTree.ResetLocalParameters(random);
           parent.RemoveSubTree(argumentIndex);
           parent.InsertSubTree(argumentIndex, newTree);
@@ -145 +146 @@
             var dummy = new SymbolicExpressionTreeNode();
             newTree.AddSubTree(dummy);
-            //if (IsTopLevelBranch(root, dummy))
-            //  dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
             extensionPoints.Add(new TreeExtensionPoint { Parent = newTree, ChildIndex = i, ExtensionPointDepth = extensionDepth + 1 });
           }
@@ -172 +171 @@
       var selectedSymbol = SelectRandomSymbol(random, possibleSymbols);
       var tree = selectedSymbol.CreateTreeNode();
+      if (tree.HasLocalParameters) tree.ResetLocalParameters(random);
       parent.RemoveSubTree(argumentIndex);
       parent.InsertSubTree(argumentIndex, tree);
@@ -179 +179 @@
         var dummy = new SymbolicExpressionTreeNode();
         tree.AddSubTree(dummy);
-        // dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
         // replace the just inserted dummy by recursive application
         ReplaceWithMinimalTree(random, root, tree, i, maxFunctionDefinitions, maxFunctionArguments);
@@ -229 +228 @@
 
     private static bool IsTopLevelBranch(SymbolicExpressionTreeNode root, SymbolicExpressionTreeNode branch) {
-      //return root.SubTrees.IndexOf(branch) > -1;
       return branch is SymbolicExpressionTreeTopLevelNode;
     }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -65 +65 @@
     public SymbolicExpressionTree(SymbolicExpressionTreeNode root)
       : base() {
+      this.Root = root;
     }
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeCompiler.cs

@@ -46 +46 @@
       entryPoint.Clear();
       // compile main body
-      code.AddRange(Compile(tree.Root.SubTrees[0]));
+      code.AddRange(Compile(tree.Root.SubTrees[0].SubTrees[0]));
       // compile branches
       var functionBranches = from node in tree.IterateNodesPrefix()
@@ -53 +53 @@
       foreach (DefunTreeNode branch in functionBranches) {
         entryPoint[branch.FunctionName] = (short)code.Count;
-        code.AddRange(Compile(branch));
+        code.AddRange(Compile(branch.SubTrees[0]));
       }
+      // address of all functions is fixed now
+      // iterate through code again and fill in the jump locations
+      for (int i = 0; i < code.Count; i++) {
+        Instruction instr = code[i];
+        if (instr.symbol == CodeSymbol.Call) {
+          var invokeNode = (InvokeFunctionTreeNode)instr.dynamicNode;
+          instr.iArg0 = entryPoint[invokeNode.Symbol.FunctionName];
+          instr.dynamicNode = null;
+          code[i] = instr;
+        }
+      }
+
       return code.ToArray();
     }
@@ -65 +77 @@
         if (codeSymbol.ContainsKey(node.Symbol.GetType())) {
           instr.symbol = codeSymbol[node.Symbol.GetType()];
-          if (instr.symbol == CodeSymbol.Call) {
-            var invokeNode = (InvokeFunctionTreeNode)node;
-            instr.iArg0 = entryPoint[invokeNode.Symbol.FunctionName];
-          } else if (instr.symbol == CodeSymbol.Arg) {
+          if (instr.symbol == CodeSymbol.Arg) {
             var argNode = (ArgumentTreeNode)node;
             instr.iArg0 = (short)argNode.Symbol.ArgumentIndex;
+          } else if (instr.symbol == CodeSymbol.Call) {
+            instr.dynamicNode = node; // save node for fixup of jump addresses in second iteration
           }
         } else {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeCreator.cs

@@ -65 +65 @@
       SymbolicExpressionTreeParameter.ActualValue = Create(Random, SymbolicExpressionGrammar,
         MaxTreeSize, MaxTreeHeight, MaxFunctionDefinitions, MaxFunctionArguments);
-
-      foreach (var node in SymbolicExpressionTreeParameter.ActualValue.IterateNodesPostfix()) {
-        node.ResetLocalParameters(RandomParameter.ActualValue);
-      }
       return null;
     }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

@@ -145 +145 @@
     #endregion
 
-
+    public override string ToString() {
+      return Symbol.Name;
+    }
 
   }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbols/DefunTreeNode.cs

@@ -53 +53 @@
       return new DefunTreeNode(this);
     }
+
+    public override string ToString() {
+      return FunctionName;
+    }
   }
 }