complete

zhiyuan0101 · zhiyuan0101 · commit 696eadb901de · 2017-02-28T12:55:47.000+08:00
diff --git a/group17/1264835468/src/assignment2_26/ArrayUtil.java b/group17/1264835468/src/assignment2_26/ArrayUtil.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.TreeSet;
 
 public class ArrayUtil {
 
@@ -56,34 +57,16 @@ public int[] removeZero(int[] oldArray) {
 	 */
 
 	public int[] merge(int[] array1, int[] array2) {
-		int[] result = new int[array1.length + array2.length];
-		int ptr1 = 0, ptr2 = 0, ptrResult = 0;
-		while (ptr1 < array1.length && ptr2 < array2.length) {
-			if (array1[ptr1] == array2[ptr2]) {
-				result[ptrResult++] = array1[ptr1];
-				ptr1++;
-				ptr2++;
-				continue;
-			}
-			if (array1[ptr1] < array2[ptr2]) {
-				result[ptrResult++] = array1[ptr1];
-				ptr1++;
-				continue;
-			}
-			else {
-				result[ptrResult++] = array2[ptr2];
-				ptr2++;
-			}
+		TreeSet<Integer> set = new TreeSet<>();
+		for (Integer integer : array1) {
+			set.add(integer);
 		}
-		if (ptr1 == array1.length) {
-			for (; ptrResult < result.length; ptrResult++) {
-				result[ptrResult] = array2[ptr2++];
-			}
+		for (Integer integer : array2) {
+			set.add(integer);
 		}
-		else {
-			for (; ptrResult < result.length; ptrResult++) {
-				result[ptrResult] = array1[ptr1++];
-			}
+		int[] result = new int[set.size()];
+		for (int i = 0; i < result.length; i++) {
+			result[i] = set.pollFirst();
 		}
 		return result;
 	}
