Changeset 15273 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter

Timestamp:

07/19/17 12:55:58 (7 years ago)

Author:

pkimmesw

Message:

#2665 Started Plush Encoding, Added Zero Error Individual Count Analyzer

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter

Files:

• Extensions.cs (modified) (2 diffs)
• IPushInterpreter.cs (modified) (2 diffs)
• PooledPushInterpreter.cs (modified) (1 diff)
• PushInterpreter.cs (modified) (5 diffs)
• PushInterpreterPool.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs

@@ -8 +8 @@
 
   using Attributes;
+
+  using HeuristicLab.BenchmarkSuite;
 
   using Stack;
@@ -60 +62 @@
       }
     }
+
+    public static void InitExample(this IPushInterpreter interpreter, Example example) {
+      interpreter.BooleanStack.Push(example.InputBoolean);
+      interpreter.IntegerStack.Push(example.InputInteger);
+      interpreter.FloatStack.Push(example.InputFloat);
+      interpreter.CharStack.Push(example.InputChar);
+      interpreter.StringStack.Push(example.InputString);
+      interpreter.StringVectorStack.Push(example.InputStringVector);
+      interpreter.IntegerVectorStack.Push(example.InputIntegerVector);
+      interpreter.FloatVectorStack.Push(example.InputFloatVector);
+
+      interpreter.SetInput(
+        integers: example.InputInteger,
+        floats: example.InputFloat,
+        booleans: example.InputBoolean,
+        chars: example.InputChar,
+        strings: example.InputString,
+        integerVectors: example.InputIntegerVector,
+        floatVectors: example.InputFloatVector,
+        stringVectors: example.InputStringVector);
+    }
   }
 }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/IPushInterpreter.cs

@@ -11 +11 @@
 
   public interface IPushInterpreter {
-    IRandom Random { get; set; }
+    IRandom Random { get; }
     IPushStack<Expression> CodeStack { get; }
     IPushStack<Expression> ExecStack { get; }
@@ -28 +28 @@
     IReadOnlyDictionary<StackTypes, IPushStack> Stacks { get; }
     IReadOnlyPushConfiguration Configuration { get; }
-    void Clear();
-    void Reset();
+    void ClearStacks();
+    void Reset(IRandom random = null);
 
     void SetInput(

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PooledPushInterpreter.cs

@@ -15 +15 @@
     public override void Dispose() {
       base.Dispose();
-      Clear();
+      ClearStacks();
       pool.Free(this);
     }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs

@@ -19 +19 @@
     private Expression currentProgram;
 
+    /// <summary>
+    /// An interpreter for Push
+    /// </summary>
+    /// <param name="config">Determines the runtime behavior of the interpreter</param>
+    /// <param name="random">Note that random may be reseted</param>
+    /// <param name="poolContainer">Used to save resources used by the interpreter</param>
     public PushInterpreter(IReadOnlyPushConfiguration config = null, IRandom random = null, InterpreterPoolContainer poolContainer = null) {
-      Random = random ?? new MersenneTwister();
+      randomOrigin = random ?? new MersenneTwister();
+      Random = (IRandom)randomOrigin.Clone();
       Configuration = config ?? new PushConfiguration();
 
@@ -69 +76 @@
     public IReadOnlyDictionary<StackTypes, IPushStack> Stacks { get; private set; }
 
-    public IRandom Random { get; set; }
+    private IRandom randomOrigin;
+    public IRandom Random { get; private set; }
 
     public long ExecCounter { get; private set; }
@@ -330 +338 @@
 
     /// <summary>
-    /// Reset while interpreter
+    /// Reset interpreter which clears and reconfigures stacks and local variables
     /// </summary>
-    public void Reset() {
+    public void Reset(IRandom random = null) {
+      if (random != null)
+        randomOrigin = random;
+
+      // Reset Random
+      Random = (IRandom)randomOrigin.Clone();
+
       ExecCounter = 0;
       IsAborted = false;
@@ -340 +354 @@
 
       inputExpressions.Clear();
-      Clear();
+      ClearStacks();
       ConfigureStacks();
     }
@@ -357 +371 @@
     /// Clears Stacks and custom expressions
     /// </summary>
-    public void Clear() {
+    public void ClearStacks() {
       for (var i = 0u; i < supportedStackTypes.Length; i++) {
         var key = supportedStackTypes[i];

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreterPool.cs

@@ -5 +5 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Random;
 
   public class PushInterpreterPool {
@@ -33 +32 @@
     public PooledPushInterpreter Create(IRandom random = null) {
       var interpreter = pool.Allocate();
-      interpreter.Random = random ?? new MersenneTwister();
-      interpreter.Reset();
+      interpreter.Reset(random);
 
       return interpreter;
@@ -40 +38 @@
 
     public void Free(PooledPushInterpreter interpreter) {
-      interpreter.Random = null;
+      interpreter.ClearStacks();
       pool.Free(interpreter);
     }