Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/AntInterpreter.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.Problems.ArtificialAnt/3.4/AntInterpreter.cs (modified) (4 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/AntInterpreter.cs

@@ -51 +51 @@
 
     private SymbolicExpressionTreeNode FindMatchingFunction(string name) {
-      foreach (var defunBranch in expression.Root.SubTrees.OfType<DefunTreeNode>()) {
+      foreach (var defunBranch in expression.Root.Subtrees.OfType<DefunTreeNode>()) {
         if (defunBranch.FunctionName == name) return defunBranch;
       }
@@ -93 +93 @@
       // expression evaluated completly => start at root again
       if (nodeStack.Count == 0) {
-        nodeStack.Push(Expression.Root.GetSubTree(0).GetSubTree(0));
+        nodeStack.Push(Expression.Root.GetSubtree(0).GetSubtree(0));
       }
 
@@ -114 +114 @@
         NextField(out nextAntLocationRow, out nextAntLocationColumn);
         if (World[nextAntLocationRow, nextAntLocationColumn]) {
-          nodeStack.Push(currentNode.GetSubTree(0));
+          nodeStack.Push(currentNode.GetSubtree(0));
         } else {
-          nodeStack.Push(currentNode.GetSubTree(1));
+          nodeStack.Push(currentNode.GetSubtree(1));
         }
       } else if (currentNode.Symbol is Prog2) {
-        nodeStack.Push(currentNode.GetSubTree(1));
-        nodeStack.Push(currentNode.GetSubTree(0));
+        nodeStack.Push(currentNode.GetSubtree(1));
+        nodeStack.Push(currentNode.GetSubtree(0));
         return;
       } else if (currentNode.Symbol is Prog3) {
-        nodeStack.Push(currentNode.GetSubTree(2));
-        nodeStack.Push(currentNode.GetSubTree(1));
-        nodeStack.Push(currentNode.GetSubTree(0));
+        nodeStack.Push(currentNode.GetSubtree(2));
+        nodeStack.Push(currentNode.GetSubtree(1));
+        nodeStack.Push(currentNode.GetSubtree(0));
         return;
       } else if (currentNode.Symbol is InvokeFunction) {
@@ -131 +131 @@
         var functionDefinition = (SymbolicExpressionTreeNode)FindMatchingFunction(invokeNode.Symbol.FunctionName).Clone();
         var argumentCutPoints = (from node in functionDefinition.IterateNodesPrefix()
-                                 where node.SubTrees.Count() > 0
-                                 from subtree in node.SubTrees
+                                 where node.Subtrees.Count() > 0
+                                 from subtree in node.Subtrees
                                  where subtree is ArgumentTreeNode
-                                 select new { Parent = node, Argument = subtree.Symbol as Argument, ChildIndex = node.IndexOfSubTree(subtree) }).ToList();
+                                 select new { Parent = node, Argument = subtree.Symbol as Argument, ChildIndex = node.IndexOfSubtree(subtree) }).ToList();
         foreach (var cutPoint in argumentCutPoints) {
-          cutPoint.Parent.RemoveSubTree(cutPoint.ChildIndex);
-          cutPoint.Parent.InsertSubTree(cutPoint.ChildIndex, (SymbolicExpressionTreeNode)invokeNode.GetSubTree(cutPoint.Argument.ArgumentIndex).Clone());
+          cutPoint.Parent.RemoveSubtree(cutPoint.ChildIndex);
+          cutPoint.Parent.InsertSubtree(cutPoint.ChildIndex, (SymbolicExpressionTreeNode)invokeNode.GetSubtree(cutPoint.Argument.ArgumentIndex).Clone());
         }
-        nodeStack.Push(functionDefinition.GetSubTree(0));
+        nodeStack.Push(functionDefinition.GetSubtree(0));
       } else {
         throw new InvalidOperationException(currentNode.Symbol.ToString());