Changeset 14747 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push

Timestamp:

03/12/17 13:16:56 (8 years ago)

Author:

pkimmesw

Message:

#2665 fixed enable/disable issue for single instruction in selection view

Location:

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

Files:

• Configuration/PushConfiguration.cs (modified) (3 diffs)
• Data/Pool/ManagedPoolProvider.cs (modified) (3 diffs)
• Interpreter/PooledPushInterpreter.cs (modified) (2 diffs)
• Interpreter/PushInterpreter.cs (modified) (5 diffs)
• Interpreter/PushInterpreterPool.cs (modified) (1 diff)
• Problem/PushProblem.cs (modified) (5 diffs)
• Views/ExpressionSelectionView.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs

@@ -58 +58 @@
       this.isNameStackEnabled = origin.IsNameStackEnabled;
       this.isCodeStackEnabled = origin.IsCodeStackEnabled;
-      this.isExecStackEnabled = origin.IsExecStackEnable;
+      this.isExecStackEnabled = origin.IsExecStackEnabled;
     }
 
@@ -155 +155 @@
     private bool isExecStackEnabled = true;
 
-    public bool IsExecStackEnable
+    public bool IsExecStackEnabled
     {
       get
@@ -347 +347 @@
           IsCodeStackEnabled = value;
           break;
+        case StackType.Exec:
+          this.IsExecStackEnabled = value;
+          break;
         default: throw new InvalidOperationException("Stacktype unkown");
       }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Pool/ManagedPoolProvider.cs

@@ -21 +21 @@
     public const int DefaultMaxInstanceCount = 65536;
 
-    public ManagedPoolProvider(int partitionSize, int maxPartitionCount = -1) {
+    public ManagedPoolProvider(int partitionSize, int? maxPartitionCount = null) {
       PartitionSize = partitionSize;
+      MaxParitionCount = maxPartitionCount ?? DefaultMaxInstanceCount / PartitionSize;
 
-      if (maxPartitionCount <= 0) {
-        MaxParitionCount = DefaultMaxInstanceCount / PartitionSize;
-      }
-
-      managedPools = new ObjectPool<IManagedPool<T>>(() => new ManagedPool2<T>(this));
+      managedPools = new ObjectPool<IManagedPool<T>>(() => new ManagedPool<T>(this));
     }
 
@@ -65 +62 @@
     }
 
