From 1229f98e9221139844d36baf83800f2fad402e10 Mon Sep 17 00:00:00 2001 From: machangxin Date: Thu, 15 Dec 2022 09:43:20 +0800 Subject: [PATCH] Fixed some problems, indentation and Pointer --- codes/cpp/chapter_hashing/array_hash_map.cpp | 43 ++++--- codes/go/chapter_hashing/array_hash_map.go | 46 +++---- .../go/chapter_hashing/array_hash_map_test.go | 27 +++-- codes/go/chapter_hashing/hash_map_test.go | 34 +++--- .../python/chapter_hashing/array_hash_map.py | 48 ++++---- codes/python/chapter_hashing/hash_map.py | 35 +++--- codes/python/include/__init__.py | 2 +- codes/python/include/print_util.py | 11 +- docs/chapter_hashing/hash_map.md | 114 +++++++++--------- 9 files changed, 185 insertions(+), 175 deletions(-) diff --git a/codes/cpp/chapter_hashing/array_hash_map.cpp b/codes/cpp/chapter_hashing/array_hash_map.cpp index bca27ca7a..2e0f26623 100644 --- a/codes/cpp/chapter_hashing/array_hash_map.cpp +++ b/codes/cpp/chapter_hashing/array_hash_map.cpp @@ -15,17 +15,16 @@ public: this->key = key; this->val = val; } - Entry()=default; }; /* 基于数组简易实现的哈希表 */ class ArrayHashMap { private: - vector bucket; + vector bucket; public: ArrayHashMap() { // 初始化一个长度为 100 的桶（数组） - bucket= vector(100); + bucket= vector(100); } /* 哈希函数 */ @@ -37,13 +36,16 @@ public: /* 查询操作 */ string get(int key) { int index = hashFunc(key); - Entry pair = bucket[index]; - return pair.val; + Entry* pair = bucket[index]; + if (pair == nullptr) { + return "Not Found"; + } + return pair->val; } /* 添加操作 */ void put(int key, string val) { - Entry pair = Entry(key, val); + Entry* pair = new Entry(key, val); int index = hashFunc(key); bucket[index] = pair; } @@ -52,14 +54,14 @@ public: void remove(int key) { int index = hashFunc(key); // 置为空字符，代表删除 - bucket[index] = *new Entry(); + bucket[index] = nullptr; } /* 获取所有键值对 */ - vector entrySet() { - vector entrySet; - for (Entry pair: bucket) { - if (pair.key != 0) { + vector entrySet() { + vector entrySet; + for (Entry* pair: bucket) { + if (pair != nullptr) { entrySet.push_back(pair); } } @@ -69,9 +71,9 @@ public: /* 获取所有键 */ vector keySet() { vector keySet; - for (Entry pair: bucket) { - if (pair.key != 0) { - keySet.push_back(pair.key); + for (Entry* pair: bucket) { + if (pair != nullptr) { + keySet.push_back(pair->key); } } return keySet; @@ -80,17 +82,18 @@ public: /* 获取所有值 */ vector valueSet() { vector valueSet; - for (Entry pair: bucket) { - if (pair.key != 0) - valueSet.push_back(pair.val); + for (Entry* pair: bucket) { + if (pair != nullptr){ + valueSet.push_back(pair->val); + } } return valueSet; } /* 打印哈希表 */ void print() { - for (Entry kv: entrySet()) { - cout << kv.key << " -> " << kv.val << endl; + for (Entry* kv: entrySet()) { + cout << kv->key << " -> " << kv->val << endl; } } }; @@ -122,7 +125,7 @@ int main() { /* 遍历哈希表 */ cout << "\n遍历键值对 Key->Value" << endl; for (auto kv: map.entrySet()) { - cout << kv.key << " -> " << kv.val << endl; + cout << kv->key << " -> " << kv->val << endl; } cout << "\n单独遍历键 Key" << endl; diff --git a/codes/go/chapter_hashing/array_hash_map.go b/codes/go/chapter_hashing/array_hash_map.go index c895ef84e..7a55055d8 100644 --- a/codes/go/chapter_hashing/array_hash_map.go +++ b/codes/go/chapter_hashing/array_hash_map.go @@ -6,91 +6,91 @@ package chapter_hashing import "fmt" -// 键值对 int->String +/* 键值对 int->String */ type Entry struct { key int val string } -// 基于数组简易实现的哈希表 +/* 基于数组简易实现的哈希表 */ type ArrayHashMap struct { - bucket []Entry + bucket []*Entry } func newArrayHashMap() *ArrayHashMap { // 初始化一个长度为 100 的桶（数组） - bucket := make([]Entry, 100) + bucket := make([]*Entry, 100) return &ArrayHashMap{bucket: bucket} } -// 哈希函数 +/* 哈希函数 */ func (a *ArrayHashMap) hashFunc(key int) int { index := key % 100 return index } -// 查询操作 +/* 查询操作 */ func (a *ArrayHashMap) get(key int) string { index := a.hashFunc(key) pair := a.bucket[index] - if pair.key == 0 { - return "" + if pair == nil { + return "Not Found" } return pair.val } -// 添加操作 +/* 添加操作 */ func (a *ArrayHashMap) put(key int, val string) { - pair := Entry{key: key, val: val} + pair := &Entry{key: key, val: val} index := a.hashFunc(key) a.bucket[index] = pair } -// 删除操作 +/* 删除操作 */ func (a *ArrayHashMap) remove(key int) { index := a.hashFunc(key) // 置为空字符，代表删除 - a.bucket[index] = Entry{} + a.bucket[index] = nil } -// 获取所有键对 -func (a *ArrayHashMap) entrySet() []Entry { - var pairs []Entry +/* 获取所有键对 */ +func (a *ArrayHashMap) entrySet() []*Entry { + var pairs []*Entry for _, pair := range a.bucket { - if pair.key != 0 { + if pair != nil { pairs = append(pairs, pair) } } return pairs } -// 获取所有键 +/* 获取所有键 */ func (a *ArrayHashMap) keySet() []int { var keys []int for _, pair := range a.bucket { - if pair.key != 0 { + if pair != nil { keys = append(keys, pair.key) } } return keys } -// 获取所有值 +/* 获取所有值 */ func (a *ArrayHashMap) valueSet() []string { var values []string for _, pair := range a.bucket { - if pair.key != 0 { + if pair != nil { values = append(values, pair.val) } } return values } -// 打印哈希表 +/* 打印哈希表 */ func (a *ArrayHashMap) print() { for _, pair := range a.bucket { - if pair.key != 0 { + if pair != nil { fmt.Println(pair.key, "->", pair.val) } } -} +} \ No newline at end of file diff --git a/codes/go/chapter_hashing/array_hash_map_test.go b/codes/go/chapter_hashing/array_hash_map_test.go index 218fd623f..9b0954c4d 100644 --- a/codes/go/chapter_hashing/array_hash_map_test.go +++ b/codes/go/chapter_hashing/array_hash_map_test.go @@ -11,42 +11,43 @@ import ( func TestArrayHashMap(t *testing.T) { /* 初始化哈希表 */ - map1 := newArrayHashMap() + mapp := newArrayHashMap() /* 添加操作 */ // 在哈希表中添加键值对 (key, value) - map1.put(12836, "小哈") - map1.put(15937, "小啰") - map1.put(16750, "小算") - map1.put(13276, "小法") - map1.put(10583, "小鸭") + mapp.put(12836, "小哈") + mapp.put(15937, "小啰") + mapp.put(16750, "小算") + mapp.put(13276, "小法") + mapp.put(10583, "小鸭") fmt.Println("\n添加完成后，哈希表为\nKey -> Value") - map1.print() + mapp.print() /* 查询操作 */ // 向哈希表输入键 key ，得到值 value - name := map1.get(15937) + name := mapp.get(15937) fmt.Println("\n输入学号 15937 ，查询到姓名 " + name) /* 删除操作 */ // 在哈希表中删除键值对 (key, value) - map1.remove(10583) + mapp.remove(10583) fmt.Println("\n删除 10583 后，哈希表为\nKey -> Value") - map1.print() + mapp.print() /* 遍历哈希表 */ fmt.Println("\n遍历键值对 Key->Value") - for _, kv := range map1.entrySet() { + for _, kv := range mapp.entrySet() { fmt.Println(kv.key, " -> ", kv.val) } fmt.Println("\n单独遍历键 Key") - for _, key := range map1.keySet() { + for _, key := range mapp.keySet() { fmt.Println(key) } fmt.Println("\n单独遍历值 Value") - for _, val := range map1.valueSet() { + for _, val := range mapp.valueSet() { fmt.Println(val) } } + diff --git a/codes/go/chapter_hashing/hash_map_test.go b/codes/go/chapter_hashing/hash_map_test.go index ee7683367..10b2c967e 100644 --- a/codes/go/chapter_hashing/hash_map_test.go +++ b/codes/go/chapter_hashing/hash_map_test.go @@ -10,48 +10,48 @@ import ( ) func TestHashmap(t *testing.T) { - // 初始化哈希表 - Map := make(map[int]string) + /* 初始化哈希表 */ + mapp := make(map[int]string) - // 添加操作 + /* 添加操作 */ // 在哈希表中添加键值对 (key, value) - Map[12836] = "小哈" - Map[15937] = "小啰" - Map[16750] = "小算" - Map[13276] = "小法" - Map[10583] = "小鸭" + mapp[12836] = "小哈" + mapp[15937] = "小啰" + mapp[16750] = "小算" + mapp[13276] = "小法" + mapp[10583] = "小鸭" fmt.Println("\n添加完成后，哈希表为\nKey -> Value") - for key, value := range Map { + for key, value := range mapp { fmt.Printf("%d -> %s\n", key, value) } - // 查询操作 + /* 查询操作 */ // 向哈希表输入键 key ，得到值 value - name := Map[15937] + name := mapp[15937] fmt.Println("\n输入学号 15937 ，查询到姓名 ", name) - // 删除操作 + /* 删除操作 */ // 在哈希表中删除键值对 (key, value) - delete(Map, 10583) + delete(mapp, 10583) fmt.Println("\n删除 10583 后，哈希表为\nKey -> Value") - for key, value := range Map { + for key, value := range mapp { fmt.Printf("%d -> %s\n", key, value) } /* 遍历哈希表 */ // 遍历键值对 key->value fmt.Println("\n遍历键值对 Key->Value") - for key, value := range Map { + for key, value := range mapp { fmt.Println(key, "->", value) } // 单独遍历键 key fmt.Println("\n单独遍历键 Key") - for key := range Map { + for key := range mapp { fmt.Println(key) } // 单独遍历值 value fmt.Println("\n单独遍历值 Value") - for _, value := range Map { + for _, value := range mapp { fmt.Println(value) } } diff --git a/codes/python/chapter_hashing/array_hash_map.py b/codes/python/chapter_hashing/array_hash_map.py index a9fbf58a3..fdb57e4e3 100644 --- a/codes/python/chapter_hashing/array_hash_map.py +++ b/codes/python/chapter_hashing/array_hash_map.py @@ -4,25 +4,25 @@ Created Time: 2022-12-14 Author: msk397 (machangxinq@gmail.com) """ -# 键值对 int->String +""" 键值对 int->String """ class Entry: def __init__(self, key, val): self.key = key self.val = val -# 基于数组简易实现的哈希表 +""" 基于数组简易实现的哈希表 """ class ArrayHashMap: def __init__(self): # 初始化一个长度为 100 的桶（数组） self.bucket = [None] * 100 - # 哈希函数 + """ 哈希函数 """ def hashFunc(self, key): index = key % 100 return index - # 查询操作 + """ 查询操作 """ def get(self, key): index = self.hashFunc(key) pair = self.bucket[index] @@ -30,19 +30,19 @@ class ArrayHashMap: return None return pair.val - # 添加操作 + """ 添加操作 """ def put(self, key, val): pair = Entry(key, val) index = self.hashFunc(key) self.bucket[index] = pair - # 删除操作 + """ 删除操作 """ def remove(self, key): index = self.hashFunc(key) # 置为空字符，代表删除 self.bucket[index] = None - # 获取所有键值对 + """ 获取所有键值对 """ def entrySet(self): result = [] for pair in self.bucket: @@ -50,7 +50,7 @@ class ArrayHashMap: result.append(pair) return result - # 获取所有键 + """ 获取所有键 """ def keySet(self): result = [] for pair in self.bucket: @@ -58,7 +58,7 @@ class ArrayHashMap: result.append(pair.key) return result - # 获取所有值 + """ 获取所有值 """ def valueSet(self): result = [] for pair in self.bucket: @@ -66,7 +66,7 @@ class ArrayHashMap: result.append(pair.val) return result - # 打印哈希表 + """ 打印哈希表 """ def print(self): for pair in self.bucket: if pair is not None: @@ -75,38 +75,38 @@ class ArrayHashMap: if __name__ == "__main__": """ 初始化哈希表 """ - Map = ArrayHashMap() + mapp = ArrayHashMap() """ 添加操作 """ # 在哈希表中添加键值对 (key, value) - Map.put(12836, "小哈") - Map.put(15937, "小啰") - Map.put(16750, "小算") - Map.put(13276, "小法") - Map.put(10583, "小鸭") + mapp.put(12836, "小哈") + mapp.put(15937, "小啰") + mapp.put(16750, "小算") + mapp.put(13276, "小法") + mapp.put(10583, "小鸭") print("\n添加完成后，哈希表为\nKey -> Value") - Map.print() + mapp.print() """ 查询操作 """ # 向哈希表输入键 key ，得到值 value - name = Map.get(15937) + name = mapp.get(15937) print("\n输入学号 15937 ，查询到姓名 " + name) """ 删除操作 """ # 在哈希表中删除键值对 (key, value) - Map.remove(10583) + mapp.remove(10583) print("\n删除 10583 后，哈希表为\nKey -> Value") - Map.print() + mapp.print() """ 遍历哈希表 """ print("\n遍历键值对 Key->Value") - for pair in Map.entrySet(): + for pair in mapp.entrySet(): print(pair.key, "->", pair.val) print("\n单独遍历键 Key") - for key in Map.keySet(): + for key in mapp.keySet(): print(key) print("\n单独遍历值 Value") - for val in Map.valueSet(): - print(val) + for val in mapp.valueSet(): + print(val) \ No newline at end of file diff --git a/codes/python/chapter_hashing/hash_map.py b/codes/python/chapter_hashing/hash_map.py index 98b7dedc4..1afa9febb 100644 --- a/codes/python/chapter_hashing/hash_map.py +++ b/codes/python/chapter_hashing/hash_map.py @@ -4,43 +4,44 @@ Created Time: 2022-12-14 Author: msk397 (machangxinq@gmail.com) """ +import sys, os.path as osp +sys.path.append(osp.dirname(osp.dirname(osp.abspath(__file__)))) +from include import * + if __name__ == "__main__": """ 初始化哈希表 """ - Map = {} + mapp = {} """ 添加操作 """ # 在哈希表中添加键值对 (key, value) - Map[12836] = "小哈" - Map[15937] = "小啰" - Map[16750] = "小算" - Map[13276] = "小法" - Map[10583] = "小鸭" + mapp[12836] = "小哈" + mapp[15937] = "小啰" + mapp[16750] = "小算" + mapp[13276] = "小法" + mapp[10583] = "小鸭" print("\n添加完成后，哈希表为\nKey -> Value") - for key, value in Map.items(): - print(key, "->", value) + print_dict(mapp) """ 查询操作 """ # 向哈希表输入键 key ，得到值 value - name = Map[15937] + name = mapp[15937] print("\n输入学号 15937 ，查询到姓名 " + name) """ 删除操作 """ # 在哈希表中删除键值对 (key, value) - Map.pop(10583) + mapp.pop(10583) print("\n删除 10583 后，哈希表为\nKey -> Value") - for key, value in Map.items(): - print(key, "->", value) + print_dict(mapp) """ 遍历哈希表 """ print("\n遍历键值对 Key->Value") - for key, value in Map.items(): + for key, value in mapp.items(): print(key, "->", value) print("\n单独遍历键 Key") - for key in Map.keys(): + for key in mapp.keys(): print(key) print("\n单独遍历值 Value") - for val in Map.values(): - print(val) - + for val in mapp.values(): + print(val) \ No newline at end of file diff --git a/codes/python/include/__init__.py b/codes/python/include/__init__.py index 77cf855a5..31ed69ace 100644 --- a/codes/python/include/__init__.py +++ b/codes/python/include/__init__.py @@ -7,4 +7,4 @@ import collections from typing import List from .linked_list import ListNode, list_to_linked_list, linked_list_to_list, get_list_node from .binary_tree import TreeNode, list_to_tree, tree_to_list, get_tree_node -from .print_util import print_matrix, print_linked_list, print_tree \ No newline at end of file +from .print_util import print_matrix, print_linked_list, print_tree, print_dict \ No newline at end of file diff --git a/codes/python/include/print_util.py b/codes/python/include/print_util.py index f315add8d..f84d548b4 100644 --- a/codes/python/include/print_util.py +++ b/codes/python/include/print_util.py @@ -1,7 +1,7 @@ ''' File: print_util.py Created Time: 2021-12-11 -Author: Krahets (krahets@163.com) +Author: Krahets (krahets@163.com), msk397 (machangxinq@gmail.com) ''' import copy @@ -72,3 +72,12 @@ def print_tree(root, prev=None, isLeft=False): prev.str = prev_str trunk.str = ' |' print_tree(root.left, trunk, False) + +def print_dict(d): + """Print a dict + + Args: + d ([type]): [description] + """ + for key, value in d.items(): + print(key, '->', value) \ No newline at end of file diff --git a/docs/chapter_hashing/hash_map.md b/docs/chapter_hashing/hash_map.md index 3ce9c08b8..69dfdc96b 100644 --- a/docs/chapter_hashing/hash_map.md +++ b/docs/chapter_hashing/hash_map.md @@ -86,47 +86,47 @@ comments: true === "Python" ```python title="hash_map.py" - # 初始化哈希表 - Map = {} + """ 初始化哈希表 """ + mapp = {} - # 添加操作 + """ 添加操作 """ # 在哈希表中添加键值对 (key, value) - Map[12836] = "小哈" - Map[15937] = "小啰" - Map[16750] = "小算" - Map[13276] = "小法" - Map[10583] = "小鸭" + mapp[12836] = "小哈" + mapp[15937] = "小啰" + mapp[16750] = "小算" + mapp[13276] = "小法" + mapp[10583] = "小鸭" - # 查询操作 + """ 查询操作 """ # 向哈希表输入键 key ，得到值 value - name = Map[15937] + name = mapp[15937] - # 删除操作 + """ 删除操作 """ # 在哈希表中删除键值对 (key, value) - Map.pop(10583) + mapp.pop(10583) ``` === "Go" ```go title="hash_map_test.go" - // 初始化哈希表 - Map := make(map[int]string) + /* 初始化哈希表 */ + mapp := make(map[int]string) - // 添加操作 + /* 添加操作 */ // 在哈希表中添加键值对 (key, value) - Map[12836] = "小哈" - Map[15937] = "小啰" - Map[16750] = "小算" - Map[13276] = "小法" - Map[10583] = "小鸭" + mapp[12836] = "小哈" + mapp[15937] = "小啰" + mapp[16750] = "小算" + mapp[13276] = "小法" + mapp[10583] = "小鸭" - // 查询操作 + /* 查询操作 */ // 向哈希表输入键 key ，得到值 value - name := Map[15937] + name := mapp[15937] - // 删除操作 + /* 删除操作 */ // 在哈希表中删除键值对 (key, value) - delete(Map, 10583) + delete(mapp, 10583) ``` === "JavaScript" @@ -196,13 +196,13 @@ comments: true ```python title="hash_map.py" """ 遍历哈希表 """ # 遍历键值对 key->value - for key, value in Map.items(): + for key, value in mapp.items(): print(key, "->", value) # 单独遍历键 key - for key in Map.keys(): + for key in mapp.keys(): print(key) # 单独遍历值 value - for value in Map.values(): + for value in mapp.values(): print(value) ``` @@ -211,15 +211,15 @@ comments: true ```go title="hash_map_test.go" /* 遍历哈希表 */ // 遍历键值对 key->value - for key, value := range Map { + for key, value := range mapp { fmt.Println(key, "->", value) } // 单独遍历键 key - for key := range Map { + for key := range mapp { fmt.Println(key) } // 单独遍历值 value - for _, value := range Map { + for _, value := range mapp { fmt.Println(value) } ``` @@ -335,20 +335,16 @@ $$ this->key = key; this->val = val; } - Entry(){ - this->key = -1; - this->val = ""; - } }; /* 基于数组简易实现的哈希表 */ class ArrayHashMap { private: - vector bucket; + vector bucket; public: ArrayHashMap() { // 初始化一个长度为 100 的桶（数组） - bucket= vector(100); + bucket= vector(100); } /* 哈希函数 */ @@ -360,13 +356,13 @@ $$ /* 查询操作 */ string get(int key) { int index = hashFunc(key); - Entry pair = bucket[index]; - return pair.val; + Entry* pair = bucket[index]; + return pair->val; } /* 添加操作 */ void put(int key, string val) { - Entry pair = Entry(key, val); + Entry* pair = new Entry(key, val); int index = hashFunc(key); bucket[index] = pair; } @@ -374,8 +370,8 @@ $$ /* 删除操作 */ void remove(int key) { int index = hashFunc(key); - // 置为空，代表删除 - bucket[index] = *new Entry(); + // 置为空字符，代表删除 + bucket[index] = nullptr; } }; ``` @@ -383,24 +379,24 @@ $$ === "Python" ```python title="array_hash_map.py" - # 键值对 int->String + """ 键值对 int->String """ class Entry: def __init__(self, key, val): self.key = key self.val = val - # 基于数组简易实现的哈希表 + """ 基于数组简易实现的哈希表 """ class ArrayHashMap: def __init__(self): # 初始化一个长度为 100 的桶（数组） self.bucket = [None] * 100 - # 哈希函数 + """ 哈希函数 """ def hashFunc(self, key): index = key % 100 return index - # 查询操作 + """ 查询操作 """ def get(self, key): index = self.hashFunc(key) pair = self.bucket[index] @@ -408,13 +404,13 @@ $$ return None return pair.val - # 添加操作 + """ 添加操作 """ def put(self, key, val): pair = Entry(key, val) index = self.hashFunc(key) self.bucket[index] = pair - # 删除操作 + """ 删除操作 """ def remove(self, key): index = self.hashFunc(key) # 置为空字符，代表删除 @@ -424,51 +420,51 @@ $$ === "Go" ```go title="array_hash_map.go" - // 键值对 int->String + /* 键值对 int->String */ type Entry struct { key int val string } - // 基于数组简易实现的哈希表 + /* 基于数组简易实现的哈希表 */ type ArrayHashMap struct { - bucket []Entry + bucket []*Entry } func newArrayHashMap() *ArrayHashMap { // 初始化一个长度为 100 的桶（数组） - bucket := make([]Entry, 100) + bucket := make([]*Entry, 100) return &ArrayHashMap{bucket: bucket} } - // 哈希函数 + /* 哈希函数 */ func (a *ArrayHashMap) hashFunc(key int) int { index := key % 100 return index } - // 查询操作 + /* 查询操作 */ func (a *ArrayHashMap) get(key int) string { index := a.hashFunc(key) pair := a.bucket[index] - if pair.key == 0 { - return "" + if pair == nil { + return "Not Found" } return pair.val } - // 添加操作 + /* 添加操作 */ func (a *ArrayHashMap) put(key int, val string) { - pair := Entry{key: key, val: val} + pair := &Entry{key: key, val: val} index := a.hashFunc(key) a.bucket[index] = pair } - // 删除操作 + /* 删除操作 */ func (a *ArrayHashMap) remove(key int) { index := a.hashFunc(key) // 置为空字符，代表删除 - a.bucket[index] = Entry{} + a.bucket[index] = nil } ```