Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/RandExpressions.cs

Timestamp:

04/10/17 00:27:31 (7 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

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

@@ -2 +2 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
+  using HeuristicLab.Random;
 
   /// <summary>
@@ -10 +12 @@
   [PushExpression(StackTypes.Name, "NAME.RAND")]
   public class NameRandExpression : StatelessExpression {
-    public override bool Eval(IPushInterpreter interpreter) {
-      var name = NameGenerator.RandomName(interpreter.Random);
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (!interpreter.Configuration.ErcOptions.NameErcOptions.IsEnabled)
+        return false;
+
+      var name = interpreter.CustomExpressions.Count == 0 || interpreter.Random.NextDouble() < interpreter.Configuration.ErcOptions.NameErcOptions.NewNameProbability
+                   ? ErcUtils.GetName(interpreter.Configuration.ErcOptions.NameErcOptions, interpreter.Random)
+                   : interpreter.CustomExpressions.Keys.SampleRandom(interpreter.Random);
 
       interpreter.NameStack.Push(name);
@@ -23 +30 @@
   [PushExpression(StackTypes.Integer, "INTEGER.RAND")]
   public class IntegerRandExpression : StatelessExpression {
-    public override bool Eval(IPushInterpreter interpreter) {
-      var value = interpreter.Random.Next(
-          interpreter.Configuration.MinRandomInteger,
-          interpreter.Configuration.MaxRandomInteger);
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (!interpreter.Configuration.ErcOptions.IntegerErcOptions.IsEnabled)
+        return false;
 
+      var value = ErcUtils.GetInteger(interpreter.Configuration.ErcOptions.IntegerErcOptions, interpreter.Random);
       interpreter.IntegerStack.Push(value);
       return true;
@@ -38 +45 @@
   [PushExpression(StackTypes.Float, "FLOAT.RAND")]
   public class FloatRandExpression : StatelessExpression {
-    public override bool Eval(IPushInterpreter interpreter) {
-      var value = interpreter.Random.NextDouble() * (interpreter.Configuration.MaxRandomFloat - interpreter.Configuration.MinRandomFloat) + interpreter.Configuration.MinRandomFloat;
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (!interpreter.Configuration.ErcOptions.FloatErcOptions.IsEnabled)
+        return false;
 
+      var value = ErcUtils.GetDouble(interpreter.Configuration.ErcOptions.FloatErcOptions, interpreter.Random);
       interpreter.FloatStack.Push(value);
       return true;
@@ -51 +60 @@
   [PushExpression(StackTypes.Boolean, "BOOLEAN.RAND")]
   public class BooleanRandExpression : StatelessExpression {
-    public override bool Eval(IPushInterpreter interpreter) {
-      var value = interpreter.Random.NextDouble() > 0.5;
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (!interpreter.Configuration.ErcOptions.BooleanErcOptions.IsEnabled)
+        return false;
 
+      var value = ErcUtils.GetBoolean(interpreter.Configuration.ErcOptions.BooleanErcOptions, interpreter.Random);
       interpreter.BooleanStack.Push(value);
       return true;
@@ -64 +75 @@
   [PushExpression(StackTypes.Code, "CODE.RAND")]
   public class CodeRandExpression : StatelessExpression {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       if (interpreter.IntegerStack.Count == 0 ||
           interpreter.IntegerStack.Top < 1) return false;