Changeset 14744 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/YankDuplicateExpressions.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/YankDuplicateExpressions.cs (modified) (8 diffs)

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

@@ -10 +10 @@
   /// <typeparam name="T">Stacktype</typeparam>
   public abstract class YankDuplicateExpression<T> : StatelessExpression {
-    public void Eval(IStack<T> stack, IStack<long> integerStack) {
+    public bool Eval(IStack<T> stack, IStack<long> integerStack) {
       T item;
-      if (this.TryGetItem(stack, integerStack, out item)) stack.Push(item);
+      if (!this.TryGetItem(stack, integerStack, out item))
+        return false;
+
+      stack.Push(item);
+      return true;
     }
 
-    public void Eval(IStack<Expression> stack, IStack<long> integerStack) {
+    public bool Eval(IStack<Expression> stack, IStack<long> integerStack) {
       Expression item;
-      if (this.TryGetItem(stack, integerStack, out item)) stack.Push(item);
+      if (!this.TryGetItem(stack, integerStack, out item))
+        return false;
+
+      stack.Push(item);
+      return true;
     }
 
-    public void Eval(IStack<long> integerStack) {
+    public bool Eval(IStack<long> integerStack) {
       if ((integerStack.Count < 2) || (integerStack.Top > integerStack.Count - 2) ||
-          (integerStack.Top < 0)) return;
+          (integerStack.Top < 0)) return false;
 
       var index = (int)integerStack.Pop();
@@ -28 +36 @@
 
       integerStack.Push(item);
+      return true;
     }
 
@@ -48 +57 @@
   [PushExpression(StackType.Integer, "INTEGER.YANKDUP")]
   public class IntegerYankDuplicateExpression : YankDuplicateExpression<long> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.IntegerStack);
     }
   }
@@ -55 +64 @@
   [PushExpression(StackType.Float, "FLOAT.YANKDUP")]
   public class FloatYankDuplicateExpression : YankDuplicateExpression<double> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
     }
   }
@@ -62 +71 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.YANKDUP")]
   public class BooleanYankDuplicateExpression : YankDuplicateExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     }
   }
@@ -69 +78 @@
   [PushExpression(StackType.Name, "NAME.YANKDUP")]
   public class NameYankDuplicateExpression : YankDuplicateExpression<string> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.NameStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.NameStack, interpreter.IntegerStack);
     }
   }
@@ -76 +85 @@
   [PushExpression(StackType.Exec, "EXEC.YANKDUP")]
   public class ExecYankDuplicateExpression : YankDuplicateExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
     }
   }
@@ -83 +92 @@
   [PushExpression(StackType.Code, "CODE.YANKDUP")]
   public class CodeYankDuplicateExpression : YankDuplicateExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
     }
   }