Many bug fixes and improvements (#1270)

* Add Ruby and Kotlin icons
Add the avatar of @curtishd

* Update README

* Synchronize zh-hant and zh versions.

* Translate the pythontutor blocks to traditional Chinese

* Fix en/mkdocs.yml

* Update the landing page of the en version.

* Fix the Dockerfile

* Refine the en landingpage

* Fix en landing page

* Reset the README.md
This commit is contained in:
Yudong Jin
2024-04-11 20:18:19 +08:00
committed by GitHub
parent 07977184ad
commit b2f0d4603d
192 changed files with 2382 additions and 1196 deletions

View File

@ -9,20 +9,14 @@ package chapter_hashing
/* 鍵值對 */
class Pair(
var key: Int,
var value: String
var _val: String
)
/* 基於陣列實現的雜湊表 */
class ArrayHashMap {
// 初始化陣列,包含 100 個桶
private val buckets = arrayOfNulls<Pair>(100)
init {
// 初始化陣列,包含 100 個桶
for (i in 0..<100) {
buckets[i] = null
}
}
/* 雜湊函式 */
fun hashFunc(key: Int): Int {
val index = key % 100
@ -33,12 +27,12 @@ class ArrayHashMap {
fun get(key: Int): String? {
val index = hashFunc(key)
val pair = buckets[index] ?: return null
return pair.value
return pair._val
}
/* 新增操作 */
fun put(key: Int, value: String) {
val pair = Pair(key, value)
fun put(key: Int, _val: String) {
val pair = Pair(key, _val)
val index = hashFunc(key)
buckets[index] = pair
}
@ -52,27 +46,29 @@ class ArrayHashMap {
/* 獲取所有鍵值對 */
fun pairSet(): MutableList<Pair> {
val pairSet = ArrayList<Pair>()
val pairSet = mutableListOf<Pair>()
for (pair in buckets) {
if (pair != null) pairSet.add(pair)
if (pair != null)
pairSet.add(pair)
}
return pairSet
}
/* 獲取所有鍵 */
fun keySet(): MutableList<Int> {
val keySet = ArrayList<Int>()
val keySet = mutableListOf<Int>()
for (pair in buckets) {
if (pair != null) keySet.add(pair.key)
if (pair != null)
keySet.add(pair.key)
}
return keySet
}
/* 獲取所有值 */
fun valueSet(): MutableList<String> {
val valueSet = ArrayList<String>()
val valueSet = mutableListOf<String>()
for (pair in buckets) {
pair?.let { valueSet.add(it.value) }
pair?.let { valueSet.add(it._val) }
}
return valueSet
}
@ -81,8 +77,8 @@ class ArrayHashMap {
fun print() {
for (kv in pairSet()) {
val key = kv.key
val value = kv.value
println("${key}->${value}")
val _val = kv._val
println("${key} -> ${_val}")
}
}
}
@ -104,7 +100,7 @@ fun main() {
/* 查詢操作 */
// 向雜湊表中輸入鍵 key ,得到值 value
val name: String? = map.get(15937)
val name = map.get(15937)
println("\n輸入學號 15937 ,查詢到姓名 $name")
/* 刪除操作 */
@ -114,16 +110,16 @@ fun main() {
map.print()
/* 走訪雜湊表 */
println("\n走訪鍵值對 Key->Value")
println("\n走訪鍵值對 Key -> Value")
for (kv in map.pairSet()) {
println("${kv.key} -> ${kv.value}")
println("${kv.key} -> ${kv._val}")
}
println("\n單獨走訪鍵 Key")
for (key in map.keySet()) {
println(key)
}
println("\n單獨走訪值 Value")
for (value in map.valueSet()) {
println(value)
for (_val in map.valueSet()) {
println(_val)
}
}
}

View File

@ -11,15 +11,15 @@ import utils.ListNode
/* Driver Code */
fun main() {
val num = 3
val hashNum = Integer.hashCode(num)
val hashNum = num.hashCode()
println("整數 $num 的雜湊值為 $hashNum")
val bol = true
val hashBol = Boolean.hashCode()
val hashBol = bol.hashCode()
println("布林量 $bol 的雜湊值為 $hashBol")
val dec = 3.14159
val hashDec = java.lang.Double.hashCode(dec)
val hashDec = dec.hashCode()
println("小數 $dec 的雜湊值為 $hashDec")
val str = "Hello 演算法"

View File

@ -11,7 +11,7 @@ import utils.printHashMap
/* Driver Code */
fun main() {
/* 初始化雜湊表 */
val map: MutableMap<Int, String> = HashMap()
val map = HashMap<Int, String>()
/* 新增操作 */
// 在雜湊表中新增鍵值對 (key, value)
@ -44,7 +44,7 @@ fun main() {
println(key)
}
println("\n單獨走訪值 Value")
for (value in map.values) {
println(value)
for (_val in map.values) {
println(_val)
}
}

View File

@ -20,7 +20,7 @@ class HashMapChaining() {
capacity = 4
loadThres = 2.0 / 3.0
extendRatio = 2
buckets = ArrayList(capacity)
buckets = mutableListOf()
for (i in 0..<capacity) {
buckets.add(mutableListOf())
}
@ -42,14 +42,14 @@ class HashMapChaining() {
val bucket = buckets[index]
// 走訪桶,若找到 key ,則返回對應 val
for (pair in bucket) {
if (pair.key == key) return pair.value
if (pair.key == key) return pair._val
}
// 若未找到 key ,則返回 null
return null
}
/* 新增操作 */
fun put(key: Int, value: String) {
fun put(key: Int, _val: String) {
// 當負載因子超過閾值時,執行擴容
if (loadFactor() > loadThres) {
extend()
@ -59,12 +59,12 @@ class HashMapChaining() {
// 走訪桶,若遇到指定 key ,則更新對應 val 並返回
for (pair in bucket) {
if (pair.key == key) {
pair.value = value
pair._val = _val
return
}
}
// 若無該 key ,則將鍵值對新增至尾部
val pair = Pair(key, value)
val pair = Pair(key, _val)
bucket.add(pair)
size++
}
@ -98,7 +98,7 @@ class HashMapChaining() {
// 將鍵值對從原雜湊表搬運至新雜湊表
for (bucket in bucketsTmp) {
for (pair in bucket) {
put(pair.key, pair.value)
put(pair.key, pair._val)
}
}
}
@ -109,7 +109,7 @@ class HashMapChaining() {
val res = mutableListOf<String>()
for (pair in bucket) {
val k = pair.key
val v = pair.value
val v = pair._val
res.add("$k -> $v")
}
println(res)
@ -142,4 +142,4 @@ fun main() {
map.remove(12836)
println("\n刪除 12836 後,雜湊表為\nKey -> Value")
map.print()
}
}

View File

@ -8,16 +8,21 @@ package chapter_hashing
/* 開放定址雜湊表 */
class HashMapOpenAddressing {
private var size: Int = 0 // 鍵值對數量
private var capacity = 4 // 雜湊表容量
private val loadThres: Double = 2.0 / 3.0 // 觸發擴容的負載因子閾值
private val extendRatio = 2 // 擴容倍數
private var buckets: Array<Pair?> // 桶陣列
private val TOMBSTONE = Pair(-1, "-1") // 刪除標記
private var size: Int // 鍵值對數量
private var capacity: Int // 雜湊表容量
private val loadThres: Double // 觸發擴容的負載因子閾值
private val extendRatio: Int // 擴容倍數
private var buckets: Array<Pair?> // 桶陣列
private val TOMBSTONE: Pair // 刪除標記
/* 建構子 */
init {
size = 0
capacity = 4
loadThres = 2.0 / 3.0
extendRatio = 2
buckets = arrayOfNulls(capacity)
TOMBSTONE = Pair(-1, "-1")
}
/* 雜湊函式 */
@ -63,14 +68,14 @@ class HashMapOpenAddressing {
val index = findBucket(key)
// 若找到鍵值對,則返回對應 val
if (buckets[index] != null && buckets[index] != TOMBSTONE) {
return buckets[index]?.value
return buckets[index]?._val
}
// 若鍵值對不存在,則返回 null
return null
}
/* 新增操作 */
fun put(key: Int, value: String) {
fun put(key: Int, _val: String) {
// 當負載因子超過閾值時,執行擴容
if (loadFactor() > loadThres) {
extend()
@ -79,11 +84,11 @@ class HashMapOpenAddressing {
val index = findBucket(key)
// 若找到鍵值對,則覆蓋 val 並返回
if (buckets[index] != null && buckets[index] != TOMBSTONE) {
buckets[index]!!.value = value
buckets[index]!!._val = _val
return
}
// 若鍵值對不存在,則新增該鍵值對
buckets[index] = Pair(key, value)
buckets[index] = Pair(key, _val)
size++
}
@ -109,7 +114,7 @@ class HashMapOpenAddressing {
// 將鍵值對從原雜湊表搬運至新雜湊表
for (pair in bucketsTmp) {
if (pair != null && pair != TOMBSTONE) {
put(pair.key, pair.value)
put(pair.key, pair._val)
}
}
}
@ -122,7 +127,7 @@ class HashMapOpenAddressing {
} else if (pair == TOMBSTONE) {
println("TOMESTOME")
} else {
println("${pair.key} -> ${pair.value}")
println("${pair.key} -> ${pair._val}")
}
}
}

View File

@ -6,7 +6,7 @@
package chapter_hashing
const val MODULUS = 10_0000_0007
const val MODULUS = 1000000007
/* 加法雜湊 */
fun addHash(key: String): Int {
@ -48,7 +48,7 @@ fun rotHash(key: String): Int {
fun main() {
val key = "Hello 演算法"
var hash: Int = addHash(key)
var hash = addHash(key)
println("加法雜湊值為 $hash")
hash = mulHash(key)