Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

Timestamp:

03/17/11 14:07:47 (14 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs (modified) (7 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -89 +89 @@
       startNode.SetGrammar(new SymbolicExpressionTreeGrammar(grammar));
       if (startNode.HasLocalParameters) startNode.ResetLocalParameters(random);
-      rootNode.AddSubTree(startNode);
+      rootNode.AddSubtree(startNode);
       PTC2(random, startNode, maxTreeLength, maxTreeDepth);
       tree.Root = rootNode;
@@ -120 +120 @@
         } else {
           // clean seedNode
-          while (seedNode.SubTrees.Count() > 0) seedNode.RemoveSubTree(0);
+          while (seedNode.Subtrees.Count() > 0) seedNode.RemoveSubtree(0);
         }
         // try a different length MAX_TRIES times
@@ -138 +138 @@
         // insert a dummy sub-tree and add the pending extension to the list
         var dummy = new SymbolicExpressionTreeNode();
-        root.AddSubTree(dummy);
+        root.AddSubtree(dummy);
         extensionPoints.Add(new TreeExtensionPoint { Parent = root, ChildIndex = i, ExtensionPointDepth = 0 });
       }
@@ -162 +162 @@
           ISymbolicExpressionTreeNode newTree = selectedSymbol.CreateTreeNode();
           if (newTree.HasLocalParameters) newTree.ResetLocalParameters(random);
-          parent.RemoveSubTree(argumentIndex);
-          parent.InsertSubTree(argumentIndex, newTree);
+          parent.RemoveSubtree(argumentIndex);
+          parent.InsertSubtree(argumentIndex, newTree);
 
           var topLevelNode = newTree as SymbolicExpressionTreeTopLevelNode;
@@ -177 +177 @@
             // insert a dummy sub-tree and add the pending extension to the list
             var dummy = new SymbolicExpressionTreeNode();
-            newTree.AddSubTree(dummy);
+            newTree.AddSubtree(dummy);
             extensionPoints.Add(new TreeExtensionPoint { Parent = newTree, ChildIndex = i, ExtensionPointDepth = extensionDepth + 1 });
           }
@@ -207 +207 @@
       var tree = selectedSymbol.CreateTreeNode();
       if (tree.HasLocalParameters) tree.ResetLocalParameters(random);
-      parent.RemoveSubTree(childIndex);
-      parent.InsertSubTree(childIndex, tree);
+      parent.RemoveSubtree(childIndex);
+      parent.InsertSubtree(childIndex, tree);
 
       var topLevelNode = tree as SymbolicExpressionTreeTopLevelNode;
@@ -217 +217 @@
         // insert a dummy sub-tree and add the pending extension to the list
         var dummy = new SymbolicExpressionTreeNode();
-        tree.AddSubTree(dummy);
+        tree.AddSubtree(dummy);
         // replace the just inserted dummy by recursive application
         ReplaceWithMinimalTree(random, root, tree, i);