feat: 88. Merge Sorted Array

dumuzhou · Nov 20, 2017 · 16c6abf · 16c6abf
1 parent 85a061d
commit 16c6abf
Show file tree

Hide file tree

Showing 107 changed files with 123 additions and 0 deletions.
diff --git a/Java/.gitignore b/Java/.gitignore
diff --git a/Java/src/AddBinary.java b/Java/src/AddBinary.java
diff --git a/Java/src/AddTwoNumbers.java b/Java/src/AddTwoNumbers.java
diff --git a/Java/src/ClimbingStairs.java b/Java/src/ClimbingStairs.java
diff --git a/Java/src/ContainerWithMostWater.java b/Java/src/ContainerWithMostWater.java
diff --git a/Java/src/CountAndSay.java b/Java/src/CountAndSay.java
diff --git a/Java/src/GrayCode.java b/Java/src/GrayCode.java
diff --git a/Java/src/GroupAnagrams.java b/Java/src/GroupAnagrams.java
diff --git a/Java/src/ImplementStrStr.java b/Java/src/ImplementStrStr.java
diff --git a/Java/src/LengthOfLastWord.java b/Java/src/LengthOfLastWord.java
diff --git a/Java/src/LongestCommonPrefix.java b/Java/src/LongestCommonPrefix.java
diff --git a/Java/src/LongestSubstringWithoutRepeatingCharacters.java b/Java/src/LongestSubstringWithoutRepeatingCharacters.java
diff --git a/Java/src/MergeSortedArray.java b/Java/src/MergeSortedArray.java
@@ -0,0 +1,42 @@
+import java.util.Arrays;
+
+/**
+ * Given two sorted integer arrays nums1 and nums2, merge nums2 into nums1 as one sorted array.
+ * <p>
+ * Note:
+ * You may assume that nums1 has enough space (size that is greater or equal to m + n) to hold additional elements from nums2.
+ * The number of elements initialized in nums1 and nums2 are m and n respectively.
+ * <p>
+ * Accepted.
+ */
+public class MergeSortedArray {
+
+    public void merge(int[] nums1, int m, int[] nums2, int n) {
+        if (n == 0) return;
+        System.arraycopy(nums2, 0, nums1, m, n);
+        Arrays.sort(nums1, 0, m + n);
+//        System.out.print("[");
+//        Arrays.stream(nums1).forEach(it -> System.out.print(it + ","));
+//        System.out.println("]");
+    }
+
+    public static void main(String[] args) {
+        MergeSortedArray msa = new MergeSortedArray();
+
+        // Expected: [1]
+        msa.merge(new int[]{1}, 1, new int[]{}, 0);
+        // Expected: []
+        msa.merge(new int[]{0}, 0, new int[]{1}, 1);
+        // Expected: [1, 2, 3, 4, 5, 6]
+        msa.merge(new int[]{4, 5, 6, 0, 0, 0}, 3, new int[]{1, 2, 3}, 3);
+        // Expected: [0, 0, 0, 0, 1, 2, 3, 4, -1]
+        msa.merge(new int[]{0, 0, 0, 1, 2, 3, -1, -1, -1}, 6, new int[]{0, 4}, 2);
+        // Expected: [0, 1, 2, 3, 3, 4, 0, 0, 0]
+        msa.merge(new int[]{0, 1, 2, 3, 0, 0, 0, 0, 0}, 4, new int[]{3, 4, 0}, 2);
+        // Expected: [1, 1, 2, 0]
+        msa.merge(new int[]{1, 2, 0, 0}, 2, new int[]{1}, 1);
+        // Expected: [1, 2, 2, 3, 5, 6]
+        msa.merge(new int[]{1, 2, 3, 0, 0, 0}, 3, new int[]{2, 5, 6}, 3);
+    }
+
+}
diff --git a/Java/src/MinimumPathSum.java b/Java/src/MinimumPathSum.java
diff --git a/Java/src/PalindromeNumber.java b/Java/src/PalindromeNumber.java
diff --git a/Java/src/PlusOne.java b/Java/src/PlusOne.java
diff --git a/Java/src/PowXN.java b/Java/src/PowXN.java
diff --git a/Java/src/RemoveDuplicatesFromSortedArray.java b/Java/src/RemoveDuplicatesFromSortedArray.java
diff --git a/Java/src/RemoveElement.java b/Java/src/RemoveElement.java
diff --git a/Java/src/ReverseInteger.java b/Java/src/ReverseInteger.java
diff --git a/Java/src/RomanToInteger.java b/Java/src/RomanToInteger.java
diff --git a/Java/src/SameTree.java b/Java/src/SameTree.java
diff --git a/Java/src/SearchA2DMatrix.java b/Java/src/SearchA2DMatrix.java
diff --git a/Java/src/SearchForARange.java b/Java/src/SearchForARange.java
diff --git a/Java/src/SearchInRotatedSortedArray.java b/Java/src/SearchInRotatedSortedArray.java
diff --git a/Java/src/SearchInsertPosition.java b/Java/src/SearchInsertPosition.java
diff --git a/Java/src/SetMatrixZeroes.java b/Java/src/SetMatrixZeroes.java
diff --git a/Java/src/SpiralMatrix.java b/Java/src/SpiralMatrix.java
diff --git a/Java/src/SpiralMatrixII.java b/Java/src/SpiralMatrixII.java
diff --git a/Java/src/SqrtX.java b/Java/src/SqrtX.java
diff --git a/Java/src/StringToIntegerAtoi.java b/Java/src/StringToIntegerAtoi.java
diff --git a/Java/src/TwoSum.java b/Java/src/TwoSum.java
diff --git a/Java/src/UniquePaths.java b/Java/src/UniquePaths.java
diff --git a/Java/src/UniquePathsII.java b/Java/src/UniquePathsII.java
diff --git a/Java/src/ValidParentheses.java b/Java/src/ValidParentheses.java
diff --git a/Kotlin/.gitignore b/Kotlin/.gitignore
diff --git a/Kotlin/src/AddBinary.kt b/Kotlin/src/AddBinary.kt
diff --git a/Kotlin/src/AddTwoNumbers.kt b/Kotlin/src/AddTwoNumbers.kt
diff --git a/Kotlin/src/ClimbingStairs.kt b/Kotlin/src/ClimbingStairs.kt
diff --git a/Kotlin/src/ContainerWithMostWater.kt b/Kotlin/src/ContainerWithMostWater.kt
diff --git a/Kotlin/src/CountAndSay.kt b/Kotlin/src/CountAndSay.kt
diff --git a/Kotlin/src/GrayCode.kt b/Kotlin/src/GrayCode.kt
diff --git a/Kotlin/src/GroupAnagrams.kt b/Kotlin/src/GroupAnagrams.kt
diff --git a/Kotlin/src/ImplementStrStr.kt b/Kotlin/src/ImplementStrStr.kt
diff --git a/Kotlin/src/LengthOfLastWord.kt b/Kotlin/src/LengthOfLastWord.kt
diff --git a/Kotlin/src/LongestCommonPrefix.kt b/Kotlin/src/LongestCommonPrefix.kt
diff --git a/Kotlin/src/LongestSubstringWithoutRepeatingCharacters.kt b/Kotlin/src/LongestSubstringWithoutRepeatingCharacters.kt
diff --git a/Kotlin/src/MergeSortedArray.kt b/Kotlin/src/MergeSortedArray.kt
@@ -0,0 +1,41 @@
+/**
+ * Given two sorted integer arrays nums1 and nums2, merge nums2 into nums1 as one sorted array.
+ *
+ * Note:
+ * You may assume that nums1 has enough space (size that is greater or equal to m + n) to hold additional elements from nums2.
+ * The number of elements initialized in nums1 and nums2 are m and n respectively.
+ *
+ * Accepted.
+ */
+class MergeSortedArray {
+
+    fun merge(nums1: IntArray, m: Int, nums2: IntArray, n: Int) {
+        if (n == 0) return
+        System.arraycopy(nums2, 0, nums1, m, n)
+        nums1.sort(0, m + n)
+//        println("[${nums1.joinToString()}]")
+    }
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            val msa = MergeSortedArray()
+
+            // Expected: [1]
+            msa.merge(intArrayOf(1), 1, intArrayOf(), 0)
+            // Expected: []
+            msa.merge(intArrayOf(0), 0, intArrayOf(1), 1)
+            // Expected: [1, 2, 3, 4, 5, 6]
+            msa.merge(intArrayOf(4, 5, 6, 0, 0, 0), 3, intArrayOf(1, 2, 3), 3)
+            // Expected: [0, 0, 0, 0, 1, 2, 3, 4, -1]
+            msa.merge(intArrayOf(0, 0, 0, 1, 2, 3, -1, -1, -1), 6, intArrayOf(0, 4), 2)
+            // Expected: [0, 1, 2, 3, 3, 4, 0, 0, 0]
+            msa.merge(intArrayOf(0, 1, 2, 3, 0, 0, 0, 0, 0), 4, intArrayOf(3, 4, 0), 2)
+            // Expected: [1, 1, 2, 0]
+            msa.merge(intArrayOf(1, 2, 0, 0), 2, intArrayOf(1), 1)
+            // Expected: [1, 2, 2, 3, 5, 6]
+            msa.merge(intArrayOf(1, 2, 3, 0, 0, 0), 3, intArrayOf(2, 5, 6), 3)
+        }
+    }
+
+}
diff --git a/Kotlin/src/MinimumPathSum.kt b/Kotlin/src/MinimumPathSum.kt
diff --git a/Kotlin/src/PalindromeNumber.kt b/Kotlin/src/PalindromeNumber.kt
diff --git a/Kotlin/src/PlusOne.kt b/Kotlin/src/PlusOne.kt
diff --git a/Kotlin/src/PowXN.kt b/Kotlin/src/PowXN.kt
diff --git a/Kotlin/src/RemoveDuplicatesFromSortedArray.kt b/Kotlin/src/RemoveDuplicatesFromSortedArray.kt
diff --git a/Kotlin/src/RemoveElement.kt b/Kotlin/src/RemoveElement.kt
diff --git a/Kotlin/src/ReverseInteger.kt b/Kotlin/src/ReverseInteger.kt
diff --git a/Kotlin/src/RomanToInteger.kt b/Kotlin/src/RomanToInteger.kt
diff --git a/Kotlin/src/SameTree.kt b/Kotlin/src/SameTree.kt
diff --git a/Kotlin/src/SearchA2DMatrix.kt b/Kotlin/src/SearchA2DMatrix.kt
diff --git a/Kotlin/src/SearchForARange.kt b/Kotlin/src/SearchForARange.kt
diff --git a/Kotlin/src/SearchInRotatedSortedArray.kt b/Kotlin/src/SearchInRotatedSortedArray.kt
diff --git a/Kotlin/src/SearchInsertPosition.kt b/Kotlin/src/SearchInsertPosition.kt
diff --git a/Kotlin/src/SetMatrixZeroes.kt b/Kotlin/src/SetMatrixZeroes.kt
diff --git a/Kotlin/src/SpiralMatrix.kt b/Kotlin/src/SpiralMatrix.kt
diff --git a/Kotlin/src/SpiralMatrixII.kt b/Kotlin/src/SpiralMatrixII.kt
diff --git a/Kotlin/src/SqrtX.kt b/Kotlin/src/SqrtX.kt
diff --git a/Kotlin/src/StringToIntegerAtoi.kt b/Kotlin/src/StringToIntegerAtoi.kt
diff --git a/Kotlin/src/TwoSum.kt b/Kotlin/src/TwoSum.kt
diff --git a/Kotlin/src/UniquePaths.kt b/Kotlin/src/UniquePaths.kt
diff --git a/Kotlin/src/UniquePathsII.kt b/Kotlin/src/UniquePathsII.kt
diff --git a/Kotlin/src/ValidParentheses.kt b/Kotlin/src/ValidParentheses.kt
diff --git a/LICENSE b/LICENSE
diff --git a/Python/.gitignore b/Python/.gitignore
diff --git a/Python/AddBinary.py b/Python/AddBinary.py
diff --git a/Python/AddTwoNumbers.py b/Python/AddTwoNumbers.py
diff --git a/Python/ClimbingStairs.py b/Python/ClimbingStairs.py
diff --git a/Python/ContainerWithMostWater.py b/Python/ContainerWithMostWater.py
diff --git a/Python/CountAndSay.py b/Python/CountAndSay.py
diff --git a/Python/GrayCode.py b/Python/GrayCode.py
diff --git a/Python/GroupAnagrams.py b/Python/GroupAnagrams.py
diff --git a/Python/ImplementStrStr.py b/Python/ImplementStrStr.py
diff --git a/Python/LengthOfLastWord.py b/Python/LengthOfLastWord.py
diff --git a/Python/LongestCommonPrefix.py b/Python/LongestCommonPrefix.py
diff --git a/Python/LongestSubstringWithoutRepeatingCharacters.py b/Python/LongestSubstringWithoutRepeatingCharacters.py
diff --git a/Python/MergeSortedArray.py b/Python/MergeSortedArray.py
@@ -0,0 +1,39 @@
+# -*- coding: UTF-8 -*-
+#
+# Given two sorted integer arrays nums1 and nums2, merge nums2 into nums1 as one sorted array.
+#
+# Note:
+# You may assume that nums1 has enough space (size that is greater or equal to m + n) to hold additional elements from nums2.
+# The number of elements initialized in nums1 and nums2 are m and n respectively.
+#
+# Python, Python 3 accepted.
+class MergeSortedArray:
+    def merge(self, nums1, m, nums2, n):
+        """
+        :type nums1: List[int]
+        :type m: int
+        :type nums2: List[int]
+        :type n: int
+        :rtype: void Do not return anything, modify nums1 in-place instead.
+        """
+        if n != 0:
+            nums1[m:m + n] = nums2
+            nums1[0:m + n] = sorted(nums1[0:m + n])
+            # print(nums1)
+
+
+msa = MergeSortedArray()
+# Expected: [1]
+msa.merge([1], 1, [], 0)
+# Expected: []
+msa.merge([0], 0, [1], 1)
+# Expected: [1, 2, 3, 4, 5, 6]
+msa.merge([4, 5, 6, 0, 0, 0], 3, [1, 2, 3], 3)
+# Expected: [0, 0, 0, 0, 1, 2, 3, 4, -1]
+msa.merge([0, 0, 0, 1, 2, 3, -1, -1, -1], 6, [0, 4], 2)
+# Expected: [0, 1, 2, 3, 3, 4, 0, 0, 0]
+msa.merge([0, 1, 2, 3, 0, 0, 0, 0, 0], 4, [3, 4, 0], 2)
+# Expected: [1, 1, 2, 0]
+msa.merge([1, 2, 0, 0], 2, [1], 1)
+# Expected: [1, 2, 2, 3, 5, 6]
+msa.merge([1, 2, 3, 0, 0, 0], 3, [2, 5, 6], 3)
diff --git a/Python/MinimumPathSum.py b/Python/MinimumPathSum.py
diff --git a/Python/PalindromeNumber.py b/Python/PalindromeNumber.py
diff --git a/Python/PlusOne.py b/Python/PlusOne.py
diff --git a/Python/PowXN.py b/Python/PowXN.py
diff --git a/Python/RemoveDuplicatesFromSortedArray.py b/Python/RemoveDuplicatesFromSortedArray.py
diff --git a/Python/RemoveElement.py b/Python/RemoveElement.py
diff --git a/Python/ReverseInteger.py b/Python/ReverseInteger.py
diff --git a/Python/RomanToInteger.py b/Python/RomanToInteger.py
diff --git a/Python/SameTree.py b/Python/SameTree.py
diff --git a/Python/SearchA2DMatrix.py b/Python/SearchA2DMatrix.py
diff --git a/Python/SearchForARange.py b/Python/SearchForARange.py
diff --git a/Python/SearchInRotatedSortedArray.py b/Python/SearchInRotatedSortedArray.py
diff --git a/Python/SearchInsertPosition.py b/Python/SearchInsertPosition.py
diff --git a/Python/SetMatrixZeroes.py b/Python/SetMatrixZeroes.py
diff --git a/Python/SpiralMatrix.py b/Python/SpiralMatrix.py
diff --git a/Python/SpiralMatrixII.py b/Python/SpiralMatrixII.py
diff --git a/Python/SqrtX.py b/Python/SqrtX.py
diff --git a/Python/StringToIntegerAtoi.py b/Python/StringToIntegerAtoi.py
diff --git a/Python/TwoSum.py b/Python/TwoSum.py
diff --git a/Python/UniquePaths.py b/Python/UniquePaths.py
diff --git a/Python/UniquePathsII.py b/Python/UniquePathsII.py
diff --git a/Python/ValidParentheses.py b/Python/ValidParentheses.py
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ All the solutions are accepted.
 | 70 | [Climbing Stairs](https://leetcode.com/problems/climbing-stairs/description/) | [√](Java/src/ClimbingStairs.java) | [√](Kotlin/src/ClimbingStairs.kt) | [√](Python/ClimbingStairs.py) | Easy |
 | 73 | [Set Matrix Zeroes](https://leetcode.com/problems/set-matrix-zeroes/description/) | [√](Java/src/SetMatrixZeroes.java) | [√](Kotlin/src/SetMatrixZeroes.kt) | [√](Python/SetMatrixZeroes.py) | Medium |
 | 74 | [Search a 2D Matrix](https://leetcode.com/problems/search-a-2d-matrix/description/) | [√](Java/src/SearchA2DMatrix.java) | [√](Kotlin/src/SearchA2DMatrix.kt) | [√](Python/SearchA2DMatrix.py) | Medium |
+| 88 | [Merge Sorted Array](https://leetcode.com/problems/merge-sorted-array/description/) | [√](Java/src/MergeSortedArray.java) | [√](Kotlin/src/MergeSortedArray.kt) | [√](Python/MergeSortedArray.py)
 | 89 | [Gray Code](https://leetcode.com/problems/gray-code/description/) | [√](Java/src/GrayCode.java) | [√](Kotlin/src/GrayCode.kt) | [√](Python/GrayCode.py) | Medium |
 | 100 | [Same Tree](https://leetcode.com/problems/same-tree/description/) | [√](Java/src/SameTree.java) | [√](Kotlin/src/SameTree.kt) | [√](Python/SameTree.py)| Easy |