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

Timestamp:

03/23/17 01:11:18 (8 years ago)

Author:

pkimmesw

Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

Location:

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

Files:

• IPushInterpreter.cs (modified) (2 diffs)
• InterpreterPoolContainer.cs (added)
• PooledPushInterpreter.cs (modified) (2 diffs)
• PushInterpreter.cs (modified) (10 diffs)
• PushInterpreterPool.cs (modified) (1 diff)

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

@@ -20 +20 @@
     IStack<long> IntegerStack { get; }
     IStack<double> FloatStack { get; }
+    IStack<char> CharStack { get; }
+    IStack<string> StringStack { get; }
 
     IDictionary<string, Expression> CustomExpressions { get; }
 
-    IReadonlyPushConfiguration Configuration { get; }
+    IReadOnlyPushConfiguration Configuration { get; }
 
-    IManagedPool<PushProgram> PushProgramPool { get; }
+    InterpreterPoolContainer PoolContainer { get; }
 
     bool IsNameQuoteFlagSet { get; set; }
@@ -32 +34 @@
     void Run(string code, bool stepwise = false);
     void Run(Expression expression, bool stepwise = false);
-    //void Run(PushProgram program, bool stepwise = false);
-    //Task RunAsync(PushProgram program, bool paused = false, CancellationToken token = default(CancellationToken));
     Task RunAsync(Expression expression, bool paused = false, CancellationToken token = default(CancellationToken));
     Task RunAsync(string code, bool paused = false, CancellationToken token = default(CancellationToken));

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

@@ -4 +4 @@
   using HeuristicLab.Core;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
 
   public class PooledPushInterpreter : PushInterpreter, IDisposable {
@@ -11 +9 @@
     private readonly PushInterpreterPool pool;
 
-    public PooledPushInterpreter(PushInterpreterPool pool, PushConfiguration config, ManagedPoolProvider<PushProgram> pushProgramPoolProvider, IRandom random = null)
-      : base(config, random, pushProgramPoolProvider) {
+    public PooledPushInterpreter(PushInterpreterPool pool, IReadOnlyPushConfiguration config, InterpreterPoolContainer poolContainer, IRandom random = null)
+      : base(config, random, poolContainer) {
       this.pool = pool;
     }

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

@@ -3 +3 @@
   using System.Collections.Generic;
 #if DEBUG
-  using System.Linq;
 #endif
   using System.Runtime.CompilerServices;
@@ -10 +9 @@
   using HeuristicLab.Core;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Parser;
@@ -19 +17 @@
     private Task currentTask;
 
-    public PushInterpreter(IReadonlyPushConfiguration config = null, IRandom random = null, ManagedPoolProvider<PushProgram> pushProgramPoolProvider = null) {
+
+    public PushInterpreter(IReadOnlyPushConfiguration config = null, IRandom random = null, InterpreterPoolContainer poolContainer = null) {
       Random = random ?? new FastRandom();
 
@@ -43 +42 @@
         IsEnabled = Configuration.IsFloatStackEnabled
       };
+      CharStack = new PushStack<char> {
+        IsEnabled = Configuration.IsCharStackEnabled
+      };
+      StringStack = new PushStack<string> {
+        IsEnabled = Configuration.IsStringStackEnabled
+      };
 
       CustomExpressions = new Dictionary<string, Expression>();
 
-      PushProgramPoolProvider = pushProgramPoolProvider ?? new ManagedPoolProvider<PushProgram>(1024);
-
-      if (pushProgramPoolProvider == null)
-      {
-        PushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
-      }
-    }
-
-    public PushInterpreter(int seed, IReadonlyPushConfiguration config = null)
+      PoolContainer = poolContainer ?? new InterpreterPoolContainer();
+    }
+
+    public PushInterpreter(int seed, IReadOnlyPushConfiguration config = null)
       : this(config, new FastRandom(seed)) {
     }
@@ -93 +93 @@
     }
 
-    private readonly ManagedPoolProvider<PushProgram> PushProgramPoolProvider;
-    public IManagedPool<PushProgram> PushProgramPool { get; private set; }
-
-    public IReadonlyPushConfiguration Configuration { get; protected set; }
+    public InterpreterPoolContainer PoolContainer { get; private set; }
+
+    public IReadOnlyPushConfiguration Configuration { get; protected set; }
 
     public IStack<Expression> CodeStack { get; private set; }
@@ -109 +108 @@
 
     public IStack<double> FloatStack { get; private set; }
+    public IStack<char> CharStack { get; private set; }
+    public IStack<string> StringStack { get; private set; }
 
     public IDictionary<string, Expression> CustomExpressions { get; private set; }
@@ -133 +134 @@
     }
 
