update: 添加问题“904.水果成篮”的代码(并更新其题解) (#1066)

LetMeFly666 · web-flow · commit e17301e517ba · 2025-08-08T10:51:19.000+08:00
* 3202: O(k)空间 - AC.cpp+py (#1035) (#1041) cpp - AC,44.38%,64.27% cpp(no max) - AC,46.19%,67.47% py(no max - AC,61.42%,81.68% * word: en 2025.07.22 (#1035) (#1041) * 3202: O(k)空间 - AC.go+docs (#1035) (#1041) go - AC,17.49%,80.21% * 3202: docs-题解 (#1035) (#1041) * MGJW: git pull (#1046) - by others .pem泄露无所谓 反正为了指标的HTTPS只是一个笑话 * MGJW: test 150 times (#1046) 研二这个点加班的就我一个 - 这绝对有问题 * MGJW: once then once (#1046) 完成一个需求就会有下一个需求 * docs: 毕设月报 (#1046) 毁灭吧 世界 * MGJW: webex (#1046) 还挺快 * MGJW: git pull (#1046) by hand ofcoursely * MGJW: owa beacon generator (#1046) 看吧 我就说还有 * docs: 毕设月报 (#1046) 吃饭去 * log: 快快快 #1046 * docs: 毕设月报+en words (#1046) * 904: AC.cpp+WA.py (#1062) cpp - AC,60.78%,59.78% * archive: git switch master还没成功之时Ctrl+C了，然后pull master冲突了 Signed-off-by: LetMeFly666 <814114971@qq.com> * feat: subprocess test - windows上也会主程序立刻结束运行但5秒后文件被追加 (#1062) If you are sure you want to delete it, run 'git branch -D dev'. PS F:\OtherApps\Program\Git\Store\Store20_LeetCode> git push fatal: The current branch 904 has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin 904 To have this happen automatically for branches without a tracking upstream, see 'push.autoSetupRemote' in 'git help config'. PS F:\OtherApps\Program\Git\Store\Store20_LeetCode> git push --set-upstream origin 904 Enumerating objects: 131, done. Counting objects: 100% (127/127), done. Delta compression using up to 8 threads Compressing objects: 100% (91/91), done. Writing objects: 100% (94/94), 70.89 KiB | 448.00 KiB/s, done. Total 94 (delta 74), reused 1 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (74/74), completed with 20 local objects. To ssh.github.com:LetMeFly666/LeetCode 9515dbd..48ec15d 904 -> 904 branch '904' set up to track 'origin/904'. PS F:\OtherApps\Program\Git\Store\Store20_LeetCode> git branch -d dev warning: not deleting branch 'dev' that is not yet merged to 'refs/remotes/origin/dev', even though it is merged to HEAD. error: The branch 'dev' is not fully merged. If you are sure you want to delete it, run 'git branch -D dev'. PS F:\OtherApps\Program\Git\Store\Store20_LeetCode> git branch -D Dev Deleted branch Dev (was b28f785). PS F:\OtherApps\Program\Git\Store\Store20_LeetCode> * feat: subprocess test - windows上也会主程序立刻结束运行但5秒后文件被追加 (#1062) 48ec15d * 904: AC.py+go+WA.JAVA (#1062) py - AC,34.00%,55.14% go - AC,43.95%,98.14% * 904: AC.JAVA (#1062) java - AC,54.22%,11.58% * word: en words yesterday(2025.08.06) (#1062) * 904: CE.rust (#1062) * 904: CE.rust (#1062) * 904: AC.rist (#1062) rust - AC,46.96%,54.14% * word: en words today (#1062) * feat: rust-analyzer —— 一个不是很优雅的解决方案 (#1062) * feat: rust-analyzer (#1062) * 904: AC.rust (#1062) rust - AC,55.98%,57.61% * feat: rust-analyzer (humane) (#1062) * update: 添加问题“904.水果成篮”的代码(并更新其题解) (#1062) * feat: rust-analyzer (humane) (#1062) --------- Signed-off-by: LetMeFly666 <814114971@qq.com>
diff --git a/Codes/.gitignore b/Codes/.gitignore
@@ -0,0 +1,2 @@
+# rust output
+target/
diff --git a/Codes/0904-fruit-into-baskets_20250805.cpp b/Codes/0904-fruit-into-baskets_20250805.cpp
@@ -0,0 +1,28 @@
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-05 10:31:43
+ */
+#if defined(_WIN32) || defined(__APPLE__)
+#include "_[1,2]toVector.h"
+#endif
+
+class Solution {
+public:
+    int totalFruit(vector<int>& fruits) {
+        int ans = 0;
+        unordered_map<int, int> window;
+        for (int l = 0, r = 0; r < fruits.size(); r++) {
+            window[fruits[r]]++;
+            while (window.size() > 2) {
+                if (! --window[fruits[l]]) {
+                    window.erase(fruits[l]);
+                }
+                l++;
+            }
+            ans = max(ans, r - l + 1);
+        }
+        return ans;
+    }
+};
diff --git a/Codes/0904-fruit-into-baskets_20250805.go b/Codes/0904-fruit-into-baskets_20250805.go
@@ -0,0 +1,23 @@
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-06 18:33:14
+ */
+package main
+
+func totalFruit(fruits []int) (ans int) {
+    window := map[int]int{}
+    for l, r := 0, 0; r < len(fruits); r++ {
+        window[fruits[r]]++
+        for len(window) > 2 {
+            window[fruits[l]]--
+            if window[fruits[l]] == 0 {
+                delete(window, fruits[l])
+            }
+            l++
+        }
+        ans = max(ans, r - l + 1)
+    }
+    return
+}
diff --git a/Codes/0904-fruit-into-baskets_20250805.java b/Codes/0904-fruit-into-baskets_20250805.java
@@ -0,0 +1,27 @@
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-06 18:49:58
+ */
+import java.util.Map;
+import java.util.HashMap;
+
+class Solution {
+    public int totalFruit(int[] fruits) {
+        int ans = 0;
+        Map<Integer, Integer> window = new HashMap<>();
+        for (int l = 0, r = 0; r < fruits.length; r++) {
+            window.merge(fruits[r], 1, Integer::sum);
+            while (window.size() > 2) {
+                window.merge(fruits[l], -1, Integer::sum);
+                if (window.get(fruits[l]) == 0) {
+                    window.remove(fruits[l]);
+                }
+                l++;
+            }
+            ans = Math.max(ans, r - l + 1);
+        }
+        return ans;
+    }
+}
diff --git a/Codes/0904-fruit-into-baskets_20250805.py b/Codes/0904-fruit-into-baskets_20250805.py
@@ -0,0 +1,22 @@
+'''
+Author: LetMeFly
+Date: 2025-08-05 10:28:59
+LastEditors: LetMeFly.xyz
+LastEditTime: 2025-08-05 10:40:16
+'''
+from typing import List
+from collections import defaultdict
+
+class Solution:
+    def totalFruit(self, fruits: List[int]) -> int:
+        ans = l = 0
+        window = defaultdict(int)
+        for r, v in enumerate(fruits):
+            window[v] += 1
+            while len(window) > 2:
+                window[fruits[l]] -= 1
+                if not window[fruits[l]]:
+                    del window[fruits[l]]
+                l += 1
+            ans = max(ans, r - l + 1)
+        return ans
diff --git a/Codes/0904-fruit-into-baskets_20250805.rs b/Codes/0904-fruit-into-baskets_20250805.rs
@@ -0,0 +1,27 @@
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-08 10:23:47
+ */
+use std::collections::HashMap;
+
+impl Solution {
+    pub fn total_fruit(fruits: Vec<i32>) -> i32 {
+        let mut ans = 0;
+        let mut l = 0;
+        let mut window = HashMap::new();
+        for (r, &x) in fruits.iter().enumerate() {
+            *window.entry(x).or_insert(0) += 1;
+            while window.len() > 2 {
+                *window.entry(fruits[l]).or_insert(0) -= 1;  // 即使键一定存在也需要or_insert(一个默认值)
+                if window[&fruits[l]] == 0 {  // 键必须是&i32
+                    window.remove(&fruits[l]);
+                }
+                l += 1;
+            }
+            ans = ans.max(r - l + 1);
+        }
+        ans as i32
+    }
+}
diff --git a/Codes/Cargo.lock b/Codes/Cargo.lock
diff --git a/Codes/README.md b/Codes/README.md
@@ -1,8 +1,8 @@
 <!--
  * @Author: LetMeFly
  * @Date: 2023-10-20 22:24:18
- * @LastEditors: LetMeFly
- * @LastEditTime: 2023-10-20 22:24:18
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-08 09:52:46
 -->
 ## AC代码
 
@@ -73,3 +73,7 @@ int main() {
 ```
 
 可以通过[Github Gist](https://gist.github.com/LetMeFly666/9e9c47db429532b212537cc1f6f36a42)进行下载/查看
+
+## 其他文件
+
+`cargo.lock`、`cargo.toml`、`lib.rs`都是rust所需
diff --git a/Codes/cargo.toml b/Codes/cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "LetMeFly-LeetCode-Codes"
+version = "0.1.0"
+edition = "2021"
+
+# This tells rust-analyzer that the root of the library is lib.rs
+[lib]
+path = "lib.rs"
+
+[dependencies]
+# Add any common dependencies here if you suspect they are used.
+# For now, we can leave it empty or add a few common ones for LeetCode.
+# e.g., itertools = "0.10"
diff --git a/Codes/lib.rs b/Codes/lib.rs
@@ -0,0 +1,8 @@
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-07 14:11:36
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-08 10:19:31
+ */
+pub struct Solution;
+include!("0904-fruit-into-baskets_20250805.rs");  // 这个fileName是会被脚本替换掉的
diff --git a/Solutions/LeetCode 0904.水果成篮.md b/Solutions/LeetCode 0904.水果成篮.md
@@ -177,5 +177,157 @@ public:
 };
 ```
 
+#### C++
+
+```cpp
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-05 10:31:43
+ */
+#if defined(_WIN32) || defined(__APPLE__)
+#include "_[1,2]toVector.h"
+#endif
+
+class Solution {
+public:
+    int totalFruit(vector<int>& fruits) {
+        int ans = 0;
+        unordered_map<int, int> window;
+        for (int l = 0, r = 0; r < fruits.size(); r++) {
+            window[fruits[r]]++;
+            while (window.size() > 2) {
+                if (! --window[fruits[l]]) {
+                    window.erase(fruits[l]);
+                }
+                l++;
+            }
+            ans = max(ans, r - l + 1);
+        }
+        return ans;
+    }
+};
+```
+
+#### Python
+
+```python
+'''
+Author: LetMeFly
+Date: 2025-08-05 10:28:59
+LastEditors: LetMeFly.xyz
+LastEditTime: 2025-08-05 10:40:16
+'''
+from typing import List
+from collections import defaultdict
+
+class Solution:
+    def totalFruit(self, fruits: List[int]) -> int:
+        ans = l = 0
+        window = defaultdict(int)
+        for r, v in enumerate(fruits):
+            window[v] += 1
+            while len(window) > 2:
+                window[fruits[l]] -= 1
+                if not window[fruits[l]]:
+                    del window[fruits[l]]
+                l += 1
+            ans = max(ans, r - l + 1)
+        return ans
+```
+
+#### Golang
+
+```go
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-06 18:33:14
+ */
+package main
+
+func totalFruit(fruits []int) (ans int) {
+    window := map[int]int{}
+    for l, r := 0, 0; r < len(fruits); r++ {
+        window[fruits[r]]++
+        for len(window) > 2 {
+            window[fruits[l]]--
+            if window[fruits[l]] == 0 {
+                delete(window, fruits[l])
+            }
+            l++
+        }
+        ans = max(ans, r - l + 1)
+    }
+    return
+}
+```
+
+#### Java
+
+```java
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-06 18:49:58
+ */
+import java.util.Map;
+import java.util.HashMap;
+
+class Solution {
+    public int totalFruit(int[] fruits) {
+        int ans = 0;
+        Map<Integer, Integer> window = new HashMap<>();
+        for (int l = 0, r = 0; r < fruits.length; r++) {
+            window.merge(fruits[r], 1, Integer::sum);
+            while (window.size() > 2) {
+                window.merge(fruits[l], -1, Integer::sum);
+                if (window.get(fruits[l]) == 0) {
+                    window.remove(fruits[l]);
+                }
+                l++;
+            }
+            ans = Math.max(ans, r - l + 1);
+        }
+        return ans;
+    }
+}
+```
+
+#### Rust
+
+```rust
+/*
+ * @Author: LetMeFly
+ * @Date: 2025-08-05 10:28:59
+ * @LastEditors: LetMeFly.xyz
+ * @LastEditTime: 2025-08-08 10:23:47
+ */
+use std::collections::HashMap;
+
+impl Solution {
+    pub fn total_fruit(fruits: Vec<i32>) -> i32 {
+        let mut ans = 0;
+        let mut l = 0;
+        let mut window = HashMap::new();
+        for (r, &x) in fruits.iter().enumerate() {
+            *window.entry(x).or_insert(0) += 1;
+            while window.len() > 2 {
+                *window.entry(fruits[l]).or_insert(0) -= 1;  // 即使键一定存在也需要or_insert(一个默认值)
+                if window[&fruits[l]] == 0 {  // 键必须是&i32
+                    window.remove(&fruits[l]);
+                }
+                l += 1;
+            }
+            ans = ans.max(r - l + 1);
+        }
+        ans as i32
+    }
+}
+```
+
 > 同步发文于CSDN，原创不易，转载请附上[原文链接](https://blog.letmefly.xyz/2022/10/17/LeetCode%200904.%E6%B0%B4%E6%9E%9C%E6%88%90%E7%AF%AE/)哦~
 > Tisfy：[https://letmefly.blog.csdn.net/article/details/127358126](https://letmefly.blog.csdn.net/article/details/127358126)
diff --git a/Solutions/Other-English-LearningNotes-SomeWords.md b/Solutions/Other-English-LearningNotes-SomeWords.md
@@ -1335,6 +1335,14 @@ categories: [自用]
 |centigrade|n. 摄氏温度<br/>adj. 摄氏的|
 |||
 |antique|adj. 古董的，古老的，过时的，陈旧的<br/>n. 古物，古董|
+|||
+|carton|n. 硬纸板制成的容器(如牛奶盒)|
+|sober|adj. 未醉的，清醒的；严肃的，冷静的；朴素的<br/>v. 使清醒，使理智|
+|||
+|freight|v. 货运，寄送，使充满(某种心情/口气)<br/>n. 货运，(海/陆/空运的)货物|
+|fervent|adj. 热情的，热枕的，热诚的，热烈的|
+|||
+|figurative|adj. 比喻的，形象的<details><summary>例句</summary>In <font color="#28bea0">figurative</font> language, words are used to create images and ideas.<br/>在比喻性语言中，词语用于创造图像和想法。</details>|
 
 这个web要是能设计得可以闭眼(完全不睁眼)键盘控制背单词就好了。
 
diff --git a/Solutions/Other-Notes-Mianjing.md b/Solutions/Other-Notes-Mianjing.md
@@ -45,7 +45,7 @@ mermaid: true
 1. `Cache-Control`，是一个相对时间；
 2. `Expires`，是一个绝对时间。
 
-二者同时存在的化，`Cache-Control`的优先级更高。（推荐）
+二者同时存在的话，`Cache-Control`的优先级更高。（推荐）
 
 #### 协商缓存
 
@@ -343,7 +343,7 @@ InnoDB为每行数据添加了三个隐藏字段：
 1. 若修改记录的事务id就是事务id，则该修改记录对该事务可见
 2. 若修改记录的trx_id小于read view中的min_trx_id，则说明记录是在read view创建前已提交的事务生成的，该版本的记录对当前事务可见
 3. 若trx_id大于等于max_trx_id，说明是该事务启动后的事务修改的，对该事务不可见，该事务开始遍历undo log中的下一条修改记录并进行相同的4种判断
-4. 若$min\_trx\_id\leq trx\_id \lt max\_trx\_id$：若该事务id在m_ids列表则说明生成该版本记录事务依然活跃着仍未提交(该版本对当前事务不可见)；若该事务id不再m_ids中则说明生成该版本记录的事务已经被提交(该版本记录对当前事务可见)
+4. 若$min\_trx\_id\leq trx\_id \lt max\_trx\_id$：若该事务id在m_ids列表则说明生成该版本记录事务依然活跃着仍未提交(该版本对当前事务不可见)；若该事务id不在m_ids中则说明生成该版本记录的事务已经被提交(该版本记录对当前事务可见)
 
 可重复读和读提交的实现方式：
 
diff --git a/TODO b/TODO
diff --git a/newSolution.py b/newSolution.py
diff --git a/tryGoPy/trySubCMD/testSubCMD.py b/tryGoPy/trySubCMD/testSubCMD.py
diff --git a/tryGoPy/trySubCMD/testSubCMD.sh b/tryGoPy/trySubCMD/testSubCMD.sh
diff --git a/tryGoPy/trySubCMD/testSubCMD.txt b/tryGoPy/trySubCMD/testSubCMD.txt
