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

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

@@ -10 +10 @@
   /// <typeparam name="T">Stacktype</typeparam>
   public abstract class StackdepthExpression<T> : StatelessExpression {
-    public void Eval(IStack<T> stack, IStack<long> integerStack, bool incremental = false) {
+    public bool Eval(IStack<T> stack, IStack<long> integerStack, bool incremental = false) {
       var count = stack.Count;
 
@@ -16 +16 @@
 
       integerStack.Push(count);
+      return true;
     }
   }
@@ -22 +23 @@
   public class IntegerStackdepthExpression : StackdepthExpression<long> {
 
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.IntegerStack, interpreter.IntegerStack, true);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.IntegerStack, interpreter.IntegerStack, true);
     }
   }
@@ -29 +30 @@
   [PushExpression(StackType.Float, "FLOAT.STACKDEPTH")]
   public class FloatStackdepthExpression : StackdepthExpression<double> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.FloatStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
     }
   }
@@ -36 +37 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.STACKDEPTH")]
   public class BooleanStackdepthExpression : StackdepthExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     }
   }
@@ -43 +44 @@
   [PushExpression(StackType.Name, "NAME.STACKDEPTH")]
   public class NameStackdepthExpression : StackdepthExpression<string> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.NameStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.NameStack, interpreter.IntegerStack);
     }
   }
@@ -50 +51 @@
   [PushExpression(StackType.Exec, "EXEC.STACKDEPTH")]
   public class ExecStackdepthExpression : StackdepthExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.ExecStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
     }
   }
@@ -57 +58 @@
   [PushExpression(StackType.Code, "CODE.STACKDEPTH")]
   public class CodeStackdepthExpression : StackdepthExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.CodeStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
     }
   }