-    private class ManagedPool2<T> : IManagedPool<T> where T : class {
+    private class ManagedPool<T> : IManagedPool<T> where T : class {
       private readonly ManagedPoolProvider<T> provider;
       private readonly IList<T[]> partitions = new List<T[]>();
@@ -71 +68 @@
       private int entryIndex;
 
-      public ManagedPool2(ManagedPoolProvider<T> provider) {
+      public ManagedPool(ManagedPoolProvider<T> provider) {
         this.provider = provider;
         entryIndex = provider.PartitionSize;

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 {
@@ -9 +11 @@
     private readonly PushInterpreterPool pool;
 
-    public PooledPushInterpreter(PushInterpreterPool pool, PushConfiguration config, IRandom random = null)
-      : base(config, random) {
+    public PooledPushInterpreter(PushInterpreterPool pool, PushConfiguration config, ManagedPoolProvider<PushProgram> pushProgramPoolProvider, IRandom random = null)
+      : base(config, random, pushProgramPoolProvider) {
       this.pool = pool;
     }

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

@@ -19 +19 @@
     private Task currentTask;
 
-    public PushInterpreter(IReadonlyPushConfiguration config = null, IRandom random = null) {
+    public PushInterpreter(IReadonlyPushConfiguration config = null, IRandom random = null, ManagedPoolProvider<PushProgram> pushProgramPoolProvider = null) {
       Random = random ?? new FastRandom();
 
@@ -45 +45 @@
 
       CustomExpressions = new Dictionary<string, Expression>();
+
+      PushProgramPoolProvider = pushProgramPoolProvider ?? new ManagedPoolProvider<PushProgram>(1024);
+
+      if (pushProgramPoolProvider == null)
+      {
+        PushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
+      }
     }
 
@@ -86 +93 @@
     }
 
-    public IManagedPool<PushProgram> PushProgramPool { get; set; }
+    private readonly ManagedPoolProvider<PushProgram> PushProgramPoolProvider;
+    public IManagedPool<PushProgram> PushProgramPool { get; private set; }
 
     public IReadonlyPushConfiguration Configuration { get; protected set; }
@@ -127 +135 @@
 
     public void Run(Expression program, bool stepwise = false) {
-      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();
+      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();
+      }
     }
 
@@ -146 +156 @@
 
       IsAborted = true;
+
+      if (PushProgramPool != null) PushProgramPool.Dispose();
 
       if (currentTask != null) await currentTask;

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter {
   using System;
-
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Core;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Random;
 
   public class PushInterpreterPool {
     private readonly ObjectPool<PooledPushInterpreter> pool;
+    private ManagedPoolProvider<PushProgram> pushProgramPoolProvider;
 
     public PushInterpreterPool(PushConfiguration config = null)
-      : this(Environment.ProcessorCount * 2, config) {
+      : this(Environment.ProcessorCount * 2, 1024, null, config) {
     }
 
-    public PushInterpreterPool(int size, PushConfiguration config = null) {
-      this.PushGpConfiguration = config ?? new PushConfiguration();
+    public PushInterpreterPool(int size, int pushProgramPoolPartitionSize, int? maxPartitionCount = null, PushConfiguration config = null) {
+      PushGpConfiguration = config ?? new PushConfiguration();
 
-      this.pool = new ObjectPool<PooledPushInterpreter>(() => new PooledPushInterpreter(this, this.PushGpConfiguration), size);
+      pushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(pushProgramPoolPartitionSize, maxPartitionCount);
+      pushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
+
+      pool = new ObjectPool<PooledPushInterpreter>(() => new PooledPushInterpreter(this, PushGpConfiguration, pushProgramPoolProvider), size);
     }
 

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs

@@ -8 +8 @@
   using Core;
   using Encodings.IntegerVectorEncoding;
-  using Expressions;
 
   using HeuristicLab.BenchmarkSuite;
   using HeuristicLab.Data;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
 
   using Instances;
@@ -28 +26 @@
     private readonly PushConfiguration config;
     private PushInterpreterPool pool;
-    private ManagedPoolProvider<PushProgram> pushProgramPoolProvider;
 
     public PushProblem() {
       config = new PushConfiguration();
-      pool = new PushInterpreterPool(config);
-
-      pushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(1024);
-      pushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
+      pool = new PushInterpreterPool(10000, 1024, 65536, config);
 
       InitEvents();
@@ -50 +44 @@
       : base(original, cloner) {
       config = cloner.Clone(original.config);
-      pool = new PushInterpreterPool(config);
+      pool = new PushInterpreterPool(65536, 1024, 65536, config);
 
       Instructions = config;
@@ -62 +56 @@
       pool = new PushInterpreterPool(config);
       Instructions = config;
-
-      pushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(1024);
-      pushProgramPoolProvider.InitDummyPartition(() => new PushProgram());
 
       InitEvents();
@@ -426 +417 @@
           interpreter.FloatStack.Push(example.InputFloat);
 
-          using (interpreter.PushProgramPool = pushProgramPoolProvider.CreatePool()) {
-            interpreter.Run(program);
-          }
+          interpreter.Run(program);
 
           result += GetDiff(example.OutputInt, interpreter.IntegerStack, DataDescriptor.WorstResult, LongDiffer)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/ExpressionSelectionView.cs

@@ -57 +57 @@
       } else {
         if (e.Node.Checked) {
-          Content.EnableExpression(e.Node.Name);
+          Content.EnableExpression(e.Node.Text);
         } else {
-          Content.DisableExpression(e.Node.Name);
+          Content.DisableExpression(e.Node.Text);
         }
       }