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

再度优化heap

Browse Source
This commit is contained in:
huangsimin 2019-08-01 17:07:28 +08:00
parent f63759645e
commit b6fe42de8f
2 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tree/heap/heap.go
View File

@ -110,7 +110,6 @@ func (h *Heap) Pop() (interface{}, bool) {
downvalue := h.elements[h.size] downvalue := h.elements[h.size]
var cidx, c1, c2 int var cidx, c1, c2 int
var cvalue1, cvalue2 interface{}
// down // down
for { for {
cidx = curidx << 1 cidx = curidx << 1
@ -119,11 +118,7 @@ func (h *Heap) Pop() (interface{}, bool) {
c2 = cidx + 2 c2 = cidx + 2
if c2 < h.size { if c2 < h.size {
if h.Compare(h.elements[c1], h.elements[c2]) >= 0 {
cvalue2 = h.elements[c2]
cvalue1 = h.elements[c1]
if h.Compare(cvalue1, cvalue2) >= 0 {
cidx = c1 cidx = c1
} else { } else {
cidx = c2 cidx = c2

86
tree/heap/heap_test.go
View File

@ -9,48 +9,52 @@ import (
) )
func TestHeapGrowSlimming(t *testing.T) { func TestHeapGrowSlimming(t *testing.T) {
h := New(compare.Int)
var results []int for ii := 0; ii < 1000; ii++ {
for i := 0; i < 100; i++ {
v := randomdata.Number(0, 100) h := New(compare.Int)
results = append(results, v) var results []int
h.Put(v) for i := 0; i < 100; i++ {
} v := randomdata.Number(0, 100)
sort.Slice(results, func(i, j int) bool { results = append(results, v)
if results[i] > results[j] { h.Put(v)
return true
} }
return false sort.Slice(results, func(i, j int) bool {
}) if results[i] > results[j] {
return true
}
return false
})
if h.Size() != 100 || h.Empty() { if h.Size() != 100 || h.Empty() {
t.Error("size != 100") t.Error("size != 100")
}
for i := 0; !h.Empty(); i++ {
v, _ := h.Pop()
if results[i] != v {
t.Error("heap is error")
} }
}
if h.Size() != 0 { for i := 0; !h.Empty(); i++ {
t.Error("size != 0") v, _ := h.Pop()
} if results[i] != v {
t.Error("heap is error")
}
}
h.Put(1) if h.Size() != 0 {
h.Put(5) t.Error("size != 0")
h.Put(2) }
if h.Values()[0] != 5 { h.Put(1)
t.Error("top is not equal to 5") h.Put(5)
} h.Put(2)
h.Clear() if h.Values()[0] != 5 {
h.Reborn() t.Error("top is not equal to 5")
}
if !h.Empty() { h.Clear()
t.Error("clear reborn is error") h.Reborn()
if !h.Empty() {
t.Error("clear reborn is error")
}
} }
} }
@ -104,6 +108,20 @@ func TestHeapPushTopPop(t *testing.T) {
} }
} }
// func BenchmarkPush(b *testing.B) {
// h := New(compare.Int)
// b.N = 40000000
// var results []int
// for i := 0; i < b.N; i++ {
// results = append(results, randomdata.Number(0, 1000000000))
// }
// b.ResetTimer()
// for _, v := range results {
// h.Put(v)
// }
// }
// func Int(k1, k2 interface{}) int { // func Int(k1, k2 interface{}) int {
// c1 := k1.(int) // c1 := k1.(int)
// c2 := k2.(int) // c2 := k2.(int)