eson/structure
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

save

Browse Source
This commit is contained in:
eson 2019-04-22 12:53:23 +08:00
parent 4ccb4f4016
commit 905dcf5f8f
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hashmap/avlkeydup.go
View File

@ -22,6 +22,11 @@ func avlNew(Compare compare.Compare) *avlTree {
return &avlTree{Compare: Compare} return &avlTree{Compare: Compare}
} }
func (tree *avlTree) Clear() {
tree.size = 0
tree.root = nil
}
func (tree *avlTree) Size() int { func (tree *avlTree) Size() int {
return tree.size return tree.size
} }
@ -222,7 +227,7 @@ const (
) )
// Traversal 遍历的方法 默认是LDR 从小到大 Compare 为 l < r // Traversal 遍历的方法 默认是LDR 从小到大 Compare 为 l < r
func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMethod ...interface{}) { func (tree *avlTree) Traversal(every func(node *avlNode) bool, traversalMethod ...interface{}) {
if tree.root == nil { if tree.root == nil {
return return
} }
@ -239,7 +244,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if cur == nil { if cur == nil {
return true return true
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
if !traverasl(cur.children[0]) { if !traverasl(cur.children[0]) {
@ -260,7 +265,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if !traverasl(cur.children[0]) { if !traverasl(cur.children[0]) {
return false return false
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
if !traverasl(cur.children[1]) { if !traverasl(cur.children[1]) {
@ -281,7 +286,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if !traverasl(cur.children[1]) { if !traverasl(cur.children[1]) {
return false return false
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
return true return true
@ -293,7 +298,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if cur == nil { if cur == nil {
return true return true
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
if !traverasl(cur.children[0]) { if !traverasl(cur.children[0]) {
@ -314,7 +319,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if !traverasl(cur.children[1]) { if !traverasl(cur.children[1]) {
return false return false
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
if !traverasl(cur.children[0]) { if !traverasl(cur.children[0]) {
@ -335,7 +340,7 @@ func (tree *avlTree) Traversal(every func(k, v interface{}) bool, traversalMetho
if !traverasl(cur.children[0]) { if !traverasl(cur.children[0]) {
return false return false
} }
if !every(cur.key, cur.value) { if !every(cur) {
return false return false
} }
return true return true

38
hashmap/hashmap.go
View File

@ -92,22 +92,38 @@ func (hm *HashMap) grow() {
newsize := hm.size << 1 newsize := hm.size << 1
newtable := make([]*avlTree, newsize, newsize) newtable := make([]*avlTree, newsize, newsize)
nodelist := make([]*avlNode, hm.size, hm.size)
i := 0
for _, cur := range hm.table { for _, cur := range hm.table {
if cur != nil { if cur != nil {
cur.Traversal(func(k, v interface{}) bool { cur.Traversal(func(node *avlNode) bool {
hash := hm.GetHash(k) nodelist[i] = node
index := hash % newsize i++
bkt := newtable[index] // hash := hm.GetHash(node.key)
if bkt == nil { // index := hash % newsize
bkt = avlNew(hm.Compare) // bkt := newtable[index]
newtable[index] = bkt // if bkt == nil {
} // bkt = avlNew(hm.Compare)
bkt.Put(k, v) // newtable[index] = bkt
// }
//bkt.Put(node.key, node.value)
return true return true
}) })
}
}
}
cur.Clear()
}
var hash, index uint
for _, node := range nodelist {
hash = hm.GetHash(node.key)
index = hash % newsize
bkt := newtable[index]
if bkt == nil {
bkt = avlNew(hm.Compare)
newtable[index] = bkt
}
bkt.PutNode(node)
}
hm.table = newtable hm.table = newtable
hm.countNextGrow() hm.countNextGrow()
} }