diff --git a/src/solution/Solution.java b/src/solution/Solution.java index 1fb6e38..66ccc6b 100644 --- a/src/solution/Solution.java +++ b/src/solution/Solution.java @@ -1,9 +1,7 @@ package solution; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; +import java.util.stream.Collectors; public class Solution { @@ -81,8 +79,30 @@ public class Solution { } return candidate; } - - public void merge(int[] nums1, int m, int[] nums2, int n) { - + //合并数组冒泡排序实现 + public static void merge(int[] nums1, int m, int[] nums2, int n) { + int[] nums= new int[m + n]; + for (int i = 0; i < m + n; i++) { + if (i < m){ + nums[i] = nums1[i]; + } else { + nums[i] = nums2[i - m]; + } + } + // 冒泡排序 + for (int i = 0; i < nums.length; i++) { + for (int j = 0; j < nums.length; j++) { + if (i != j) { + if (nums[i] < nums[j]){ + int temp = nums[i]; + nums[i] = nums[j]; + nums[j] = temp; + } + } + } + } + nums1 = nums; + String result = Arrays.stream(nums1).mapToObj(String::valueOf).collect(Collectors.joining(",", "[", "]")); + System.out.println(result); } }