From 7a96f6a743d174ca02e9e67e9a866c0e8b132503 Mon Sep 17 00:00:00 2001 From: rongyi Date: Sat, 11 May 2024 17:59:11 +0800 Subject: [PATCH 1/6] Fix panic when array's len is less than 2 (#1353) --- codes/rust/chapter_sorting/heap_sort.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codes/rust/chapter_sorting/heap_sort.rs b/codes/rust/chapter_sorting/heap_sort.rs index d01202b4c..105ade56c 100644 --- a/codes/rust/chapter_sorting/heap_sort.rs +++ b/codes/rust/chapter_sorting/heap_sort.rs @@ -35,11 +35,11 @@ fn sift_down(nums: &mut [i32], n: usize, mut i: usize) { /* 堆排序 */ fn heap_sort(nums: &mut [i32]) { // 建堆操作：堆化除叶节点以外的其他所有节点 - for i in (0..=nums.len() / 2 - 1).rev() { + for i in (0..nums.len() / 2).rev() { sift_down(nums, nums.len(), i); } // 从堆中提取最大元素，循环 n-1 轮 - for i in (1..=nums.len() - 1).rev() { + for i in (1..nums.len()).rev() { // 交换根节点与最右叶节点（交换首元素与尾元素） let tmp = nums[0]; nums[0] = nums[i]; From ebff1cce9f13614d55bfa941c1c85decf353890b Mon Sep 17 00:00:00 2001 From: rongyi Date: Sat, 11 May 2024 17:59:44 +0800 Subject: [PATCH 2/6] Stick with swap (#1352) --- codes/rust/chapter_sorting/bubble_sort.rs | 8 ++------ codes/rust/chapter_sorting/heap_sort.rs | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/codes/rust/chapter_sorting/bubble_sort.rs b/codes/rust/chapter_sorting/bubble_sort.rs index d7fde10ae..2557a222f 100644 --- a/codes/rust/chapter_sorting/bubble_sort.rs +++ b/codes/rust/chapter_sorting/bubble_sort.rs @@ -14,9 +14,7 @@ fn bubble_sort(nums: &mut [i32]) { for j in 0..i { if nums[j] > nums[j + 1] { // 交换 nums[j] 与 nums[j + 1] - let tmp = nums[j]; - nums[j] = nums[j + 1]; - nums[j + 1] = tmp; + nums.swap(j, j + 1); } } } @@ -31,9 +29,7 @@ fn bubble_sort_with_flag(nums: &mut [i32]) { for j in 0..i { if nums[j] > nums[j + 1] { // 交换 nums[j] 与 nums[j + 1] - let tmp = nums[j]; - nums[j] = nums[j + 1]; - nums[j + 1] = tmp; + nums.swap(j, j + 1); flag = true; // 记录交换元素 } } diff --git a/codes/rust/chapter_sorting/heap_sort.rs b/codes/rust/chapter_sorting/heap_sort.rs index 105ade56c..55ab52428 100644 --- a/codes/rust/chapter_sorting/heap_sort.rs +++ b/codes/rust/chapter_sorting/heap_sort.rs @@ -24,9 +24,7 @@ fn sift_down(nums: &mut [i32], n: usize, mut i: usize) { break; } // 交换两节点 - let temp = nums[i]; - nums[i] = nums[ma]; - nums[ma] = temp; + nums.swap(i, ma); // 循环向下堆化 i = ma; } @@ -41,9 +39,7 @@ fn heap_sort(nums: &mut [i32]) { // 从堆中提取最大元素，循环 n-1 轮 for i in (1..nums.len()).rev() { // 交换根节点与最右叶节点（交换首元素与尾元素） - let tmp = nums[0]; - nums[0] = nums[i]; - nums[i] = tmp; + nums.swap(0, i); // 以根节点为起点，从顶至底进行堆化 sift_down(nums, i, 0); } From 063a41fa7f4ad1def279945a1882977d4eb3d098 Mon Sep 17 00:00:00 2001 From: rongyi Date: Sun, 12 May 2024 14:49:25 +0800 Subject: [PATCH 3/6] [Rust] No need to use mut iter (#1356) * No need to use mut iter * Update iter --- codes/rust/chapter_sorting/bucket_sort.rs | 6 +++--- codes/rust/chapter_sorting/counting_sort.rs | 16 +++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/codes/rust/chapter_sorting/bucket_sort.rs b/codes/rust/chapter_sorting/bucket_sort.rs index 5bec09451..02e09abf2 100644 --- a/codes/rust/chapter_sorting/bucket_sort.rs +++ b/codes/rust/chapter_sorting/bucket_sort.rs @@ -12,7 +12,7 @@ fn bucket_sort(nums: &mut [f64]) { let k = nums.len() / 2; let mut buckets = vec![vec![]; k]; // 1. 将数组元素分配到各个桶中 - for &mut num in &mut *nums { + for &num in nums.iter() { // 输入数据范围为 [0, 1)，使用 num * k 映射到索引范围 [0, k-1] let i = (num * k as f64) as usize; // 将 num 添加进桶 i @@ -25,8 +25,8 @@ fn bucket_sort(nums: &mut [f64]) { } // 3. 遍历桶合并结果 let mut i = 0; - for bucket in &mut buckets { - for &mut num in bucket { + for bucket in buckets.iter() { + for &num in bucket.iter() { nums[i] = num; i += 1; } diff --git a/codes/rust/chapter_sorting/counting_sort.rs b/codes/rust/chapter_sorting/counting_sort.rs index ca4ed0de3..c6a5d92cd 100644 --- a/codes/rust/chapter_sorting/counting_sort.rs +++ b/codes/rust/chapter_sorting/counting_sort.rs @@ -10,11 +10,11 @@ include!("../include/include.rs"); // 简单实现，无法用于排序对象 fn counting_sort_naive(nums: &mut [i32]) { // 1. 统计数组最大元素 m - let m = *nums.into_iter().max().unwrap(); + let m = *nums.iter().max().unwrap(); // 2. 统计各数字的出现次数 // counter[num] 代表 num 的出现次数 let mut counter = vec![0; m as usize + 1]; - for &num in &*nums { + for &num in nums.iter() { counter[num as usize] += 1; } // 3. 遍历 counter ，将各元素填入原数组 nums @@ -31,16 +31,16 @@ fn counting_sort_naive(nums: &mut [i32]) { // 完整实现，可排序对象，并且是稳定排序 fn counting_sort(nums: &mut [i32]) { // 1. 统计数组最大元素 m - let m = *nums.into_iter().max().unwrap(); + let m = *nums.iter().max().unwrap() as usize; // 2. 统计各数字的出现次数 // counter[num] 代表 num 的出现次数 - let mut counter = vec![0; m as usize + 1]; - for &num in &*nums { + let mut counter = vec![0; m + 1]; + for &num in nums.iter() { counter[num as usize] += 1; } // 3. 求 counter 的前缀和，将“出现次数”转换为“尾索引” // 即 counter[num]-1 是 num 在 res 中最后一次出现的索引 - for i in 0..m as usize { + for i in 0..m { counter[i + 1] += counter[i]; } // 4. 倒序遍历 nums ，将各元素填入结果数组 res @@ -53,9 +53,7 @@ fn counting_sort(nums: &mut [i32]) { counter[num as usize] -= 1; // 令前缀和自减 1 ，得到下次放置 num 的索引 } // 使用结果数组 res 覆盖原数组 nums - for i in 0..n { - nums[i] = res[i]; - } + nums.copy_from_slice(&res) } /* Driver Code */ From 9e569cf5202d622d7ffae4931c8ebbb6f4a7289d Mon Sep 17 00:00:00 2001 From: khoaxuantu <68913255+khoaxuantu@users.noreply.github.com> Date: Wed, 15 May 2024 17:14:15 +0700 Subject: [PATCH 4/6] feat: add ruby code - chapter "divide and conquer" (#1361) --- .../binary_search_recur.rb | 42 ++++++++++++++ .../chapter_divide_and_conquer/build_tree.rb | 46 ++++++++++++++++ .../ruby/chapter_divide_and_conquer/hanota.rb | 55 +++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 codes/ruby/chapter_divide_and_conquer/binary_search_recur.rb create mode 100644 codes/ruby/chapter_divide_and_conquer/build_tree.rb create mode 100644 codes/ruby/chapter_divide_and_conquer/hanota.rb diff --git a/codes/ruby/chapter_divide_and_conquer/binary_search_recur.rb b/codes/ruby/chapter_divide_and_conquer/binary_search_recur.rb new file mode 100644 index 000000000..214a7cbf5 --- /dev/null +++ b/codes/ruby/chapter_divide_and_conquer/binary_search_recur.rb @@ -0,0 +1,42 @@ +=begin +File: binary_search_recur.rb +Created Time: 2024-05-13 +Author: Xuan Khoa Tu Nguyen (ngxktuzkai2000@gmail.com) +=end + +### 二分查找：问题 f(i, j) ### +def dfs(nums, target, i, j) + # 若区间为空，代表无目标元素，则返回 -1 + return -1 if i > j + + # 计算中点索引 m + m = (i + j) / 2 + + if nums[m] < target + # 递归子问题 f(m+1, j) + return dfs(nums, target, m + 1, j) + elsif nums[m] > target + # 递归子问题 f(i, m-1) + return dfs(nums, target, i, m - 1) + else + # 找到目标元素，返回其索引 + return m + end +end + +### 二分查找 ### +def binary_search(nums, target) + n = nums.length + # 求解问题 f(0, n-1) + dfs(nums, target, 0, n - 1) +end + +### Driver Code ### +if __FILE__ == $0 + target = 6 + nums = [1, 3, 6, 8, 12, 15, 23, 26, 31, 35] + + # 二分查找（双闭区间） + index = binary_search(nums, target) + puts "目标元素 6 的索引 = #{index}" +end diff --git a/codes/ruby/chapter_divide_and_conquer/build_tree.rb b/codes/ruby/chapter_divide_and_conquer/build_tree.rb new file mode 100644 index 000000000..3d562c820 --- /dev/null +++ b/codes/ruby/chapter_divide_and_conquer/build_tree.rb @@ -0,0 +1,46 @@ +=begin +File: build_tree.rb +Created Time: 2024-05-13 +Author: Xuan Khoa Tu Nguyen (ngxktuzkai2000@gmail.com) +=end + +require_relative '../utils/tree_node' +require_relative '../utils/print_util' + +### 构建二叉树：分治 ### +def dfs(preorder, inorder_map, i, l, r) + # 子树区间为空时终止 + return if r - l < 0 + + # 初始化根节点 + root = TreeNode.new(preorder[i]) + # 查询 m ，从而划分左右子树 + m = inorder_map[preorder[i]] + # 子问题：构建左子树 + root.left = dfs(preorder, inorder_map, i + 1, l, m - 1) + # 子问题：构建右子树 + root.right = dfs(preorder, inorder_map, i + 1 + m - l, m + 1, r) + + # 返回根节点 + root +end + +### 构建二叉树 ### +def build_tree(preorder, inorder) + # 初始化哈希表，存储 inorder 元素到索引的映射 + inorder_map = {} + inorder.each_with_index { |val, i| inorder_map[val] = i } + dfs(preorder, inorder_map, 0, 0, inorder.length - 1) +end + +### Driver Code ### +if __FILE__ == $0 + preorder = [3, 9, 2, 1, 7] + inorder = [9, 3, 1, 2, 7] + puts "前序遍历 = #{preorder}" + puts "中序遍历 = #{inorder}" + + root = build_tree(preorder, inorder) + puts "构建的二叉树为：" + print_tree(root) +end diff --git a/codes/ruby/chapter_divide_and_conquer/hanota.rb b/codes/ruby/chapter_divide_and_conquer/hanota.rb new file mode 100644 index 000000000..456ccbd4e --- /dev/null +++ b/codes/ruby/chapter_divide_and_conquer/hanota.rb @@ -0,0 +1,55 @@ +=begin +File: hanota.rb +Created Time: 2024-05-13 +Author: Xuan Khoa Tu Nguyen (ngxktuzkai2000@gmail.com) +=end + +### 移动一个圆盘 ### +def move(src, tar) + # 从 src 顶部拿出一个圆盘 + pan = src.pop + # 将圆盘放入 tar 顶部 + tar << pan +end + +### 求解汉诺塔问题 f(i) ### +def dfs(i, src, buf, tar) + # 若 src 只剩下一个圆盘，则直接将其移到 tar + if i == 1 + move(src, tar) + return + end + + # 子问题 f(i-1) ：将 src 顶部 i-1 个圆盘借助 tar 移到 buf + dfs(i - 1, src, tar, buf) + # 子问题 f(1) ：将 src 剩余一个圆盘移到 tar + move(src, tar) + # 子问题 f(i-1) ：将 buf 顶部 i-1 个圆盘借助 src 移到 tar + dfs(i - 1, buf, src, tar) +end + +### 求解汉诺塔问题 ### +def solve_hanota(_A, _B, _C) + n = _A.length + # 将 A 顶部 n 个圆盘借助 B 移到 C + dfs(n, _A, _B, _C) +end + +### Driver Code ### +if __FILE__ == $0 + # 列表尾部是柱子顶部 + A = [5, 4, 3, 2, 1] + B = [] + C = [] + puts "初始状态下：" + puts "A = #{A}" + puts "B = #{B}" + puts "C = #{C}" + + solve_hanota(A, B, C) + + puts "圆盘移动完成后：" + puts "A = #{A}" + puts "B = #{B}" + puts "C = #{C}" +end From 840692acce6746e87abd9bce2345d190f35df31f Mon Sep 17 00:00:00 2001 From: rongyi Date: Wed, 15 May 2024 18:16:55 +0800 Subject: [PATCH 5/6] Idiomatic rust (#1364) --- codes/rust/chapter_divide_and_conquer/hanota.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codes/rust/chapter_divide_and_conquer/hanota.rs b/codes/rust/chapter_divide_and_conquer/hanota.rs index 705f817b9..92880a0bc 100644 --- a/codes/rust/chapter_divide_and_conquer/hanota.rs +++ b/codes/rust/chapter_divide_and_conquer/hanota.rs @@ -9,7 +9,7 @@ /* 移动一个圆盘 */ fn move_pan(src: &mut Vec, tar: &mut Vec) { // 从 src 顶部拿出一个圆盘 - let pan = src.remove(src.len() - 1); + let pan = src.pop().unwrap(); // 将圆盘放入 tar 顶部 tar.push(pan); } From 9afbc9eda5bb2cdff36da7711209e3da9b59788f Mon Sep 17 00:00:00 2001 From: CarrotDLaw Date: Wed, 15 May 2024 18:31:48 +0800 Subject: [PATCH 6/6] [Rust] Use arrays instead of vectors in Chapter 4.1 Array (#1357) * [Rust] Use array in chapter 4.1 * docs: update comments * docs: update comments * docs: update comments * fix: update slices * docs: update comments --- .../rust/chapter_array_and_linkedlist/array.rs | 18 ++++++++++-------- docs/chapter_array_and_linkedlist/array.md | 7 ++++++- en/docs/chapter_array_and_linkedlist/array.md | 7 ++++++- .../rust/chapter_array_and_linkedlist/array.rs | 18 ++++++++++-------- .../docs/chapter_array_and_linkedlist/array.md | 7 ++++++- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/codes/rust/chapter_array_and_linkedlist/array.rs b/codes/rust/chapter_array_and_linkedlist/array.rs index 30887fe80..c529105a3 100644 --- a/codes/rust/chapter_array_and_linkedlist/array.rs +++ b/codes/rust/chapter_array_and_linkedlist/array.rs @@ -18,7 +18,7 @@ fn random_access(nums: &[i32]) -> i32 { } /* 扩展数组长度 */ -fn extend(nums: Vec, enlarge: usize) -> Vec { +fn extend(nums: &[i32], enlarge: usize) -> Vec { // 初始化一个扩展长度后的数组 let mut res: Vec = vec![0; nums.len() + enlarge]; // 将原数组中的所有元素复制到新 @@ -30,7 +30,7 @@ fn extend(nums: Vec, enlarge: usize) -> Vec { } /* 在数组的索引 index 处插入元素 num */ -fn insert(nums: &mut Vec, num: i32, index: usize) { +fn insert(nums: &mut [i32], num: i32, index: usize) { // 把索引 index 以及之后的所有元素向后移动一位 for i in (index + 1..nums.len()).rev() { nums[i] = nums[i - 1]; @@ -40,7 +40,7 @@ fn insert(nums: &mut Vec, num: i32, index: usize) { } /* 删除索引 index 处的元素 */ -fn remove(nums: &mut Vec, index: usize) { +fn remove(nums: &mut [i32], index: usize) { // 把索引 index 之后的所有元素向前移动一位 for i in index..nums.len() - 1 { nums[i] = nums[i + 1]; @@ -73,13 +73,15 @@ fn find(nums: &[i32], target: i32) -> Option { /* Driver Code */ fn main() { /* 初始化数组 */ - let arr = [0; 5]; + let arr: [i32; 5] = [0; 5]; + let slice: &[i32] = &[0; 5]; print!("数组 arr = "); print_util::print_array(&arr); - // 在 Rust 中，指定长度时（[i32; 5]）为数组 + // 在 Rust 中，指定长度时（[i32; 5]）为数组，不指定长度时（&[i32]）为切片 // 由于 Rust 的数组被设计为在编译期确定长度，因此只能使用常量来指定长度 - // 为了方便实现扩容 extend() 方法，以下将(Vec) 看作数组（Array）也是rust一般情况下使用动态数组的类型 - let nums = vec![1, 3, 2, 5, 4]; + // Vector 是 Rust 一般情况下用作动态数组的类型 + // 为了方便实现扩容 extend() 方法，以下将 vector 看作数组（array） + let nums: Vec = vec![1, 3, 2, 5, 4]; print!("\n数组 nums = "); print_util::print_array(&nums); @@ -88,7 +90,7 @@ fn main() { println!("\n在 nums 中获取随机元素 {}", random_num); // 长度扩展 - let mut nums = extend(nums, 3); + let mut nums: Vec = extend(&nums, 3); print!("将数组长度扩展至 8 ，得到 nums = "); print_util::print_array(&nums); diff --git a/docs/chapter_array_and_linkedlist/array.md b/docs/chapter_array_and_linkedlist/array.md index a9fddfb6d..98452f0b7 100755 --- a/docs/chapter_array_and_linkedlist/array.md +++ b/docs/chapter_array_and_linkedlist/array.md @@ -93,7 +93,12 @@ ```rust title="array.rs" /* 初始化数组 */ - let arr: Vec = vec![0; 5]; // [0, 0, 0, 0, 0] + let arr: [i32; 5] = [0; 5]; // [0, 0, 0, 0, 0] + let slice: &[i32] = &[0; 5]; + // 在 Rust 中，指定长度时（[i32; 5]）为数组，不指定长度时（&[i32]）为切片 + // 由于 Rust 的数组被设计为在编译期确定长度，因此只能使用常量来指定长度 + // Vector 是 Rust 一般情况下用作动态数组的类型 + // 为了方便实现扩容 extend() 方法，以下将 vector 看作数组（array） let nums: Vec = vec![1, 3, 2, 5, 4]; ``` diff --git a/en/docs/chapter_array_and_linkedlist/array.md b/en/docs/chapter_array_and_linkedlist/array.md index 4aaefa862..639f83018 100755 --- a/en/docs/chapter_array_and_linkedlist/array.md +++ b/en/docs/chapter_array_and_linkedlist/array.md @@ -93,7 +93,12 @@ Arrays can be initialized in two ways depending on the needs: either without ini ```rust title="array.rs" /* Initialize array */ - let arr: Vec = vec![0; 5]; // [0, 0, 0, 0, 0] + let arr: [i32; 5] = [0; 5]; // [0, 0, 0, 0, 0] + let slice: &[i32] = &[0; 5]; + // In Rust, specifying the length ([i32; 5]) denotes an array, while not specifying it (&[i32]) denotes a slice. + // Since Rust's arrays are designed to have compile-time fixed length, only constants can be used to specify the length. + // Vectors are generally used as dynamic arrays in Rust. + // For convenience in implementing the extend() method, the vector will be considered as an array here. let nums: Vec = vec![1, 3, 2, 5, 4]; ``` diff --git a/zh-hant/codes/rust/chapter_array_and_linkedlist/array.rs b/zh-hant/codes/rust/chapter_array_and_linkedlist/array.rs index 649e3dedf..519bc711b 100644 --- a/zh-hant/codes/rust/chapter_array_and_linkedlist/array.rs +++ b/zh-hant/codes/rust/chapter_array_and_linkedlist/array.rs @@ -18,7 +18,7 @@ fn random_access(nums: &[i32]) -> i32 { } /* 擴展陣列長度 */ -fn extend(nums: Vec, enlarge: usize) -> Vec { +fn extend(nums: &[i32], enlarge: usize) -> Vec { // 初始化一個擴展長度後的陣列 let mut res: Vec = vec![0; nums.len() + enlarge]; // 將原陣列中的所有元素複製到新 @@ -30,7 +30,7 @@ fn extend(nums: Vec, enlarge: usize) -> Vec { } /* 在陣列的索引 index 處插入元素 num */ -fn insert(nums: &mut Vec, num: i32, index: usize) { +fn insert(nums: &mut [i32], num: i32, index: usize) { // 把索引 index 以及之後的所有元素向後移動一位 for i in (index + 1..nums.len()).rev() { nums[i] = nums[i - 1]; @@ -40,7 +40,7 @@ fn insert(nums: &mut Vec, num: i32, index: usize) { } /* 刪除索引 index 處的元素 */ -fn remove(nums: &mut Vec, index: usize) { +fn remove(nums: &mut [i32], index: usize) { // 把索引 index 之後的所有元素向前移動一位 for i in index..nums.len() - 1 { nums[i] = nums[i + 1]; @@ -73,13 +73,15 @@ fn find(nums: &[i32], target: i32) -> Option { /* Driver Code */ fn main() { /* 初始化陣列 */ - let arr = [0; 5]; + let arr: [i32; 5] = [0; 5]; + let slice: &[i32] = &[0; 5]; print!("陣列 arr = "); print_util::print_array(&arr); - // 在 Rust 中，指定長度時（[i32; 5]）為陣列 + // 在 Rust 中，指定長度时（[i32; 5]）爲陣列，不指定長度時（&[i32]）爲切片 // 由於 Rust 的陣列被設計為在編譯期確定長度，因此只能使用常數來指定長度 - // 為了方便實現擴容 extend() 方法，以下將(Vec) 看作陣列（Array）也是rust一般情況下使用動態陣列的型別 - let nums = vec![1, 3, 2, 5, 4]; + // Vector 是 Rust 一般情況下用作動態陣列的類型 + // 為了方便實現擴容 extend() 方法，以下將 vector 看作陣列（array） + let nums: Vec = vec![1, 3, 2, 5, 4]; print!("\n陣列 nums = "); print_util::print_array(&nums); @@ -88,7 +90,7 @@ fn main() { println!("\n在 nums 中獲取隨機元素 {}", random_num); // 長度擴展 - let mut nums = extend(nums, 3); + let mut nums: Vec = extend(&nums, 3); print!("將陣列長度擴展至 8 ，得到 nums = "); print_util::print_array(&nums); diff --git a/zh-hant/docs/chapter_array_and_linkedlist/array.md b/zh-hant/docs/chapter_array_and_linkedlist/array.md index f4156b010..c849a642d 100755 --- a/zh-hant/docs/chapter_array_and_linkedlist/array.md +++ b/zh-hant/docs/chapter_array_and_linkedlist/array.md @@ -93,7 +93,12 @@ ```rust title="array.rs" /* 初始化陣列 */ - let arr: Vec = vec![0; 5]; // [0, 0, 0, 0, 0] + let arr: [i32; 5] = [0; 5]; // [0, 0, 0, 0, 0] + let slice: &[i32] = &[0; 5]; + // 在 Rust 中，指定長度时（[i32; 5]）爲陣列，不指定長度時（&[i32]）爲切片 + // 由於 Rust 的陣列被設計為在編譯期確定長度，因此只能使用常數來指定長度 + // Vector 是 Rust 一般情況下用作動態陣列的類型 + // 為了方便實現擴容 extend() 方法，以下將 vector 看作陣列（array） let nums: Vec = vec![1, 3, 2, 5, 4]; ```