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

avldup/avldup.go

@@ -28,10 +28,12 @@ type Tree struct {
 	root    *Node
 	size    int
 	Compare compare.Compare
+
+	iter *Iterator
 }
 
 func New(Compare compare.Compare) *Tree {
-	return &Tree{Compare: Compare}
+	return &Tree{Compare: Compare, iter: NewIteratorWithCap(nil, 16)}
 }
 
 func (tree *Tree) String() string {
@@ -52,14 +54,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])
@@ -69,7 +71,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
@@ -109,11 +111,10 @@ func (tree *Tree) Remove(key interface{}) *Node {
 		} else {
 			tree.fixRemoveHeight(cparent)
 		}
-
-		return cur
+		return cur.value, true
 	}
 
-	return nil
+	return nil, false
 }
 
 // Values 返回先序遍历的值
@@ -152,7 +153,8 @@ 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() {
 			result = append(result, iter.Value())
 			if iter.cur == max {
@@ -177,7 +179,8 @@ 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() {
 			result = append(result, iter.Value())
 			if iter.cur == min {
@@ -239,21 +242,21 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 
 		if result[1] != nil {
 
-			result[0] = GetPrev(result[1], 1)
-			result[2] = GetNext(result[1], 1)
+			result[0] = tree.iter.GetPrev(result[1], 1)
+			result[2] = tree.iter.GetNext(result[1], 1)
 		} else {
 			result[0] = last
-			result[2] = GetNext(last, 1)
+			result[2] = tree.iter.GetNext(last, 1)
 		}
 
 	case -1:
 
 		if result[1] != nil {
-			result[0] = GetPrev(result[1], 1)
-			result[2] = GetNext(result[1], 1)
+			result[0] = tree.iter.GetPrev(result[1], 1)
+			result[2] = tree.iter.GetNext(result[1], 1)
 		} else {
 			result[2] = last
-			result[0] = GetPrev(last, 1)
+			result[0] = tree.iter.GetPrev(last, 1)
 		}
 
 	case 0:
@@ -261,8 +264,8 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 		if result[1] == nil {
 			return
 		}
-		result[0] = GetPrev(result[1], 1)
-		result[2] = GetNext(result[1], 1)
+		result[0] = tree.iter.GetPrev(result[1], 1)
+		result[2] = tree.iter.GetNext(result[1], 1)
 	}
 	return
 }
@@ -543,10 +546,6 @@ func (tree *Tree) rlrotate(cur *Node) {
 	cur.children[r] = mov
 	mov.parent = cur
 
-	// movparent.size = getChildrenSumSize(movparent) + 1
-	// mov.size = getChildrenSumSize(mov) + 1
-	// cur.size = getChildrenSumSize(cur) + 1
-
 	mov.height = getMaxChildrenHeight(mov) + 1
 	movparent.height = getMaxChildrenHeight(movparent) + 1
 	cur.height = getMaxChildrenHeight(cur) + 1
@@ -620,9 +619,6 @@ func (tree *Tree) rrotate(cur *Node) {
 	// 连接转移后的节点 由于mov只是与cur交换值,parent不变
 	cur.children[r] = mov
 
-	// mov.size = getChildrenSumSize(mov) + 1
-	// cur.size = getChildrenSumSize(cur) + 1
-
 	mov.height = getMaxChildrenHeight(mov) + 1
 	cur.height = getMaxChildrenHeight(cur) + 1
 }
@@ -659,9 +655,6 @@ func (tree *Tree) lrotateex(cur *Node) {
 
 	cur.children[r] = mov
 
-	// mov.size = getChildrenSumSize(mov) + 1
-	// cur.size = getChildrenSumSize(cur) + 1
-
 	mov.height = getMaxChildrenHeight(mov) + 1
 	cur.height = getMaxChildrenHeight(cur) + 1
 }
@@ -694,9 +687,6 @@ func (tree *Tree) lrotate(cur *Node) {
 
 	cur.children[r] = mov
 
-	// mov.size = getChildrenSumSize(mov) + 1
-	// cur.size = getChildrenSumSize(cur) + 1
-
 	mov.height = getMaxChildrenHeight(mov) + 1
 	cur.height = getMaxChildrenHeight(cur) + 1
 }

avldup/iterator.go

@@ -9,6 +9,7 @@ type Iterator struct {
 	up     *Node
 	cur    *Node
 	tstack *lastack.Stack
+	// curnext *Node
 }
 
 func initIterator(avltree *Tree) *Iterator {
@@ -23,6 +24,18 @@ func NewIterator(n *Node) *Iterator {
 	return iter
 }
 
+func NewIteratorWithCap(n *Node, cap int) *Iterator {
+	iter := &Iterator{tstack: lastack.NewWithCap(cap)}
+	iter.up = n
+	return iter
+}
+
+func (iter *Iterator) SetNode(n *Node) {
+	iter.up = n
+	iter.dir = 0
+	iter.tstack.Clear()
+}
+
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }
@@ -45,9 +58,10 @@ func (iter *Iterator) Right() bool {
 	return false
 }
 
-func GetNext(cur *Node, idx int) *Node {
+func (iter *Iterator) GetNext(cur *Node, idx int) *Node {
 
-	iter := NewIterator(cur)
+	// iter := NewIterator(cur)
+	iter.SetNode(cur)
 	iter.curPushNextStack(iter.up)
 	iter.up = iter.getNextUp(iter.up)
 
@@ -102,9 +116,10 @@ func (iter *Iterator) Next() (result bool) {
 
 	return false
 }
-func GetPrev(cur *Node, idx int) *Node {
+func (iter *Iterator) GetPrev(cur *Node, idx int) *Node {
 
-	iter := NewIterator(cur)
+	// iter := NewIterator(cur)
+	iter.SetNode(cur)
 	iter.curPushPrevStack(iter.up)
 	iter.up = iter.getPrevUp(iter.up)