Changeset 14328 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Code/CodeIfExpression.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/Code/CodeIfExpression.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Code/CodeIfExpression.cs

@@ -1 @@
-using HeuristicLab.Algorithms.PushGP.Stack;
+using HeuristicLab.Algorithms.PushGP.Interpreter;
 
-namespace HeuristicLab.Algorithms.PushGP.Expressions
+namespace HeuristicLab.Algorithms.PushGP.Expressions.Code
 {
     public class CodeIfExpression : Expression
     {
-        public CodeIfExpression() : base(OpCode.CodeIf)
-        { }
+        public override bool IsCodeOp { get { return true; } }
 
-        public override void Eval(IInterpreterService interpreterService)
+        public override void Eval(IInterpreter interpreter)
         {
             // not enough arguments on stack
-            if (interpreterService.BooleanStack.Count == 0 ||
-                interpreterService.CodeStack.Count < 2)
+            if (interpreter.BooleanStack.Count == 0 ||
+                interpreter.CodeStack.Count < 2)
                 return;
 
-            var condition = interpreterService.BooleanStack.Pop();
-            var expressionFalse = interpreterService.CodeStack.Pop();
-            var expressionTrue = interpreterService.CodeStack.Pop();
+            var condition = interpreter.BooleanStack.Pop();
+            var expressionFalse = interpreter.CodeStack.Pop();
+            var expressionTrue = interpreter.CodeStack.Pop();
 
-            interpreterService.ExecStack.Push(condition
+            interpreter.ExecStack.Push(condition
                 ? expressionTrue
                 : expressionFalse);
         }
+
+        public override string ToString()
+        {
+            return Symbols.CodeIf;
+        }
     }
 }