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

准备修改benmark test的一些方式, 达到最佳

Browse Source
This commit is contained in:
huangsimin
2019-04-09 10:39:14 +08:00
parent fc49f20936
commit 1f3df9205f
18 changed files with 147 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
priority_queue/priority_queue.go
View File

@@ -67,11 +67,11 @@ func (pq *PriorityQueue) GetRange(k1, k2 interface{}) []interface{} {
return pq.queue.GetRange(k1, k2)
}
func (pq *PriorityQueue) RemoveIndex(idx int) (*Node, bool) {
func (pq *PriorityQueue) RemoveIndex(idx int) (interface{}, bool) {
return pq.queue.RemoveIndex(idx)
}
func (pq *PriorityQueue) Remove(key interface{}) (*Node, bool) {
func (pq *PriorityQueue) Remove(key interface{}) (interface{}, bool) {
return pq.queue.Remove(key)
}

8
priority_queue/vbt.go
View File

@@ -156,11 +156,11 @@ func (tree *vbTree) IndexRange(idx1, idx2 int) (result []interface{}, ok bool) {
return nil, false
}
func (tree *vbTree) RemoveIndex(idx int) (*Node, bool) {
func (tree *vbTree) RemoveIndex(idx int) (interface{}, bool) {
n := tree.indexNode(idx)
if n != nil {
tree.removeNode(n)
return n, true
return n.value, true
}
return nil, false
}
@@ -229,11 +229,11 @@ func (tree *vbTree) removeNode(n *Node) {
return
}
func (tree *vbTree) Remove(key interface{}) (*Node, bool) {
func (tree *vbTree) Remove(key interface{}) (interface{}, bool) {
if n, ok := tree.GetNode(key); ok {
tree.removeNode(n)
return n, true
return n.value, true
}
// return nil
return nil, false

33
priority_queue/vbt_test.go
View File

@@ -5,7 +5,6 @@ import (
"encoding/gob"
"io/ioutil"
"log"
"os"
"testing"
"474420502.top/eson/structure/compare"
@@ -17,38 +16,6 @@ import (
"github.com/emirpasic/gods/trees/redblacktree"
)
const CompareSize = 1000000
const NumberMax = 50000000
func Save(t *testing.T) {
f, err := os.OpenFile("../l.log", os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
if err != nil {
log.Println(err)
}
var l []int
// for i := 0; len(l) < 1000; i++ {
// v := randomdata.Number(0, 65535)
// l = append(l, v)
// }
m := make(map[int]int)
for i := 0; len(l) < CompareSize; i++ {
v := randomdata.Number(0, NumberMax)
if _, ok := m[v]; !ok {
m[v] = v
l = append(l, v)
}
}
var result bytes.Buffer
encoder := gob.NewEncoder(&result)
encoder.Encode(l)
lbytes := result.Bytes()
f.Write(lbytes)
}
func loadTestData() []int {
data, err := ioutil.ReadFile("../l.log")
if err != nil {