Merge branch 'doocs:main' into main

Author: Nothing-avil

images/starcharts.svg

@@ -50,7 +50,11 @@ edit_url: https://github.com/doocs/leetcode/edit/main/lcof2/%E5%89%91%E6%8C%87%2
 
 <!-- solution:start -->
 
-### 方法一
+### 方法一：自定义排序
+
+我们先用哈希表 $pos$ 记录数组 $arr2$ 中每个元素的位置。然后，我们将数组 $arr1$ 中的每个元素映射成一个二元组 $(pos.get(x, 1000 + x), x)$，并对二元组进行排序。最后我们取出所有二元组的第二个元素并返回即可。
+
+时间复杂度 $O(n \times \log n + m)$，空间复杂度 $O(n + m)$。其中 $n$ 和 $m$ 分别是数组 $arr1$ 和 $arr2$ 的长度。
 
 <!-- tabs:start -->
 
@@ -59,30 +63,26 @@ edit_url: https://github.com/doocs/leetcode/edit/main/lcof2/%E5%89%91%E6%8C%87%2
 ```python
 class Solution:
     def relativeSortArray(self, arr1: List[int], arr2: List[int]) -> List[int]:
-        mp = {num: i for i, num in enumerate(arr2)}
-        arr1.sort(key=lambda x: (mp.get(x, 10000), x))
-        return arr1
+        pos = {x: i for i, x in enumerate(arr2)}
+        return sorted(arr1, key=lambda x: pos.get(x, 1000 + x))
 ```
 
 #### Java
 
 ```java
 class Solution {
     public int[] relativeSortArray(int[] arr1, int[] arr2) {
-        int[] mp = new int[1001];
-        for (int x : arr1) {
-            ++mp[x];
+        Map<Integer, Integer> pos = new HashMap<>(arr2.length);
+        for (int i = 0; i < arr2.length; ++i) {
+            pos.put(arr2[i], i);
         }
-        int i = 0;
-        for (int x : arr2) {
-            while (mp[x]-- > 0) {
-                arr1[i++] = x;
-            }
+        int[][] arr = new int[arr1.length][0];
+        for (int i = 0; i < arr.length; ++i) {
+            arr[i] = new int[] {arr1[i], pos.getOrDefault(arr1[i], arr2.length + arr1[i])};
         }
-        for (int j = 0; j < mp.length; ++j) {
-            while (mp[j]-- > 0) {
-                arr1[i++] = j;
-            }
+        Arrays.sort(arr, (a, b) -> a[1] - b[1]);
+        for (int i = 0; i < arr.length; ++i) {
+            arr1[i] = arr[i][0];
         }
         return arr1;
     }
@@ -95,14 +95,18 @@ class Solution {
 class Solution {
 public:
     vector<int> relativeSortArray(vector<int>& arr1, vector<int>& arr2) {
-        vector<int> mp(1001);
-        for (int x : arr1) ++mp[x];
-        int i = 0;
-        for (int x : arr2) {
-            while (mp[x]-- > 0) arr1[i++] = x;
+        unordered_map<int, int> pos;
+        for (int i = 0; i < arr2.size(); ++i) {
+            pos[arr2[i]] = i;
         }
-        for (int j = 0; j < mp.size(); ++j) {
-            while (mp[j]-- > 0) arr1[i++] = j;
+        vector<pair<int, int>> arr;
+        for (int i = 0; i < arr1.size(); ++i) {
+            int j = pos.count(arr1[i]) ? pos[arr1[i]] : arr2.size();
+            arr.emplace_back(j, arr1[i]);
+        }
+        sort(arr.begin(), arr.end());
+        for (int i = 0; i < arr1.size(); ++i) {
+            arr1[i] = arr[i].second;
         }
         return arr1;
     }
@@ -113,58 +117,250 @@ public:
 
 ```go
 func relativeSortArray(arr1 []int, arr2 []int) []int {
-	mp := make([]int, 1001)
-	for _, x := range arr1 {
-		mp[x]++
+	pos := map[int]int{}
+	for i, x := range arr2 {
+		pos[x] = i
 	}
-	i := 0
-	for _, x := range arr2 {
-		for mp[x] > 0 {
-			arr1[i] = x
-			mp[x]--
-			i++
+	arr := make([][2]int, len(arr1))
+	for i, x := range arr1 {
+		if p, ok := pos[x]; ok {
+			arr[i] = [2]int{p, x}
+		} else {
+			arr[i] = [2]int{len(arr2), x}
 		}
 	}
-	for j, cnt := range mp {
-		for cnt > 0 {
-			arr1[i] = j
-			i++
-			cnt--
-		}
+	sort.Slice(arr, func(i, j int) bool {
+		return arr[i][0] < arr[j][0] || arr[i][0] == arr[j][0] && arr[i][1] < arr[j][1]
+	})
+	for i, x := range arr {
+		arr1[i] = x[1]
 	}
 	return arr1
 }
 ```
 
+#### TypeScript
+
+```ts
+function relativeSortArray(arr1: number[], arr2: number[]): number[] {
+    const pos: Map<number, number> = new Map();
+    for (let i = 0; i < arr2.length; ++i) {
+        pos.set(arr2[i], i);
+    }
+    const arr: number[][] = [];
+    for (const x of arr1) {
+        const j = pos.get(x) ?? arr2.length;
+        arr.push([j, x]);
+    }
+    arr.sort((a, b) => a[0] - b[0] || a[1] - b[1]);
+    return arr.map(a => a[1]);
+}
+```
+
+#### Swift
+
+```swift
+class Solution {
+    func relativeSortArray(_ arr1: [Int], _ arr2: [Int]) -> [Int] {
+        var pos = [Int: Int]()
+        for (i, x) in arr2.enumerated() {
+            pos[x] = i
+        }
+        var arr = [(Int, Int)]()
+        for x in arr1 {
+            let j = pos[x] ?? arr2.count
+            arr.append((j, x))
+        }
+        arr.sort { $0.0 < $1.0 || ($0.0 == $1.0 && $0.1 < $1.1) }
+        return arr.map { $0.1 }
+    }
+}
+```
+
 <!-- tabs:end -->
 
 <!-- solution:end -->
 
-<!-- solution:start-->
+<!-- solution:start -->
 
-### 方法二
+### 方法二：计数排序
 
-<!-- tabs:start -->
+我们可以使用计数排序的思想，首先统计数组 $arr1$ 中每个元素的出现次数，然后按照数组 $arr2$ 中的顺序，将 $arr1$ 中的元素按照出现次数放入答案数组 $ans$ 中。最后，我们遍历 $arr1$ 中的所有元素，将未在 $arr2$ 中出现的元素按照升序放入答案数组 $ans$ 的末尾。
+
+时间复杂度 $O(n + m)$，空间复杂度 $O(n)$。其中 $n$ 和 $m$ 分别是数组 $arr1$ 和 $arr2$ 的长度。
+
+<!-- solution:start -->
 
 #### Python3
 
 ```python
 class Solution:
     def relativeSortArray(self, arr1: List[int], arr2: List[int]) -> List[int]:
-        mp = [0] * 1001
-        for x in arr1:
-            mp[x] += 1
-        i = 0
+        cnt = Counter(arr1)
+        ans = []
         for x in arr2:
-            while mp[x] > 0:
-                arr1[i] = x
-                mp[x] -= 1
-                i += 1
-        for x, cnt in enumerate(mp):
-            for _ in range(cnt):
-                arr1[i] = x
-                i += 1
-        return arr1
+            ans.extend([x] * cnt[x])
+            cnt.pop(x)
+        mi, mx = min(arr1), max(arr1)
+        for x in range(mi, mx + 1):
+            ans.extend([x] * cnt[x])
+        return ans
+```
+
+#### Java
+
+```java
+class Solution {
+    public int[] relativeSortArray(int[] arr1, int[] arr2) {
+        int[] cnt = new int[1001];
+        int mi = 1001, mx = 0;
+        for (int x : arr1) {
+            ++cnt[x];
+            mi = Math.min(mi, x);
+            mx = Math.max(mx, x);
+        }
+        int m = arr1.length;
+        int[] ans = new int[m];
+        int i = 0;
+        for (int x : arr2) {
+            while (cnt[x] > 0) {
+                --cnt[x];
+                ans[i++] = x;
+            }
+        }
+        for (int x = mi; x <= mx; ++x) {
+            while (cnt[x] > 0) {
+                --cnt[x];
+                ans[i++] = x;
+            }
+        }
+        return ans;
+    }
+}
+```
+
+#### C++
+
+```cpp
+class Solution {
+public:
+    vector<int> relativeSortArray(vector<int>& arr1, vector<int>& arr2) {
+        vector<int> cnt(1001);
+        for (int x : arr1) {
+            ++cnt[x];
+        }
+        auto [mi, mx] = minmax_element(arr1.begin(), arr1.end());
+        vector<int> ans;
+        for (int x : arr2) {
+            while (cnt[x]) {
+                ans.push_back(x);
+                --cnt[x];
+            }
+        }
+        for (int x = *mi; x <= *mx; ++x) {
+            while (cnt[x]) {
+                ans.push_back(x);
+                --cnt[x];
+            }
+        }
+        return ans;
+    }
+};
+```
+
+#### Go
+
+```go
+func relativeSortArray(arr1 []int, arr2 []int) []int {
+	cnt := make([]int, 1001)
+	mi, mx := 1001, 0
+	for _, x := range arr1 {
+		cnt[x]++
+		mi = min(mi, x)
+		mx = max(mx, x)
+	}
+	ans := make([]int, 0, len(arr1))
+	for _, x := range arr2 {
+		for cnt[x] > 0 {
+			ans = append(ans, x)
+			cnt[x]--
+		}
+	}
+	for x := mi; x <= mx; x++ {
+		for cnt[x] > 0 {
+			ans = append(ans, x)
+			cnt[x]--
+		}
+	}
+	return ans
+}
+```
+
+#### TypeScript
+
+```ts
+function relativeSortArray(arr1: number[], arr2: number[]): number[] {
+    const cnt = Array(1001).fill(0);
+    let mi = Number.POSITIVE_INFINITY;
+    let mx = Number.NEGATIVE_INFINITY;
+
+    for (const x of arr1) {
+        cnt[x]++;
+        mi = Math.min(mi, x);
+        mx = Math.max(mx, x);
+    }
+
+    const ans: number[] = [];
+    for (const x of arr2) {
+        while (cnt[x]) {
+            cnt[x]--;
+            ans.push(x);
+        }
+    }
+
+    for (let i = mi; i <= mx; i++) {
+        while (cnt[i]) {
+            cnt[i]--;
+            ans.push(i);
+        }
+    }
+
+    return ans;
+}
+```
+
+#### Swift
+
+```swift
+class Solution {
+    func relativeSortArray(_ arr1: [Int], _ arr2: [Int]) -> [Int] {
+        var cnt = [Int](repeating: 0, count: 1001)
+        for x in arr1 {
+            cnt[x] += 1
+        }
+
+        guard let mi = arr1.min(), let mx = arr1.max() else {
+            return []
+        }
+
+        var ans = [Int]()
+        for x in arr2 {
+            while cnt[x] > 0 {
+                ans.append(x)
+                cnt[x] -= 1
+            }
+        }
+
+        for x in mi...mx {
+            while cnt[x] > 0 {
+                ans.append(x)
+                cnt[x] -= 1
+            }
+        }
+
+        return ans
+    }
+}
 ```
 
 <!-- tabs:end -->

lcof2/剑指 Offer II 075. 数组相对排序/README.md

@@ -1,14 +1,18 @@
 class Solution {
 public:
     vector<int> relativeSortArray(vector<int>& arr1, vector<int>& arr2) {
-        vector<int> mp(1001);
-        for (int x : arr1) ++mp[x];
-        int i = 0;
-        for (int x : arr2) {
-            while (mp[x]-- > 0) arr1[i++] = x;
+        unordered_map<int, int> pos;
+        for (int i = 0; i < arr2.size(); ++i) {
+            pos[arr2[i]] = i;
         }
-        for (int j = 0; j < mp.size(); ++j) {
-            while (mp[j]-- > 0) arr1[i++] = j;
+        vector<pair<int, int>> arr;
+        for (int i = 0; i < arr1.size(); ++i) {
+            int j = pos.count(arr1[i]) ? pos[arr1[i]] : arr2.size();
+            arr.emplace_back(j, arr1[i]);
+        }
+        sort(arr.begin(), arr.end());
+        for (int i = 0; i < arr1.size(); ++i) {
+            arr1[i] = arr[i].second;
         }
         return arr1;
     }