Improve readability of kotlin code (#1233)

* style(kotlin): Improve kotlin codes readability. * remove redundant quotes.
krahets · Apr 7, 2024 · 5725b8a · 5725b8a
1 parent e121665
commit 5725b8a
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 101 deletions.
diff --git a/codes/kotlin/chapter_divide_and_conquer/build_tree.kt b/codes/kotlin/chapter_divide_and_conquer/build_tree.kt
@@ -10,7 +10,13 @@ import utils.TreeNode
 import utils.printTree
 
 /* 构建二叉树：分治 */
-fun dfs(preorder: IntArray, inorderMap: Map<Int?, Int?>, i: Int, l: Int, r: Int): TreeNode? {
+fun dfs(
+    preorder: IntArray,
+    inorderMap: Map<Int?, Int?>,
+    i: Int,
+    l: Int,
+    r: Int
+): TreeNode? {
     // 子树区间为空时终止
     if (r - l < 0) return null
     // 初始化根节点
@@ -28,7 +34,7 @@ fun dfs(preorder: IntArray, inorderMap: Map<Int?, Int?>, i: Int, l: Int, r: Int)
 /* 构建二叉树 */
 fun buildTree(preorder: IntArray, inorder: IntArray): TreeNode? {
     // 初始化哈希表，存储 inorder 元素到索引的映射
-    val inorderMap: MutableMap<Int?, Int?> = HashMap()
+    val inorderMap = HashMap<Int?, Int?>()
     for (i in inorder.indices) {
         inorderMap[inorder[i]] = i
     }
@@ -40,8 +46,8 @@ fun buildTree(preorder: IntArray, inorder: IntArray): TreeNode? {
 fun main() {
     val preorder = intArrayOf(3, 9, 2, 1, 7)
     val inorder = intArrayOf(9, 3, 1, 2, 7)
-    println("前序遍历 = " + preorder.contentToString())
-    println("中序遍历 = " + inorder.contentToString())
+    println("前序遍历 = ${preorder.contentToString()}")
+    println("中序遍历 = ${inorder.contentToString()}")
 
     val root = buildTree(preorder, inorder)
     println("构建的二叉树为：")

diff --git a/codes/kotlin/chapter_divide_and_conquer/hanota.kt b/codes/kotlin/chapter_divide_and_conquer/hanota.kt
@@ -9,7 +9,7 @@ package chapter_divide_and_conquer.hanota
 /* 移动一个圆盘 */
 fun move(src: MutableList<Int>, tar: MutableList<Int>) {
     // 从 src 顶部拿出一个圆盘
-    val pan: Int = src.removeAt(src.size - 1)
+    val pan = src.removeAt(src.size - 1)
     // 将圆盘放入 tar 顶部
     tar.add(pan)
 }
@@ -39,9 +39,9 @@ fun solveHanota(A: MutableList<Int>, B: MutableList<Int>, C: MutableList<Int>) {
 /* Driver Code */
 fun main() {
     // 列表尾部是柱子顶部
-    val A: MutableList<Int> = ArrayList(mutableListOf(5, 4, 3, 2, 1))
-    val B: MutableList<Int> = ArrayList()
-    val C: MutableList<Int> = ArrayList()
+    val A = mutableListOf(5, 4, 3, 2, 1)
+    val B = mutableListOf<Int>()
+    val C = mutableListOf<Int>()
     println("初始状态下：")
     println("A = $A")
     println("B = $B")
@@ -53,4 +53,4 @@ fun main() {
     println("A = $A")
     println("B = $B")
     println("C = $C")
-}
+}
diff --git a/codes/kotlin/chapter_dynamic_programming/climbing_stairs_backtrack.kt b/codes/kotlin/chapter_dynamic_programming/climbing_stairs_backtrack.kt
@@ -8,13 +8,14 @@ package chapter_dynamic_programming
 
 /* 回溯 */
 fun backtrack(
-    choices: List<Int>,
+    choices: MutableList<Int>,
     state: Int,
     n: Int,
     res: MutableList<Int>
 ) {
     // 当爬到第 n 阶时，方案数量加 1
-    if (state == n) res[0] = res[0] + 1
+    if (state == n)
+        res[0] = res[0] + 1
     // 遍历所有选择
     for (choice in choices) {
         // 剪枝：不允许越过第 n 阶
@@ -29,7 +30,7 @@ fun backtrack(
 fun climbingStairsBacktrack(n: Int): Int {
     val choices = mutableListOf(1, 2) // 可选择向上爬 1 阶或 2 阶
     val state = 0 // 从第 0 阶开始爬
-    val res = ArrayList<Int>()
+    val res = mutableListOf<Int>()
     res.add(0) // 使用 res[0] 记录方案数量
     backtrack(choices, state, n, res)
     return res[0]

diff --git a/codes/kotlin/chapter_dynamic_programming/climbing_stairs_dfs_mem.kt b/codes/kotlin/chapter_dynamic_programming/climbing_stairs_dfs_mem.kt
@@ -6,8 +6,6 @@
 
 package chapter_dynamic_programming
 
-import java.util.*
-
 /* 记忆化搜索 */
 fun dfs(i: Int, mem: IntArray): Int {
     // 已知 dp[1] 和 dp[2] ，返回之
@@ -25,14 +23,14 @@ fun dfs(i: Int, mem: IntArray): Int {
 fun climbingStairsDFSMem(n: Int): Int {
     // mem[i] 记录爬到第 i 阶的方案总数，-1 代表无记录
     val mem = IntArray(n + 1)
-    Arrays.fill(mem, -1)
+    mem.fill(-1)
     return dfs(n, mem)
 }
 
 /* Driver Code */
 fun main() {
     val n = 9
 
-    val res: Int = climbingStairsDFSMem(n)
+    val res = climbingStairsDFSMem(n)
     println("爬 $n 阶楼梯共有 $res 种方案")
 }
diff --git a/codes/kotlin/chapter_dynamic_programming/climbing_stairs_dp.kt b/codes/kotlin/chapter_dynamic_programming/climbing_stairs_dp.kt
@@ -27,9 +27,7 @@ fun climbingStairsDPComp(n: Int): Int {
     var a = 1
     var b = 2
     for (i in 3..n) {
-        val tmp = b
-        b += a
-        a = tmp
+        b += a.also { a = b }
     }
     return b
 }

diff --git a/codes/kotlin/chapter_dynamic_programming/coin_change.kt b/codes/kotlin/chapter_dynamic_programming/coin_change.kt
@@ -6,7 +6,6 @@
 
 package chapter_dynamic_programming
 
-import java.util.*
 import kotlin.math.min
 
 /* 零钱兑换：动态规划 */
@@ -27,8 +26,7 @@ fun coinChangeDP(coins: IntArray, amt: Int): Int {
                 dp[i][a] = dp[i - 1][a]
             } else {
                 // 不选和选硬币 i 这两种方案的较小值
-                dp[i][a] = min(dp[i - 1][a].toDouble(), (dp[i][a - coins[i - 1]] + 1).toDouble())
-                    .toInt()
+                dp[i][a] = min(dp[i - 1][a], dp[i][a - coins[i - 1]] + 1)
             }
         }
     }
@@ -41,7 +39,7 @@ fun coinChangeDPComp(coins: IntArray, amt: Int): Int {
     val MAX = amt + 1
     // 初始化 dp 表
     val dp = IntArray(amt + 1)
-    Arrays.fill(dp, MAX)
+    dp.fill(MAX)
     dp[0] = 0
     // 状态转移
     for (i in 1..n) {
@@ -51,7 +49,7 @@ fun coinChangeDPComp(coins: IntArray, amt: Int): Int {
                 dp[a] = dp[a]
             } else {
                 // 不选和选硬币 i 这两种方案的较小值
-                dp[a] = min(dp[a].toDouble(), (dp[a - coins[i - 1]] + 1).toDouble()).toInt()
+                dp[a] = min(dp[a], dp[a - coins[i - 1]] + 1)
             }
         }
     }
@@ -70,4 +68,4 @@ fun main() {
     // 空间优化后的动态规划
     res = coinChangeDPComp(coins, amt)
     println("凑到目标金额所需的最少硬币数量为 $res")
-}
+}
diff --git a/codes/kotlin/chapter_dynamic_programming/edit_distance.kt b/codes/kotlin/chapter_dynamic_programming/edit_distance.kt
@@ -6,7 +6,6 @@
 
 package chapter_dynamic_programming
 
-import java.util.*
 import kotlin.math.min
 
 /* 编辑距离：暴力搜索 */
@@ -29,7 +28,7 @@ fun editDistanceDFS(
     val delete = editDistanceDFS(s, t, i - 1, j)
     val replace = editDistanceDFS(s, t, i - 1, j - 1)
     // 返回最少编辑步数
-    return (min(min(insert.toDouble(), delete.toDouble()), replace.toDouble()) + 1).toInt()
+    return min(min(insert, delete), replace) + 1
 }
 
 /* 编辑距离：记忆化搜索 */
@@ -55,7 +54,7 @@ fun editDistanceDFSMem(
     val delete = editDistanceDFSMem(s, t, mem, i - 1, j)
     val replace = editDistanceDFSMem(s, t, mem, i - 1, j - 1)
     // 记录并返回最少编辑步数
-    mem[i][j] = (min(min(insert.toDouble(), delete.toDouble()), replace.toDouble()) + 1).toInt()
+    mem[i][j] = min(min(insert, delete), replace) + 1
     return mem[i][j]
 }
 
@@ -79,11 +78,7 @@ fun editDistanceDP(s: String, t: String): Int {
                 dp[i][j] = dp[i - 1][j - 1]
             } else {
                 // 最少编辑步数 = 插入、删除、替换这三种操作的最少编辑步数 + 1
-                dp[i][j] =
-                    (min(
-                        min(dp[i][j - 1].toDouble(), dp[i - 1][j].toDouble()),
-                        dp[i - 1][j - 1].toDouble()
-                    ) + 1).toInt()
+                dp[i][j] = min(min(dp[i][j - 1], dp[i - 1][j]), dp[i - 1][j - 1]) + 1
             }
         }
     }
@@ -112,7 +107,7 @@ fun editDistanceDPComp(s: String, t: String): Int {
                 dp[j] = leftup
             } else {
                 // 最少编辑步数 = 插入、删除、替换这三种操作的最少编辑步数 + 1
-                dp[j] = (min(min(dp[j - 1].toDouble(), dp[j].toDouble()), leftup.toDouble()) + 1).toInt()
+                dp[j] = min(min(dp[j - 1], dp[j]), leftup) + 1
             }
             leftup = temp // 更新为下一轮的 dp[i-1, j-1]
         }
@@ -133,7 +128,8 @@ fun main() {
 
     // 记忆化搜索
     val mem = Array(n + 1) { IntArray(m + 1) }
-    for (row in mem) Arrays.fill(row, -1)
+    for (row in mem)
+        row.fill(-1)
     res = editDistanceDFSMem(s, t, mem, n, m)
     println("将 $s 更改为 $t 最少需要编辑 $res 步")
 

diff --git a/codes/kotlin/chapter_dynamic_programming/knapsack.kt b/codes/kotlin/chapter_dynamic_programming/knapsack.kt
@@ -6,7 +6,6 @@
 
 package chapter_dynamic_programming
 
-import java.util.*
 import kotlin.math.max
 
 /* 0-1 背包：暴力搜索 */
@@ -28,7 +27,7 @@ fun knapsackDFS(
     val no = knapsackDFS(wgt, value, i - 1, c)
     val yes = knapsackDFS(wgt, value, i - 1, c - wgt[i - 1]) + value[i - 1]
     // 返回两种方案中价值更大的那一个
-    return max(no.toDouble(), yes.toDouble()).toInt()
+    return max(no, yes)
 }
 
 /* 0-1 背包：记忆化搜索 */
@@ -55,7 +54,7 @@ fun knapsackDFSMem(
     val no = knapsackDFSMem(wgt, value, mem, i - 1, c)
     val yes = knapsackDFSMem(wgt, value, mem, i - 1, c - wgt[i - 1]) + value[i - 1]
     // 记录并返回两种方案中价值更大的那一个
-    mem[i][c] = max(no.toDouble(), yes.toDouble()).toInt()
+    mem[i][c] = max(no, yes)
     return mem[i][c]
 }
 
@@ -76,8 +75,7 @@ fun knapsackDP(
                 dp[i][c] = dp[i - 1][c]
             } else {
                 // 不选和选物品 i 这两种方案的较大值
-                dp[i][c] = max(dp[i - 1][c].toDouble(), (dp[i - 1][c - wgt[i - 1]] + value[i - 1]).toDouble())
-                    .toInt()
+                dp[i][c] = max(dp[i - 1][c], dp[i - 1][c - wgt[i - 1]] + value[i - 1])
             }
         }
     }
@@ -100,7 +98,7 @@ fun knapsackDPComp(
             if (wgt[i - 1] <= c) {
                 // 不选和选物品 i 这两种方案的较大值
                 dp[c] =
-                    max(dp[c].toDouble(), (dp[c - wgt[i - 1]] + value[i - 1]).toDouble()).toInt()
+                    max(dp[c], dp[c - wgt[i - 1]] + value[i - 1])
             }
         }
     }
@@ -121,7 +119,7 @@ fun main() {
     // 记忆化搜索
     val mem = Array(n + 1) { IntArray(cap + 1) }
     for (row in mem) {
-        Arrays.fill(row, -1)
+        row.fill(-1)
     }
     res = knapsackDFSMem(wgt, value, mem, n, cap)
     println("不超过背包容量的最大物品价值为 $res")

diff --git a/codes/kotlin/chapter_dynamic_programming/min_cost_climbing_stairs_dp.kt b/codes/kotlin/chapter_dynamic_programming/min_cost_climbing_stairs_dp.kt
@@ -19,7 +19,7 @@ fun minCostClimbingStairsDP(cost: IntArray): Int {
     dp[2] = cost[2]
     // 状态转移：从较小子问题逐步求解较大子问题
     for (i in 3..n) {
-        dp[i] = (min(dp[i - 1].toDouble(), dp[i - 2].toDouble()) + cost[i]).toInt()
+        dp[i] = min(dp[i - 1], dp[i - 2]) + cost[i]
     }
     return dp[n]
 }
@@ -32,7 +32,7 @@ fun minCostClimbingStairsDPComp(cost: IntArray): Int {
     var b = cost[2]
     for (i in 3..n) {
         val tmp = b
-        b = (min(a.toDouble(), tmp.toDouble()) + cost[i]).toInt()
+        b = min(a, tmp) + cost[i]
         a = tmp
     }
     return b