Changeset 3294 for trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/AntInterpreter.cs

Timestamp:

04/09/10 17:28:32 (14 years ago)

Author:

gkronber

Message:

Added first version of architecture altering operators for ADFs. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/AntInterpreter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/AntInterpreter.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
 
 namespace HeuristicLab.Problems.ArtificialAnt {
@@ -80 +82 @@
       // expression evaluated completly => start at root again
       if (nodeStack.Count == 0)
-        nodeStack.Push(Expression.Root.SubTrees[0]);
+        nodeStack.Push(Expression.ResultProducingExpression);
       var currentNode = nodeStack.Pop();
       if (currentNode.Symbol is Left) {
@@ -112 +114 @@
         nodeStack.Push(currentNode.SubTrees[0]);
         return;
+      } else if (currentNode.Symbol is InvokeFunction) {
+        var invokeNode = currentNode as InvokeFunctionTreeNode;
+        var funBranch = (from node in expression.Root.SubTrees
+                         let funNode = node as DefunTreeNode
+                         where funNode != null
+                         where funNode.Name == invokeNode.InvokedFunctionName
+                         select funNode).FirstOrDefault();
+        if (funBranch == null) throw new InvalidOperationException("Can't find definition of function " + invokeNode.InvokedFunctionName);
+        nodeStack.Push(funBranch.SubTrees[0]);
+        foreach (var subTree in invokeNode.SubTrees)
+          nodeStack.Push(subTree);
+      } else if(currentNode.Symbol is Argument) {
+        // do nothing
       } else {
         throw new InvalidOperationException(currentNode.Symbol.ToString());