Changeset 14744 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.cs

Timestamp:

03/10/17 21:42:09 (7 years ago)

Author:

pkimmesw

Message:

#2665 Renamings due to typos, ManagedPool tests, Skip Noops in Debugger

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.cs (modified) (7 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.cs

@@ -10 +10 @@
   /// <typeparam name="T">Stacktype</typeparam>
   public abstract class SwapExpression<T> : StatelessExpression {
-    public void Eval(IStack<T> stack) {
+    public bool Eval(IStack<T> stack) {
       if (stack.Count < 2)
-        return;
+        return false;
 
       stack.Swap(2);
+      return true;
     }
   }
@@ -20 +21 @@
   [PushExpression(StackType.Integer, "INTEGER.SWAP")]
   public class IntegerSwapExpression : SwapExpression<long> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.IntegerStack);
     }
   }
@@ -27 +28 @@
   [PushExpression(StackType.Float, "FLOAT.SWAP")]
   public class FloatSwapExpression : SwapExpression<double> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.FloatStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.FloatStack);
     }
   }
@@ -34 +35 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.SWAP")]
   public class BooleanSwapExpression : SwapExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.BooleanStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack);
     }
   }
@@ -41 +42 @@
   [PushExpression(StackType.Name, "NAME.SWAP")]
   public class NameSwapExpression : SwapExpression<string> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.NameStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.NameStack);
     }
   }
@@ -48 +49 @@
   [PushExpression(StackType.Exec, "EXEC.SWAP")]
   public class ExecSwapExpression : SwapExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.ExecStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.ExecStack);
     }
   }
@@ -55 +56 @@
   [PushExpression(StackType.Code, "CODE.SWAP")]
   public class CodeSwapExpression : SwapExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.CodeStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.CodeStack);
     }
   }