Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs

Timestamp:

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

Author:

mkommend

Message:

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

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs (modified) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs

@@ -62 +62 @@
       var selectedDefunBranch = functionDefiningBranches.SelectRandom(random);
       // remove the selected defun
-      int defunSubtreeIndex = symbolicExpressionTree.Root.IndexOfSubTree(selectedDefunBranch);
-      symbolicExpressionTree.Root.RemoveSubTree(defunSubtreeIndex);
+      int defunSubtreeIndex = symbolicExpressionTree.Root.IndexOfSubtree(selectedDefunBranch);
+      symbolicExpressionTree.Root.RemoveSubtree(defunSubtreeIndex);
 
       // remove references to deleted function
-      foreach (var subtree in symbolicExpressionTree.Root.SubTrees.OfType<SymbolicExpressionTreeTopLevelNode>()) {
+      foreach (var subtree in symbolicExpressionTree.Root.Subtrees.OfType<SymbolicExpressionTreeTopLevelNode>()) {
         var matchingInvokeSymbol = (from symb in subtree.Grammar.Symbols.OfType<InvokeFunction>()
                                     where symb.FunctionName == selectedDefunBranch.FunctionName
@@ -84 +84 @@
       // the invocations below it are removed already
       var invocationCutPoint = (from node in symbolicExpressionTree.IterateNodesPrefix()
-                                from subtree in node.SubTrees.OfType<InvokeFunctionTreeNode>()
+                                from subtree in node.Subtrees.OfType<InvokeFunctionTreeNode>()
                                 where subtree.Symbol.FunctionName == selectedDefunBranch.FunctionName
                                 select new CutPoint(node, subtree)).FirstOrDefault();
@@ -101 +101 @@
         if (replacementTree.HasLocalParameters)
           replacementTree.ResetLocalParameters(random);
-        invocationCutPoint.Parent.RemoveSubTree(invocationCutPoint.ChildIndex);
-        invocationCutPoint.Parent.InsertSubTree(invocationCutPoint.ChildIndex, replacementTree);
+        invocationCutPoint.Parent.RemoveSubtree(invocationCutPoint.ChildIndex);
+        invocationCutPoint.Parent.InsertSubtree(invocationCutPoint.ChildIndex, replacementTree);
 
         ProbabilisticTreeCreator.PTC2(random, replacementTree, maxLength, maxDepth);
 
         invocationCutPoint = (from node in symbolicExpressionTree.IterateNodesPrefix()
-                              from subtree in node.SubTrees.OfType<InvokeFunctionTreeNode>()
+                              from subtree in node.Subtrees.OfType<InvokeFunctionTreeNode>()
                               where subtree.Symbol.FunctionName == selectedDefunBranch.FunctionName
                               select new CutPoint(node, subtree)).FirstOrDefault();