Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

Location:

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

Files:

• Pool/IPooledObject.cs (modified) (1 diff)
• Pool/ManagedPoolProvider.cs (modified) (6 diffs)
• Pool/ObjectPool.cs (modified) (2 diffs)
• Pool/PooledList.cs (modified) (1 diff)
• Pool/PooledObject.cs (modified) (1 diff)
• Tree/TreeExtensions.cs (modified) (1 diff)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool {
   public interface IPooledObject {
+    void Init();
     void Reset();
   }

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

@@ -10 +10 @@
   public interface IManagedPool<T> : IDisposable where T : class, IPooledObject {
     T Get(bool reset = true);
+    void Release();
   }
 
@@ -17 +18 @@
     private readonly BinaryFormatter binaryFormatter = new BinaryFormatter();
     private byte[] dummyPartition;
+    private static volatile object dummyCreationLockObject = new object();
 
     private static readonly FieldInfo InternalListArrayProperty = typeof(List<T[]>).GetField(
@@ -37 +39 @@
     public int InstanceCount { get { return partitions.Count * PartitionSize; } }
 
-    private void InitDummyPartition(Func<T> factory) {
-      var temp = new T[PartitionSize];
-
-      for (var i = 0u; i < PartitionSize; i++) {
-        temp[i] = factory();
-      }
-
-      using (var memoryStream = new MemoryStream()) {
-        binaryFormatter.Serialize(memoryStream, temp);
-        dummyPartition = memoryStream.ToArray();
-      }
-    }
-
     public void Clear() {
+      dummyPartition = null;
+      managedPools.Clear();
       partitions.Clear();
     }
@@ -65 +56 @@
 
     private T[] CloneDummyPartition() {
-      if (dummyPartition == null)
-        InitDummyPartition(factory);
+      if (dummyPartition == null) {
+        lock (dummyCreationLockObject) {
+          if (dummyPartition == null) {
+            var temp = new T[PartitionSize];
+
+            for (var i = 0u; i < PartitionSize; i++) {
+              temp[i] = factory();
+            }
+
+            using (var memoryStream = new MemoryStream()) {
+              binaryFormatter.Serialize(memoryStream, temp);
+              dummyPartition = memoryStream.ToArray();
+            }
+          }
+        }
+      }
 
       using (var memoryStream = new MemoryStream(dummyPartition)) {
         memoryStream.Seek(0, SeekOrigin.Begin);
 
-        return (T[])binaryFormatter.Deserialize(memoryStream);
+        var result = (T[])binaryFormatter.Deserialize(memoryStream);
+
+        for (var i = 0; i < result.Length; i++)
+          result[i].Init();
+
+        return result;
       }
     }
@@ -102 +112 @@
       }
 
-      public void Dispose() {
+      public void Release() {
         if (partitions.Count > 0) {
           provider.ReleasePartitions(partitions);
@@ -109 +119 @@
           entryIndex = provider.PartitionSize;
         }
+      }
+
+      public void Dispose() {
+        Release();
 
         provider.managedPools.Free(this);

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

@@ -6 +6 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool {
+  using System.Collections.Generic;
   using System.Threading;
 
@@ -102 +103 @@
       }
     }
+
+    public void Clear() {
+      for (int i = 0; i < _items.Length; i++) {
+        _items[i] = default(Element);
+      }
+    }
+
+    public IEnumerable<T> Items
+    {
+      get
+      {
+        var items = _items;
+        for (var i = 0; i < items.Length; i++) {
+          if (items[i].Value != null) {
+            yield return items[i].Value;
+          }
+        }
+      }
+    }
   }
 }

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

@@ -6 +6 @@
   [Serializable]
   public class PooledList<T> : List<T>, IPooledObject {
-    public void Reset() {
+    public Guid Id { get; private set; }
+
+    void IPooledObject.Init() {
+      Id = Guid.NewGuid();
+    }
+
+    void IPooledObject.Reset() {
       Clear();
     }

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

@@ -20 +20 @@
     }
 
+    void IPooledObject.Init() { }
+
     public void Reset() {
       resetor(item);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree/TreeExtensions.cs

@@ -81 +81 @@
       }
 
-      return new PushProgram(expressions.ToArray());
+      return new PushProgram(expressions.ToList());
     }
   }