Fix bulk init

Author: justcoding121

Advanced.Algorithms.Tests/DataStructures/Heap/Max/D-aryMaxHeap_Tests.cs

@@ -14,7 +14,7 @@ public class AsD_aryMaxTree_Tests
         /// A tree test
         /// </summary>
         [TestMethod]
-        public void AsD_aryHeap_Test()
+        public void D_ary_MaxHeap_Test()
         {
             var rnd = new Random();
 

Advanced.Algorithms/DataStructures/Heap/Max/BMaxHeap.cs

@@ -61,35 +61,28 @@ private void BulkInit(T[] initial)
         /// <param name="i"></param>
         private void BulkInitRecursive(int i, T[] initial)
         {
+            var parent = i;
+
             var left = 2 * i + 1;
             var right = 2 * i + 2;
 
-            var Max = i;
-            var parent = i;
+            var max = left < initial.Length && right < initial.Length ?
+                            initial[left].CompareTo(initial[right]) > 0 ? left : right
+                            : left < initial.Length ?
+                                left : right < initial.Length ?
+                                        right : -1;
 
-            if (left < initial.Length
-                && initial[left].CompareTo(initial[parent]) > 0)
+            if (max != -1
+                && initial[max].CompareTo(initial[parent]) > 0)
             {
-                var temp = initial[left];
-                initial[left] = initial[parent];
+                var temp = initial[max];
+                initial[max] = initial[parent];
                 initial[parent] = temp;
-                Max = left;
-            }
 
-            if (right < initial.Length
-                && initial[right].CompareTo(initial[parent]) > 0)
-            {
-                var temp = initial[right];
-                initial[right] = initial[parent];
-                initial[parent] = temp;
-                Max = right;
+                //if min is child then drill down child
+                BulkInitRecursive(max, initial);
             }
 
-            //if Max is child then drill down child
-            if (Max != parent)
-            {
-                BulkInitRecursive(Max, initial);
-            }
         }
         //o(log(n))
         public void Insert(T newItem)

Advanced.Algorithms/DataStructures/Heap/Max/d-aryMaxHeap.cs

@@ -28,7 +28,6 @@ public D_aryMaxHeap(int k, IEnumerable<T> initial = null)
 
                 Count = initArray.Length;
                 BulkInit(initArray);
-                heapArray = initArray;
 
             }
             else
@@ -44,7 +43,7 @@ public D_aryMaxHeap(int k, IEnumerable<T> initial = null)
         /// <param name="initial"></param>
         private void BulkInit(T[] initial)
         {
-            var i = (initial.Length - K - 1) / K;
+            var i = (initial.Length - 1) / K;
 
             while (i >= 0)
             {
@@ -62,25 +61,18 @@ private void BulkInit(T[] initial)
         private void BulkInitRecursive(int i, T[] initial)
         {
             var parent = i;
-            var max = parent;
+            var max = findMaxChildIndex(i, initial);
 
-            var maxChild = findMaxChildIndex(i, initial);
-            if (maxChild !=-1 
-                && initial[maxChild].CompareTo(initial[parent]) > 0)
+            if (max !=-1 
+                && initial[max].CompareTo(initial[parent]) > 0)
             {
-                var temp = initial[maxChild];
-                initial[maxChild] = initial[parent];
+                var temp = initial[max];
+                initial[max] = initial[parent];
                 initial[parent] = temp;
 
-                max = maxChild;
-            }
-
-
-            //if max is child then drill down child
-            if (max != parent)
-            {
                 BulkInitRecursive(max, initial);
             }
+
         }
 
 

Advanced.Algorithms/DataStructures/Heap/Min/BMinHeap.cs

@@ -61,35 +61,29 @@ private void BulkInit(T[] initial)
         /// <param name="i"></param>
         private void BulkInitRecursive(int i, T[] initial)
         {
-            var left = 2 * i + 1;
-            var right = 2 * i + 2;
-
-            var min = i;
             var parent = i;
 
-            if (left < initial.Length
-                && initial[left].CompareTo(initial[parent]) < 0)
-            {
-                var temp = initial[left];
-                initial[left] = initial[parent];
-                initial[parent] = temp;
-                min = left;
-            }
+            var left = 2 * i + 1;
+            var right = 2 * i + 2;
 
-            if (right < initial.Length
-                && initial[right].CompareTo(initial[parent]) < 0)
+            var min = left < initial.Length && right < initial.Length ?
+                            initial[left].CompareTo(initial[right]) < 0 ? left : right
+                            : left < initial.Length ?
+                                left : right < initial.Length ?
+                                        right : -1;
+            
+            if(min!=-1
+                && initial[min].CompareTo(initial[parent])<0)
             {
-                var temp = initial[right];
-                initial[right] = initial[parent];
+                var temp = initial[min];
+                initial[min] = initial[parent];
                 initial[parent] = temp;
-                min = right;
-            }
 
-            //if min is child then drill down child
-            if (min != parent)
-            {
+                //if min is child then drill down child
                 BulkInitRecursive(min, initial);
             }
+
+
         }
         //o(log(n))
         public void Insert(T newItem)

Advanced.Algorithms/DataStructures/Heap/Min/d-aryMinHeap.cs

@@ -28,7 +28,6 @@ public D_aryMinHeap(int k, IEnumerable<T> initial = null)
 
                 Count = initArray.Length;
                 BulkInit(initArray);
-                heapArray = initArray;
 
             }
             else
@@ -44,7 +43,7 @@ public D_aryMinHeap(int k, IEnumerable<T> initial = null)
         /// <param name="initial"></param>
         private void BulkInit(T[] initial)
         {
-            var i = (initial.Length - K - 1) / K;
+            var i = (initial.Length - 1) / K;
 
             while (i >= 0)
             {
@@ -62,25 +61,18 @@ private void BulkInit(T[] initial)
         private void BulkInitRecursive(int i, T[] initial)
         {
             var parent = i;
-            var min = parent;
+            var min = findMinChildIndex(i, initial);
 
-            var minChild = findMinChildIndex(i, initial);
-            if (minChild !=-1 
-                && initial[minChild].CompareTo(initial[parent]) < 0)
+            if (min !=-1 
+                && initial[min].CompareTo(initial[parent]) < 0)
             {
-                var temp = initial[minChild];
-                initial[minChild] = initial[parent];
+                var temp = initial[min];
+                initial[min] = initial[parent];
                 initial[parent] = temp;
 
-                min = minChild;
-            }
-
-
-            //if min is child then drill down child
-            if (min != parent)
-            {
                 BulkInitRecursive(min, initial);
             }
+
         }