Changeset 14328 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Exec/ExecDoRangeExpression.cs

Timestamp:

10/08/16 12:04:25 (8 years ago)

Author:

pkimmesw

Message:

#2665 Set .NET version to 4.5, C# version to 5.0, Added expression templates and factory

File:

• branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Exec/ExecDoRangeExpression.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Exec/ExecDoRangeExpression.cs

@@ -1 @@
-using HeuristicLab.Algorithms.PushGP.Stack;
+using HeuristicLab.Algorithms.PushGP.Interpreter;
 
-namespace HeuristicLab.Algorithms.PushGP.Expressions
+namespace HeuristicLab.Algorithms.PushGP.Expressions.Exec
 {
     public class ExecDoRangeExpression : Expression
     {
-        public ExecDoRangeExpression() : base(OpCode.ExecDoXRange)
-        { }
+        public override bool IsCodeOp { get { return false; } }
 
-        public override void Eval(IInterpreterService interpreterService)
+        public override void Eval(IInterpreter interpreter)
         {
             // not enough arguments on stack
-            if (interpreterService.IntegerStack.Count < 2 ||
-                interpreterService.ExecStack.Count == 0)
+            if (interpreter.IntegerStack.Count < 2 ||
+                interpreter.ExecStack.Count == 0)
                 return;
 
-            var destinationIndex = interpreterService.IntegerStack.Pop();
-            var currentIndex = interpreterService.IntegerStack.Pop();
-            var loopBody = interpreterService.ExecStack.Pop();
+            var destinationIndex = interpreter.IntegerStack.Pop();
+            var currentIndex = interpreter.IntegerStack.Pop();
+            var loopBody = interpreter.ExecStack.Pop();
 
             if (destinationIndex == currentIndex)
             {
-                interpreterService.IntegerStack.Push(currentIndex);
-                interpreterService.ExecStack.Push(loopBody);
+                interpreter.IntegerStack.Push(currentIndex);
+                interpreter.ExecStack.Push(loopBody);
             }
             else
@@ -30 +29 @@
                     : currentIndex + 1;
 
-                interpreterService.IntegerStack.Push(currentIndex);
-                interpreterService.IntegerStack.Push(nextIndex);
-                interpreterService.IntegerStack.Push(destinationIndex);
+                interpreter.IntegerStack.Push(currentIndex);
+                interpreter.IntegerStack.Push(nextIndex);
+                interpreter.IntegerStack.Push(destinationIndex);
 
                 var expression = new ExecDoRangeExpression();
-                interpreterService.ExecStack.Push(loopBody);
-                interpreterService.ExecStack.Push(loopBody);
-                interpreterService.ExecStack.Push(expression);
+                interpreter.ExecStack.Push(loopBody);
+                interpreter.ExecStack.Push(loopBody);
+                interpreter.ExecStack.Push(expression);
             }
+        }
+
+        public override string ToString()
+        {
+            return Symbols.ExecDoXRange;
         }
     }