Changeset 5517 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/AntInterpreter.cs

Timestamp:

02/18/11 14:50:19 (13 years ago)

Author:

mkommend

Message:

#1418: Fixed compilation errors in Problems.ArtificalAnt.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/AntInterpreter.cs (modified) (5 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 using HeuristicLab.Problems.ArtificialAnt.Symbols;
 
@@ -65 +64 @@
     private int currentAntLocationColumn;
     private int nFoodItems;
-    private Stack<SymbolicExpressionTreeNode> nodeStack = new Stack<SymbolicExpressionTreeNode>();
+    private Stack<ISymbolicExpressionTreeNode> nodeStack = new Stack<ISymbolicExpressionTreeNode>();
 
     private void CountFoodItems() {
@@ -94 +93 @@
       // expression evaluated completly => start at root again
       if (nodeStack.Count == 0) {
-        nodeStack.Push(Expression.Root.SubTrees[0].SubTrees[0]);
+        nodeStack.Push(Expression.Root.GetSubTree(0).GetSubTree(0));
       }
 
@@ -115 +114 @@
         NextField(out nextAntLocationRow, out nextAntLocationColumn);
         if (World[nextAntLocationRow, nextAntLocationColumn]) {
-          nodeStack.Push(currentNode.SubTrees[0]);
+          nodeStack.Push(currentNode.GetSubTree(0));
         } else {
-          nodeStack.Push(currentNode.SubTrees[1]);
+          nodeStack.Push(currentNode.GetSubTree(1));
         }
       } else if (currentNode.Symbol is Prog2) {
-        nodeStack.Push(currentNode.SubTrees[1]);
-        nodeStack.Push(currentNode.SubTrees[0]);
+        nodeStack.Push(currentNode.GetSubTree(1));
+        nodeStack.Push(currentNode.GetSubTree(0));
         return;
       } else if (currentNode.Symbol is Prog3) {
-        nodeStack.Push(currentNode.SubTrees[2]);
-        nodeStack.Push(currentNode.SubTrees[1]);
-        nodeStack.Push(currentNode.SubTrees[0]);
+        nodeStack.Push(currentNode.GetSubTree(2));
+        nodeStack.Push(currentNode.GetSubTree(1));
+        nodeStack.Push(currentNode.GetSubTree(0));
         return;
       } else if (currentNode.Symbol is InvokeFunction) {
@@ -132 +131 @@
         var functionDefinition = (SymbolicExpressionTreeNode)FindMatchingFunction(invokeNode.Symbol.FunctionName).Clone();
         var argumentCutPoints = (from node in functionDefinition.IterateNodesPrefix()
-                                 where node.SubTrees.Count > 0
+                                 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.SubTrees.IndexOf(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.SubTrees[cutPoint.Argument.ArgumentIndex].Clone());
+          cutPoint.Parent.InsertSubTree(cutPoint.ChildIndex, (SymbolicExpressionTreeNode)invokeNode.GetSubTree(cutPoint.Argument.ArgumentIndex).Clone());
         }
-        nodeStack.Push(functionDefinition.SubTrees[0]);
+        nodeStack.Push(functionDefinition.GetSubTree(0));
       } else {
         throw new InvalidOperationException(currentNode.Symbol.ToString());