-
     public void Run(Expression program, bool stepwise = false) {
-      using (PushProgramPool = PushProgramPoolProvider.CreatePool()) {
-        IsPaused = stepwise;
-
-        /* Push top expression so the loop is able to enter
-         * If the top expression is a single statement then the loop has nothing to do
-         * Otherwise the expand expression will be evaluated and pushes code onto the EXEC stack */
-        ExecStack.Push(program);
-
-        if (Configuration.TopLevelPushCode) CodeStack.Insert(0, program);
-
-        // run top expression
-        DoStep();
-
-        Interpret();
-      }
+      PoolContainer.CreatePools();
+
+      IsPaused = stepwise;
+
+      /* Push top expression so the loop is able to enter
+       * If the top expression is a single statement then the loop has nothing to do
+       * Otherwise the expand expression will be evaluated and pushes code onto the EXEC stack */
+      ExecStack.Push(program);
+
+      if (Configuration.TopLevelPushCode) CodeStack.Insert(0, program);
+
+      // run top expression
+      DoStep();
+      Interpret();
+
+      PoolContainer.DisposePools();
     }
 
@@ -157 +158 @@
       IsAborted = true;
 
-      if (PushProgramPool != null) PushProgramPool.Dispose();
+      PoolContainer.DisposePools();
 
       if (currentTask != null) await currentTask;
@@ -213 +214 @@
       PrintStack("INTEGER", IntegerStack);
 
-      if (CustomExpressions.Count == 0) return;
-      Console.WriteLine("--------- Custom Expressions ---------");
-      foreach (var ce in CustomExpressions) {
-        Console.WriteLine("{0}: {1}", ce.Key, ce.Value);
+      if (CustomExpressions.Count > 0) {
+        Console.WriteLine("--------- Custom Expressions ---------");
+        foreach (var ce in CustomExpressions) {
+          Console.WriteLine("{0}: {1}", ce.Key, ce.Value);
+        }
       }
     }
@@ -272 +274 @@
       var expression = ExecStack.Pop();
 
-      if (ExecStack.Any(e => e == null)) {
-        throw new InvalidProgramException();
-      }
+      //if (ExecStack.Any(e => e == null)) {
+      //  throw new InvalidProgramException();
+      //}
 
       var succ = expression.Eval(this);
-      last = expression;
+      //last = expression;
 
       return succ;

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

@@ -9 +9 @@
   public class PushInterpreterPool {
     private readonly ObjectPool<PooledPushInterpreter> pool;
-    private ManagedPoolProvider<PushProgram> pushProgramPoolProvider;
 
-    public PushInterpreterPool(PushConfiguration config = null)
+    public readonly ManagedPoolProvider<PushProgram> PushProgramPoolProvider;
+    public readonly ManagedPoolProvider<LoopState> LoopStatePoolProvider;
+    public readonly ManagedPoolProvider<PooledList<Expression>> ExpressionListPoolProvider;
+
+
+    public PushInterpreterPool(IReadOnlyPushConfiguration config = null)
       : this(Environment.ProcessorCount * 2, 1024, null, config) {
     }
 
-    public PushInterpreterPool(int size, int pushProgramPoolPartitionSize, int? maxPartitionCount = null, PushConfiguration config = null) {
+    public PushInterpreterPool(int size, int pushProgramPoolPartitionSize, int? maxPartitionCount = null, IReadOnlyPushConfiguration config = null) {
       PushGpConfiguration = config ?? new PushConfiguration();
 
-      pushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(pushProgramPoolPartitionSize, maxPartitionCount);
-      pushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
+      PushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(pushProgramPoolPartitionSize, () => new PushProgram(), maxPartitionCount);
+      LoopStatePoolProvider = new ManagedPoolProvider<LoopState>(pushProgramPoolPartitionSize, () => new LoopState(), maxPartitionCount);
+      ExpressionListPoolProvider = new ManagedPoolProvider<PooledList<Expression>>(pushProgramPoolPartitionSize * 2, () => new PooledList<Expression>(), maxPartitionCount);
 
-      pool = new ObjectPool<PooledPushInterpreter>(() => new PooledPushInterpreter(this, PushGpConfiguration, pushProgramPoolProvider), size);
+      pool = new ObjectPool<PooledPushInterpreter>(() => {
+        var poolContainer = new InterpreterPoolContainer(PushProgramPoolProvider, LoopStatePoolProvider, ExpressionListPoolProvider);
+        return new PooledPushInterpreter(this, PushGpConfiguration, poolContainer);
+      }, size);
     }
 
-    public PushConfiguration PushGpConfiguration { get; private set; }
+    public IReadOnlyPushConfiguration PushGpConfiguration { get; private set; }
 
-    public PooledPushInterpreter GetInstance(IRandom random = null) {
+    public PooledPushInterpreter Create(IRandom random = null) {
       var interpreter = this.pool.Allocate();
       interpreter.Random = random ?? new FastRandom();