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

avl/avl.go

@@ -53,14 +53,14 @@ func (tree *Tree) Size() int {
 	return tree.size
 }
 
-func (tree *Tree) Remove(key interface{}) *Node {
+func (tree *Tree) Remove(key interface{}) (interface{}, bool) {
 
 	if n, ok := tree.GetNode(key); ok {
 
 		tree.size--
 		if tree.size == 0 {
 			tree.root = nil
-			return n
+			return n.value, true
 		}
 
 		left := getHeight(n.children[0])
@@ -70,7 +70,7 @@ func (tree *Tree) Remove(key interface{}) *Node {
 			p := n.parent
 			p.children[getRelationship(n)] = nil
 			tree.fixRemoveHeight(p)
-			return n
+			return n.value, true
 		}
 
 		var cur *Node
@@ -111,10 +111,10 @@ func (tree *Tree) Remove(key interface{}) *Node {
 			tree.fixRemoveHeight(cparent)
 		}
 
-		return cur
+		return cur.value, true
 	}
 
-	return nil
+	return nil, false
 }
 
 // Values 返回先序遍历的值
@@ -153,7 +153,6 @@ func (tree *Tree) GetRange(k1, k2 interface{}) (result []interface{}) {
 
 		result = make([]interface{}, 0, 16)
 
-		// iter := NewIterator(min)
 		tree.iter.SetNode(min)
 		iter := tree.iter
 		for iter.Next() {
@@ -180,7 +179,6 @@ func (tree *Tree) GetRange(k1, k2 interface{}) (result []interface{}) {
 
 		result = make([]interface{}, 0, 16)
 
-		// iter := NewIterator(max)
 		tree.iter.SetNode(max)
 		iter := tree.iter
 		for iter.Prev() {
@@ -232,7 +230,7 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 			n = n.children[1]
 			lastc = c
 		case 0:
-			// iter := NewIterator(n)
+
 			tree.iter.SetNode(n)
 			iter := tree.iter
 			iter.Prev()
@@ -292,10 +290,8 @@ func (tree *Tree) GetNode(value interface{}) (*Node, bool) {
 		case 1:
 			n = n.children[1]
 		case 0:
-			// iter := NewIterator(n)
 
 			tree.iter.SetNode(n)
-
 			iter := tree.iter
 			iter.Prev()
 			for iter.Prev() {

avl/avl_test.go

@@ -5,7 +5,6 @@ import (
 	"encoding/gob"
 	"io/ioutil"
 	"log"
-	"os"
 	"testing"
 
 	"474420502.top/eson/structure/compare"
@@ -15,36 +14,6 @@ import (
 	"github.com/emirpasic/gods/trees/redblacktree"
 )
 
-const CompartorSize = 100
-const NumberMax = 600
-
-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)
-	}
-
-	//fmt.Println(userBytes)
-
-	var l []int
-	// m := make(map[int]int)
-	for i := 0; len(l) < CompartorSize; 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 {