Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreterPool.cs

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreterPool.cs (modified) (3 diffs)

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

@@ -11 +11 @@
 
     public readonly ManagedPoolProvider<PushProgram> PushProgramPoolProvider;
-    public readonly ManagedPoolProvider<LoopState> LoopStatePoolProvider;
     public readonly ManagedPoolProvider<PooledList<Expression>> ExpressionListPoolProvider;
 
@@ -19 +18 @@
 
     public PushInterpreterPool(int size, int poolPartitionSize, int? maxPartitionCount = null, IReadOnlyPushConfiguration config = null) {
-      PushGpConfiguration = config ?? new PushConfiguration();
+      PushConfiguration = config ?? new PushConfiguration();
 
       PushProgramPoolProvider = new ManagedPoolProvider<PushProgram>(poolPartitionSize, () => new PushProgram(), maxPartitionCount);
-      LoopStatePoolProvider = new ManagedPoolProvider<LoopState>(poolPartitionSize, () => new LoopState(), maxPartitionCount);
-      ExpressionListPoolProvider = new ManagedPoolProvider<PooledList<Expression>>(poolPartitionSize * 2, () => new PooledList<Expression>(), maxPartitionCount);
+      ExpressionListPoolProvider = new ManagedPoolProvider<PooledList<Expression>>(poolPartitionSize, () => new PooledList<Expression>(), maxPartitionCount);
 
       pool = new ObjectPool<PooledPushInterpreter>(() => {
-        var poolContainer = new InterpreterPoolContainer(PushProgramPoolProvider, LoopStatePoolProvider, ExpressionListPoolProvider);
-        return new PooledPushInterpreter(this, PushGpConfiguration, poolContainer);
+        var poolContainer = new InterpreterPoolContainer(PushProgramPoolProvider, ExpressionListPoolProvider);
+        return new PooledPushInterpreter(this, PushConfiguration, poolContainer);
       }, size);
     }
 
-    public IReadOnlyPushConfiguration PushGpConfiguration { get; private set; }
+    public IReadOnlyPushConfiguration PushConfiguration { get; private set; }
 
     public PooledPushInterpreter Create(IRandom random = null) {
@@ -41 +39 @@
 
     public void Free(PooledPushInterpreter interpreter) {
+      interpreter.Random = null;
       pool.Free(interpreter);
+    }
+
+    public void Clear() {
+      PushProgramPoolProvider.Clear();
+      ExpressionListPoolProvider.Clear();
     }
   }