merge k-way sorted array

xiaoningning · xiaoningning · commit b8ffe1882f0f · 2012-07-21T16:37:42.000-07:00
diff --git a/PuzzleCoding/src/MergeSortedArray.java b/PuzzleCoding/src/MergeSortedArray.java
@@ -17,7 +17,8 @@ public ArrayNode(Integer v, int index) {
             value = v;
             arrayIndex = index;
         }
-        public String toString(){
+
+        public String toString() {
             return String.valueOf(value);
         }
     } // end of ArrayNode
@@ -44,7 +45,7 @@ public ArrayNode removeMin() {
             ArrayNode min = heap.get(1);
             heap.remove(min);
 
-            if(heap.size() != 1){
+            if (heap.size() != 1) {
                 shiftDown(1);
             }
             return min;
@@ -137,12 +138,12 @@ public static ArrayList<Integer> mergeSortedArray(Integer[][] arrays) {
                 }
             }
 
-            if(!done)
+            if (!done)
                 heap.insert(new ArrayNode(nextQueue.poll(), minNode.arrayIndex));
 
         }
-        while(!heap.isEmpty())
-             result.add(heap.removeMin().value);
+        while (!heap.isEmpty())
+            result.add(heap.removeMin().value);
 
         return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ public ArrayNode(Integer v, int index) {`
`17`	`17`	`value = v;`
`18`	`18`	`arrayIndex = index;`
`19`	`19`	`}`
`20`		`- public String toString(){`
	`20`	`+`
	`21`	`+ public String toString() {`
`21`	`22`	`return String.valueOf(value);`
`22`	`23`	`}`
`23`	`24`	`} // end of ArrayNode`
`@@ -44,7 +45,7 @@ public ArrayNode removeMin() {`
`44`	`45`	`ArrayNode min = heap.get(1);`
`45`	`46`	`heap.remove(min);`
`46`	`47`
`47`		`- if(heap.size() != 1){`
	`48`	`+ if (heap.size() != 1) {`
`48`	`49`	`shiftDown(1);`
`49`	`50`	`}`
`50`	`51`	`return min;`
`@@ -137,12 +138,12 @@ public static ArrayList<Integer> mergeSortedArray(Integer[][] arrays) {`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`
`140`		`- if(!done)`
	`141`	`+ if (!done)`
`141`	`142`	`heap.insert(new ArrayNode(nextQueue.poll(), minNode.arrayIndex));`
`142`	`143`
`143`	`144`	`}`
`144`		`- while(!heap.isEmpty())`
`145`		`- result.add(heap.removeMin().value);`
	`145`	`+ while (!heap.isEmpty())`
	`146`	`+ result.add(heap.removeMin().value);`
`146`	`147`
`147`	`148`	`return result;`
`148`	`149`	`}`