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

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

@@ -9 +9 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.AND")]
   public class BooleanAndExpression : PushResultExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.BooleanStack, 2, values => values[0] && values[1]);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack, 2, values => values[0] && values[1]);
     }
   }
@@ -19 +19 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.OR")]
   public class BooleanOrExpression : PushResultExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.BooleanStack, 2, values => values[0] || values[1]);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack, 2, values => values[0] || values[1]);
     }
   }
@@ -29 +29 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.NOT")]
   public class BooleanNotExpression : PushResultExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      this.Eval(interpreter.BooleanStack, 1, values => !values[0]);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack, 1, values => !values[0]);
     }
   }
@@ -39 +39 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.FROMFLOAT")]
   public class BooleanFromFloatExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
-      if (interpreter.FloatStack.Count == 0) return;
+    public override bool Eval(IPushInterpreter interpreter) {
+      if (interpreter.FloatStack.Count == 0) return false;
 
       var value = interpreter.FloatStack.Pop() != 0.0;
 
       interpreter.BooleanStack.Push(value);
+      return true;
     }
   }
@@ -53 +54 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.FROMINTEGER")]
   public class BooleanFromIntegerExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
-      if (interpreter.IntegerStack.Count == 0) return;
+    public override bool Eval(IPushInterpreter interpreter) {
+      if (interpreter.IntegerStack.Count == 0) return false;
 
       var value = interpreter.IntegerStack.Pop() != 0;
 
       interpreter.BooleanStack.Push(value);
+      return true;
     }
   }