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

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

@@ -10 +10 @@
   [PushExpression(StackType.Name, "NAME.RAND")]
   public class NameRandExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       var name = NameGenerator.RandomName(interpreter.Random);
 
       interpreter.NameStack.Push(name);
+      return true;
     }
   }
@@ -22 +23 @@
   [PushExpression(StackType.Integer, "INTEGER.RAND")]
   public class IntegerRandExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       var value = interpreter.Random.Next(
           interpreter.Configuration.MinRandomInteger,
@@ -28 +29 @@
 
       interpreter.IntegerStack.Push(value);
+      return true;
     }
   }
@@ -36 +38 @@
   [PushExpression(StackType.Float, "FLOAT.RAND")]
   public class FloatRandExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       var value = interpreter.Random.NextDouble() * (interpreter.Configuration.MaxRandomFloat - interpreter.Configuration.MinRandomFloat) + interpreter.Configuration.MinRandomFloat;
 
       interpreter.FloatStack.Push(value);
+      return true;
     }
   }
@@ -48 +51 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.RAND")]
   public class BooleanRandExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       var value = interpreter.Random.NextDouble() > 0.5;
 
       interpreter.BooleanStack.Push(value);
+      return true;
     }
   }
@@ -60 +64 @@
   [PushExpression(StackType.Code, "CODE.RAND")]
   public class CodeRandExpression : StatelessExpression {
-    public override void Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IPushInterpreter interpreter) {
       if (interpreter.IntegerStack.Count == 0 ||
-          interpreter.IntegerStack.Top < 1) return;
+          interpreter.IntegerStack.Top < 1) return false;
 
       var size = (int)(interpreter.IntegerStack.Pop() % interpreter.Configuration.MaxPointsInRandomExpression);
-      var program = CodeGenerator.RandomExpandExpression(size, interpreter.Random, interpreter.Configuration, interpreter.CustomExpressions);
+      var program = CodeGenerator.RandomExpandExpression(
+        size,
+        interpreter.Random,
+        interpreter.Configuration,
+        interpreter.CustomExpressions);
 
       interpreter.CodeStack.Push(program);
+      return true;
     }
   }