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

Timestamp:

04/10/17 00:27:31 (8 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

Location:

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

Files:

• Pool/ManagedPoolProvider.cs (modified) (7 diffs)
• Pool/PooledObject.cs (added)
• Tree/TreeExtensions.cs (modified) (3 diffs)

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

@@ -5 +5 @@
   using System.Collections.Concurrent;
   using System.IO;
-  using System.Linq;
+  using System.Reflection;
   using System.Runtime.Serialization.Formatters.Binary;
 
@@ -18 +18 @@
     private byte[] dummyPartition;
 
+    private static readonly FieldInfo InternalListArrayProperty = typeof(List<T[]>).GetField(
+      "_items",
+      BindingFlags.NonPublic | BindingFlags.Instance);
+
     private readonly Func<T> factory;
 
@@ -29 +33 @@
       this.factory = factory;
 
-      managedPools = new ObjectPool<IManagedPool<T>>(() => new ManagedPool<T>(this), MaxParitionCount);
+      managedPools = new ObjectPool<IManagedPool<T>>(() => new ManagedPool(this));
     }
     public int InstanceCount { get { return partitions.Count * PartitionSize; } }
@@ -46 +50 @@
     }
 
-    public void ReleasePartitions(params T[][] partition) {
-      if (partitions.Count <= MaxParitionCount && partition.Length > 0)
-        partitions.PushRange(partition);
+    public void ReleasePartitions(List<T[]> releasedPartitions) {
+      if (partitions.Count < MaxParitionCount)
+        partitions.PushRange((T[][])InternalListArrayProperty.GetValue(releasedPartitions), 0, releasedPartitions.Count);
     }
 
@@ -71 +75 @@
     }
 
-    private class ManagedPool<T> : IManagedPool<T> where T : class, IPooledObject {
+    private class ManagedPool : IManagedPool<T> {
       private readonly ManagedPoolProvider<T> provider;
-      private readonly IList<T[]> partitions = new List<T[]>();
+      private readonly List<T[]> partitions = new List<T[]>();
       private T[] currentPartition;
       private int entryIndex;
@@ -82 +86 @@
       }
 
-      public T Get(bool reset = true) {
+      public T Get(bool resetEntry = true) {
         if (entryIndex == provider.PartitionSize) {
           currentPartition = provider.GetPartition();
@@ -90 +94 @@
 
         var entry = currentPartition[entryIndex++];
-
-        if (reset) entry.Reset();
-
+        if (resetEntry) entry.Reset();
         return entry;
       }
 
       public void Dispose() {
-        provider.ReleasePartitions(partitions.ToArray());
-        partitions.Clear();
-        entryIndex = provider.PartitionSize;
+        if (partitions.Count > 0) {
+          provider.ReleasePartitions(partitions);
+          partitions.Clear();
+          currentPartition = null;
+          entryIndex = provider.PartitionSize;
+        }
+
         provider.managedPools.Free(this);
       }

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

@@ -27 +27 @@
     }
 
-    public static IEnumerable<TreeNode<T>> DepthFirst<T>(this TreeNode<T> node) {
+    public static IEnumerable<TreeNode<T>> DepthLast<T>(this TreeNode<T> node) {
       foreach (var child in node.Children) {
         if (child.Children.Count > 0) {
-          foreach (var subChild in child.DepthFirst()) {
+          foreach (var subChild in child.DepthLast()) {
             yield return subChild;
           }
@@ -37 +37 @@
     }
 
-    public static IEnumerable<T> DepthFirst<T>(this TreeNode<T> node, Func<IEnumerable<T>, T> resolveParent) {
+    public static IEnumerable<T> DepthLast<T>(this TreeNode<T> node, Func<IEnumerable<T>, T> resolveParent) {
       foreach (var child in node.Children) {
         if (child.Children.Count > 0) {
-          var subExpressions = child.DepthFirst(resolveParent);
+          var subExpressions = child.DepthLast(resolveParent);
           yield return resolveParent(subExpressions);
         } else yield return child.Value;
@@ -47 +47 @@
 
     public static PushProgram ToPushProgram(this TreeNode<Expression> tree, Func<Expression, bool> condition = null) {
-      var expressions = tree.DepthFirst(e => ResolveProgram(e, condition));
+      var expressions = tree.DepthLast(e => ResolveProgram(e, condition));
 
       return ResolveProgram(expressions, condition);