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

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

@@ -5 +5 @@
 
   public abstract class PushResultExpression<T> : StatelessExpression {
-    protected void Eval(IStack<T> stack, int count, Func<T[], T> templateFunc) {
-      if (stack.Count < count) return;
+    protected bool Eval(IStack<T> stack, int count, Func<T[], T> templateFunc) {
+      if (stack.Count < count) return false;
 
       stack.PushResult(count, templateFunc);
+      return true;
     }
 
-    protected void Eval(IStack<T> stack, int count, Func<T[], T> templateFunc, T ignoreValue) {
-      if ((stack.Count < count) || stack.Top.Equals(ignoreValue)) return;
+    protected bool Eval(IStack<T> stack, int count, Func<T[], T> templateFunc, T ignoreValue) {
+      if ((stack.Count < count) || stack.Top.Equals(ignoreValue)) return false;
 
       stack.PushResult(count, templateFunc);
+      return true;
     }
 
-    protected void Eval<R>(IStack<T> stack, IStack<R> resultStack, int count, Func<T[], R> templateFunc) {
-      if (stack.Count < count) return;
+    protected bool Eval<R>(IStack<T> stack, IStack<R> resultStack, int count, Func<T[], R> templateFunc) {
+      if (stack.Count < count) return false;
 
       var items = stack.Pop(count);
@@ -24 +26 @@
 
       resultStack.Push(result);
+      return true;
     }
   }