Changeset 14392 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Interpreter

Timestamp:

11/15/16 21:10:17 (8 years ago)

Author:

pkimmesw

Message:

#2665 Full Push 3.0 instruction set and tests; Added first benchmark test (count odds) for random walk tests;

Location:

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Interpreter

Files:

• Configuration.cs (modified) (6 diffs)
• IInterpreter.cs (modified) (3 diffs)
• Interpreter.cs (deleted)
• PushGPInterpreter.cs (added)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Interpreter/Configuration.cs

@@ -4 +4 @@
 namespace HeuristicLab.Algorithms.PushGP.Interpreter
 {
-    public class Configuration : Generators.Configuration
+    public class Configuration
     {
         public Configuration()
@@ -14 +14 @@
             this.IsNameStackEnabled = true;
 
-            this.EvalPushLimit = uint.MaxValue;
-            this.MaxPointsInProgram = uint.MaxValue;
-            this.MaxPointsInRandomExpression = uint.MaxValue;
+            this.EvalPushLimit = 1024;
+            this.MaxPointsInProgram = 4096;
+            this.MaxPointsInRandomExpression = 4096;
 
             this.TopLevelPushCode = true;
-            this.TopLevelPopCode = true;
+            this.TopLevelPopCode = false;
 
             this.RandomSeedMax = 30081;
             this.RandomSeedMin = 0;
             this.RandomSeed = null;
+
+            this.MinRandomInteger = -128;
+            this.MaxRandomInteger = 128;
+            this.MinRandomFloat = -128D;
+            this.MaxRandomFloat = 128D;
+            this.NewErcNameProbability = 0.5;
         }
 
@@ -32 +38 @@
         public bool IsNameStackEnabled { get; set; }
 
-        public IList<OpCode> AllowedInclassions { get; set; }
+        public IList<string> AllowedInstructions { get; set; }
 
         public IList<Expression> PredefinedExpressions { get; set; }
@@ -38 +44 @@
         /// <summary>
         /// This is the maximum allowed number of "executions" in a single top-level call to the interpreter.
-        /// The execution of a single Push inclassion counts as one execution, as does the processing of a single literal,
+        /// The execution of a single Push instruction counts as one execution, as does the processing of a single literal,
         /// as does the descent into one layer of parentheses (that is, the processing of the "(" counts as one execution).
         /// When this limit is exceeded the interpreter aborts immediately, leaving its stacks in the states they were in prior
@@ -48 +54 @@
         /// <summary>
         /// This is the maximum size of an item on the CODE stack, expressed as a number of points.
-        /// A point is an inclassion, a literal, or a pair of parentheses. Any inclassion that would cause this limit to be exceeded
-        /// should instead act as a NOOP, leaving all stacks in the states that they were in before the execution of the inclassion.
+        /// A point is an instruction, a literal, or a pair of parentheses. Any instruction that would cause this limit to be exceeded
+        /// should instead act as a NOOP, leaving all stacks in the states that they were in before the execution of the instruction.
         /// </summary>
         public uint MaxPointsInProgram { get; set; }
 
         /// <summary>
-        /// The maximum number of points in an expression produced by the CODE.RAND inclassion.
+        /// The maximum number of points in an expression produced by the CODE.RAND instruction.
         /// </summary>
         public uint MaxPointsInRandomExpression { get; set; }
@@ -69 +75 @@
         public bool TopLevelPopCode { get; set; }
 
+        /// <summary>
+        /// The minimum INTEGER that will be produced as an ephemeral random INTEGER constant or from a call to INTEGER.RAND.
+        /// </summary>
+        public int MinRandomInteger { get; set; }
+
+        /// <summary>
+        /// The maximum INTEGER that will be produced as an ephemeral random INTEGER constant or from a call to INTEGER.RAND.
+        /// </summary>
+        public int MaxRandomInteger { get; set; }
+
+        /// <summary>
+        /// The minimum FLOAT that will be produced as an ephemeral random FLOAT constant or from a call to FLOAT.RAND.
+        /// </summary>
+        public double MinRandomFloat { get; set; }
+
+        /// <summary>
+        /// The maximum FLOAT that will be produced as an ephemeral random FLOAT constant or from a call to FLOAT.RAND.
+        /// </summary>
+        public double MaxRandomFloat { get; set; }
+
+        /// <summary>
+        /// The probability that the selection of the ephemeral
+        /// random NAME constant for inclusion in randomly generated code will produce a new name
+        /// (rather than a name that was previously generated).
+        /// </summary>
+        public double NewErcNameProbability { get; set; }
+
         public ushort RandomSeedMax { get; set; }
         public ushort RandomSeedMin { get; set; }

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Interpreter/IInterpreter.cs

@@ -3 +3 @@
 using System.Threading.Tasks;
 using HeuristicLab.Algorithms.PushGP.Expressions;
+using HeuristicLab.Algorithms.PushGP.Generators;
 using HeuristicLab.Algorithms.PushGP.Stack;
 
@@ -15 +16 @@
         IStack<long> IntegerStack { get; }
         IStack<double> FloatStack { get; }
+        IDictionary<string, Expression> CustomExpressions { get; }
 
-        IDictionary<string, Expression> CustomExpressions { get; }
+        Configuration Configuration { get; }
+
+        CodeGenerator CodeGenerator { get; }
+
+        bool IsNameQuoteFlagSet { get; set; }
 
         void Interpret(string code);
@@ -22 +28 @@
         void Interpret(Expression program);
         Task InterpretAsync(Expression program, bool paused = false, CancellationToken token = default(CancellationToken));
-        Task AbortAndReset();
+        Task AbortAndResetAsync();
         Task AbortAsync();
         Task PauseAsync();