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

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

@@ -10 +10 @@
 
   public class ExecExpandExpression : StatefulExpression<PushProgram> {
-    public static readonly ExecExpandExpression Empty = new ExecExpandExpression();
+    public static readonly ExecExpandExpression Empty = new ExecExpandExpression(PushProgram.Empty);
 
     public ExecExpandExpression(PushProgram program)
@@ -32 +32 @@
     }
 
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       interpreter.ExecStack.Push(this.State.Expressions);
+      return true;
     }
 
@@ -81 +82 @@
   [PushExpression(StackType.Exec, "EXEC.IF")]
   public class ExecIfExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       // not enough arguments on stack
-      if ((interpreter.BooleanStack.Count == 0) || (interpreter.ExecStack.Count < 2)) return;
+      if ((interpreter.BooleanStack.Count == 0) || (interpreter.ExecStack.Count < 2)) return false;
 
       var condition = interpreter.BooleanStack.Pop();
@@ -89 +90 @@
       if (condition) interpreter.ExecStack.RemoveAt(interpreter.ExecStack.Count - 2);
       else interpreter.ExecStack.RemoveTop();
+
+      return true;
     }
   }
@@ -98 +101 @@
   [PushExpression(StackType.Exec, "EXEC.Y")]
   public class ExecYExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       // not enough arguments on stack
       if (interpreter.ExecStack.Count == 0 ||
           interpreter.Configuration.MaxPointsInProgram < 2)
-        return;
+        return false;
 
       var top = interpreter.ExecStack.Top;
       var execYExpression = ExpressionTable.GetStatelessExpression<ExecYExpression>();
+
       var result = new ExecExpandExpression(top, execYExpression);
 
-      //interpreter.ExecStack.Insert(interpreter.ExecStack.Count - 1, result);
       interpreter.ExecStack.SetTop(result);
       interpreter.ExecStack.Add(top);
+
+      return true;
     }
   }
@@ -119 +124 @@
   [PushExpression(StackType.Exec, "EXEC.K")]
   public class ExecKExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
-      if (interpreter.ExecStack.Count < 2) return;
+    public override bool Eval(IPushInterpreter interpreter) {
+      if (interpreter.ExecStack.Count < 2) return false;
 
       var top = interpreter.ExecStack.Pop();
       interpreter.ExecStack.SetTop(top);
+
+      return true;
     }
   }
@@ -134 +141 @@
   [PushExpression(StackType.Exec, "EXEC.S")]
   public class ExecSExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
-      if (interpreter.ExecStack.Count < 3) return;
+    public override bool Eval(IPushInterpreter interpreter) {
+      if (interpreter.ExecStack.Count < 3) return false;
 
       var expression = interpreter.ExecStack.Pop(2);
@@ -146 +153 @@
       interpreter.ExecStack.SetTop(newTop);
       interpreter.ExecStack.Push(c, a);
+
+      return true;
     }
   }