README.md

@@ -15,7 +15,7 @@ import (
 )
 
 func main() {
-    pq := New(compare.Int)
+    pq := pqueuekey.New(compare.Int)
     pq.Push(1, 1)
     pq.Push(4, 4)
     pq.Push(5, 5)
@@ -40,15 +40,14 @@ func main() {
     log.Println(values3)
 
     iter := pq.Iterator() // Next 大到小 从root节点起始
-    log.Println(pq.String())
     // log.Println(iter.Value()) 直接使用会报错,
     iter.ToHead()
-    iter.Next()
+    log.Println(iter.Value()) // 起始最大值. true 5
-    log.Println(iter.Value())              // 起始最大值. true 5
     log.Println(iter.Prev(), iter.Value()) // false 5
 
     // Prev 大到小
     log.Println(iter.Next(), iter.Value()) // true 4
-
+    
+    
 }
 ```

TODO

@@ -1 +0,0 @@
-add iterator test every file

compare/compare.go

@@ -8,84 +8,6 @@ import "time"
 //    k1 < k2 --> -1
 type Compare func(k1, k2 interface{}) int
 
-// RuneArray []rune compare
-func RuneArray(k1, k2 interface{}) int {
-	s1 := k1.([]rune)
-	s2 := k2.([]rune)
-
-	switch {
-	case len(s1) > len(s2):
-		for i := 0; i < len(s2); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return 1
-	case len(s1) < len(s2):
-		for i := 0; i < len(s1); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return -1
-	default:
-		for i := 0; i < len(s1); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return 0
-	}
-}
-
-// ByteArray []byte compare
-func ByteArray(k1, k2 interface{}) int {
-	s1 := k1.([]byte)
-	s2 := k2.([]byte)
-
-	switch {
-	case len(s1) > len(s2):
-		for i := 0; i < len(s2); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return 1
-	case len(s1) < len(s2):
-		for i := 0; i < len(s1); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return -1
-	default:
-		for i := 0; i < len(s1); i++ {
-			if s1[i] != s2[i] {
-				if s1[i] > s2[i] {
-					return 1
-				}
-				return -1
-			}
-		}
-		return 0
-	}
-}
-
 // String comp
 func String(k1, k2 interface{}) int {
 	s1 := k1.(string)

go.mod

@@ -5,4 +5,5 @@ go 1.12
 require (
 	github.com/Pallinder/go-randomdata v1.1.0
 	github.com/davecgh/go-spew v1.1.1
+	github.com/emirpasic/gods v1.12.0
 )

priority_queue/iterator.go

@@ -1,7 +1,7 @@
 package pqueue
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {

priority_queue/priority_queue_test.go

@@ -283,15 +283,13 @@ func TestPriorityQueue_Iterator(t *testing.T) {
 
 	values := pq.Values()
 	for i := 0; ; i++ {
-
-		if !iter.Next() {
-			break
-		}
-
 		if values[i] != iter.Value() {
 			t.Error(values[i], " != ", iter.Value())
 		}
 
+		if !iter.Prev() {
+			break
+		}
 	}
 }
 

priority_queuekey/iterator.go

@@ -1,7 +1,7 @@
 package pqueuekey
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {
@@ -73,10 +50,6 @@ func (iter *Iterator) SetNode(n *Node) {
 	iter.tstack.Clear()
 }
 
-func (iter *Iterator) Key() interface{} {
-	return iter.cur.key
-}
-
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }

priority_queuekey/priority_queuekey_test.go

@@ -387,15 +387,13 @@ func TestPriorityQueue_Iterator(t *testing.T) {
 
 	values := pq.Values()
 	for i := 0; ; i++ {
-
-		if !iter.Next() {
-			break
-		}
-
 		if values[i] != iter.Value() {
 			t.Error(values[i], " != ", iter.Value())
 		}
 
+		if !iter.Next() {
+			break
+		}
 	}
 }
 
@@ -483,10 +481,10 @@ func TestMain(t *testing.T) {
 	log.Println(pq.String())
 	// log.Println(iter.Value()) 直接使用会报错,
 	iter.ToHead()
-	iter.Next()
 	log.Println(iter.Value())              // 起始最大值. true 5
 	log.Println(iter.Prev(), iter.Value()) // false 5
 
 	// Prev 大到小
 	log.Println(iter.Next(), iter.Value()) // true 4
+
 }

set/treeset/treeset_test.go

@@ -152,14 +152,7 @@ func TestTreeSet_Iterator(t *testing.T) {
 
 	iter := set.Iterator()
 	iter.ToHead()
-
+	// 3 4 5
-	// if not call Next Prev will error
-	// 5 4 3
-	// if iter.Value() != nil {
-	// 	t.Error(iter.Value())
-	// }
-
-	iter.Next()
 	if iter.Value() != 3 {
 		t.Error(iter.Value())
 	}
@@ -169,8 +162,12 @@ func TestTreeSet_Iterator(t *testing.T) {
 		t.Error(iter.Value())
 	}
 
+	iter.Next()
+	if iter.Value() != 5 {
+		t.Error(iter.Value())
+	}
+
 	iter.ToTail()
-	iter.Prev()
 	if iter.Value() != 5 {
 		t.Error(iter.Value())
 	}
@@ -179,16 +176,4 @@ func TestTreeSet_Iterator(t *testing.T) {
 	if iter.Value() != 4 {
 		t.Error(iter.Value())
 	}
-
-	iter.ToHead()
-	iter.Prev()
-	if iter.Value() != 3 {
-		t.Error(iter.Value())
-	}
-
-	iter.ToTail()
-	iter.Next()
-	if iter.Value() != 5 {
-		t.Error(iter.Value())
-	}
 }

tree/avl/avl_test.go

@@ -49,13 +49,11 @@ func TestIteratorHeadTail(t *testing.T) {
 	}
 
 	iter.ToHead()
-	iter.Prev() // or iter.Next
 	if iter.Value() != 1 {
 		t.Error("iter.Value() != ", 14, " value =", iter.Value())
 	}
 
 	iter.ToTail()
-	iter.Next() // or iter.Prev()
 	if iter.Value() != 30 {
 		t.Error("iter.Value() != ", 30, " value =", iter.Value())
 	}

tree/avl/iterator.go

@@ -1,7 +1,7 @@
 package avl
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {

tree/avl/iterator_test.go

@@ -1,35 +0,0 @@
-package avl
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/avldup/iterator.go

@@ -1,7 +1,7 @@
 package avldup
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {

tree/avldup/iterator_test.go

@@ -1,35 +0,0 @@
-package avldup
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/avlkey/iterator.go

@@ -1,7 +1,7 @@
 package avlkey
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {
@@ -73,10 +50,6 @@ func (iter *Iterator) SetNode(n *Node) {
 	iter.tstack.Clear()
 }
 
-func (iter *Iterator) Key() interface{} {
-	return iter.cur.key
-}
-
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }

tree/avlkey/iterator_test.go

@@ -1,35 +0,0 @@
-package avlkey
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v, v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/avlkeydup/iterator.go

@@ -1,7 +1,7 @@
 package avlkeydup
 
 import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {
@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {
@@ -73,10 +50,6 @@ func (iter *Iterator) SetNode(n *Node) {
 	iter.tstack.Clear()
 }
 
-func (iter *Iterator) Key() interface{} {
-	return iter.cur.key
-}
-
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }

tree/avlkeydup/iterator_test.go

@@ -1,35 +0,0 @@
-package avlkeydup
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v, v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/rsync.sh

@@ -1,21 +0,0 @@
-
-rsync() {
-    FILE_NAME=$3  #iterator_test.go
-    SRC_DIR_NAME=$1 #vbtkey dir
-    DEST_DIR_NAME=$2 # vbtdupkey dir
-
-    cp ./$SRC_DIR_NAME/$FILE_NAME ./$DEST_DIR_NAME/$FILE_NAME
-    sed -i "s/package $SRC_DIR_NAME/package ${DEST_DIR_NAME}/" ./$DEST_DIR_NAME/$FILE_NAME
-}
-
-# 同步iterator_test
-for dst in "vbtkeydup" "avlkey" "avlkeydup" 
-do
-    rsync "vbtkey" $dst "iterator_test.go"
-done
-
-# 同步iterator_test
-for dst in "vbtdup" "avl" "avldup" 
-do
-    rsync "vbt" $dst "iterator_test.go"
-done

tree/tree.go

@@ -1,6 +1,6 @@
 package tree
 
-// IBSTreeKey  Compare函数可以自定义所以key不一定value, 可以是value结构体中一个属性
+// IBSTreeKey Compare函数可以自定义所以key不一定value, 可以是value结构体中一个属性
 type IBSTreeKey interface {
 	String() string
 	Size() int
@@ -21,23 +21,11 @@ type IBSTree interface {
 	Clear()
 	// Values 返回先序遍历的值
 	Values() []interface{}
-	Get(value interface{}) (interface{}, bool)
+	Get(key interface{}) (interface{}, bool)
 	Put(value interface{})
 	Traversal(every func(v interface{}) bool, traversalMethod ...interface{})
 }
 
-type IBSTreeDup interface {
-	String() string
-	Size() int
-	Remove(key interface{}) (interface{}, bool)
-	Clear()
-	// Values 返回先序遍历的值
-	Values() []interface{}
-	Get(value interface{}) (interface{}, bool)
-	Put(value interface{}) bool
-	Traversal(every func(v interface{}) bool, traversalMethod ...interface{})
-}
-
 type IBSTreeDupKey interface {
 	String() string
 	Size() int

tree/vbt/iterator.go

@@ -31,36 +31,13 @@ func NewIteratorWithCap(n *Node, cap int) *Iterator {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) GetNode() *Node {

tree/vbt/iterator_test.go

@@ -1,35 +0,0 @@
-package vbt
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/vbtdup/iterator_test.go

@@ -1,35 +0,0 @@
-package vbtdup
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/vbtdup/vbtdup_test.go

@@ -1,844 +0,0 @@
-package vbtdup
-
-import (
-	"bytes"
-	"encoding/gob"
-	"io/ioutil"
-	"log"
-	"sort"
-	"testing"
-
-	"github.com/Pallinder/go-randomdata"
-	"github.com/davecgh/go-spew/spew"
-
-	"github.com/474420502/focus/compare"
-)
-
-func loadTestData() []int {
-	data, err := ioutil.ReadFile("../l.log")
-	if err != nil {
-		log.Println(err)
-	}
-	var l []int
-	decoder := gob.NewDecoder(bytes.NewReader(data))
-	decoder.Decode(&l)
-	return l
-}
-
-func TestIteratorHeadTail(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{1, 7, 14, 14, 16, 17, 20, 30, 21, 40, 50, 3, 40, 40, 40, 15, 100}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	iter := tree.Iterator()
-	iter.ToHead() // 从小到大
-	iter.Next()
-	if iter.Value() != 1 {
-		t.Error("value error", iter.Value())
-	}
-
-	iter.ToTail()
-	iter.Prev()
-	if iter.Value() != 100 {
-		t.Error("value error", iter.Value())
-	}
-
-	for n := 0; n < 500; n++ {
-		tree := New(compare.Int)
-		var results []int
-		for i := 0; i < 50; i++ {
-			v := randomdata.Number(0, 5000)
-			if ok := tree.Put(v); ok {
-				results = append(results, v)
-			}
-		}
-		result := tree.GetAround(5001)
-
-		iter = tree.Iterator()
-		iter.ToTail()
-		iter.Prev()
-		if iter.Value() != result[0] {
-			t.Error("ToTail error", result, iter.Value())
-		}
-
-		result = tree.GetAround(-1)
-
-		iter.ToHead()
-		iter.Next()
-		if iter.Value() != result[2] {
-			t.Error("ToTail error", result, iter.Value())
-		}
-
-	}
-
-}
-
-func TestLargePushRemove(t *testing.T) {
-	for n := 0; n < 10; n++ {
-		tree := New(compare.Int)
-		var results []int
-		for i := 0; i < 50000; i++ {
-			v := randomdata.Number(0, 100000000)
-			if ok := tree.Put(v); ok {
-				results = append(results, v)
-			}
-
-		}
-
-		if tree.Size() != len(results) {
-			t.Error("Szie error", tree.Size(), len(results))
-		}
-
-		for i := 0; i < len(results)-10; i++ {
-			tree.Remove(results[i])
-		}
-
-		results = results[len(results)-10:]
-		if tree.Size() != 10 {
-			t.Error("Szie error")
-		}
-		sort.Slice(results, func(i, j int) bool {
-			if results[i] < results[j] {
-				return true
-			}
-			return false
-		})
-		if spew.Sprint(results) != spew.Sprint(tree.Values()) {
-			t.Error("tree is error")
-		}
-
-		for i := 0; i < 10; i++ {
-			v1 := results[i]
-			v2, ok := tree.Index(i)
-			if !ok {
-				t.Error("not ok")
-			}
-			if v1 != v2 {
-				t.Error("v1(", v1, ") != v2(", v2, ")??")
-			}
-		}
-
-		tree.Clear()
-		if tree.String() != "VBTree-Dup\nnil" {
-			t.Error("tree String is error")
-		}
-	}
-}
-
-func TestRemoveIndex(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{7, 14, 14, 14, 16, 1, 40, 15}
-	for _, v := range l {
-		tree.Put(v)
-	}
-
-	// [1 7 14 14 14 15 16 40]
-	var result string
-	result = spew.Sprint(tree.Values())
-	if result != "[1 7 14 15 16 40]" {
-		t.Error("result = ", result, " should be [1 7 14 15 16 40]")
-	}
-
-	tree.RemoveIndex(3)
-	result = spew.Sprint(tree.Values())
-	if result != "[1 7 14 16 40]" {
-		t.Error("result is error")
-	}
-
-	tree.RemoveIndex(-1)
-	result = spew.Sprint(tree.Values())
-	if result != "[1 7 14 16]" {
-		t.Error("result is error")
-	}
-
-	tree.RemoveIndex(0)
-	result = spew.Sprint(tree.Values())
-	if result != "[7 14 16]" {
-		t.Error("result is error")
-	}
-
-	if tree.Size() != 3 {
-		t.Error("size is error")
-	}
-
-	for tree.Size() != 0 {
-		tree.RemoveIndex(0)
-	}
-
-	if tree.root != nil {
-		t.Error("tree roor is not error")
-	}
-}
-
-func TestIndexRange(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{7, 14, 14, 14, 16, 17, 20, 30, 21, 40, 50, 3, 40, 40, 40, 15}
-	for _, v := range l {
-		tree.Put(v)
-	}
-	// [3 7 14 15 16 17 20 21 30 40 50]
-	// t.Error(tree.Values(), tree.Size())
-	// t.Error(tree.debugString())
-
-	var result string
-	result = spew.Sprint(tree.IndexRange(0, 5))
-	if result != "[3 7 14 15 16 17] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(2, 5))
-	if result != "[14 15 16 17] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(5, 100))
-	if result != "[17 20 21 30 40 50] false" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(10, 0)) // size = 11, index max = 10
-	if result != "[50 40 30 21 20 17 16 15 14 7 3] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(11, 0)) // size = 11, index max = 10
-	if result != "[50 40 30 21 20 17 16 15 14 7 3] false" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(4, 1)) // size = 11, index max = 10
-	if result != "[16 15 14 7] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(-1, -5)) // size = 11, index max = 10
-	if result != "[50 40 30 21 20] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(-1, -11)) // size = 11, index max = 0 - 10 (-1,-11)
-	if result != "[50 40 30 21 20 17 16 15 14 7 3] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(-1, -12)) // size = 11, index max = 0 - 10 (-1,-11)
-	if result != "[50 40 30 21 20 17 16 15 14 7 3] false" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(-5, -1)) // size = 11, index max = 0 - 10 (-1,-11)
-	if result != "[20 21 30 40 50] true" {
-		t.Error(result)
-	}
-
-	// [3 7 14 15 16 17 20 21 30 40 50]
-	result = spew.Sprint(tree.IndexRange(-5, 5)) //
-	if result != "[20 17] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(5, -5)) //
-	if result != "[17 20] true" {
-		t.Error(result)
-	}
-
-	result = spew.Sprint(tree.IndexRange(-1, 6)) //
-	if result != "[50 40 30 21 20] true" {
-		t.Error(result)
-	}
-
-}
-
-func TestGetAround(t *testing.T) {
-	tree := New(compare.Int)
-	for _, v := range []int{7, 14, 14, 14, 16, 17, 20, 30, 21, 40, 50, 3, 40, 40, 40, 15} {
-		tree.Put(v)
-	}
-
-	var Result string
-
-	Result = spew.Sprint(tree.GetAround(17))
-	if Result != "[16 17 20]" {
-		t.Error(tree.Values())
-		t.Error("17 is root, tree.GetAround(17)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(3))
-	if Result != "[<nil> 3 7]" {
-		t.Error(tree.Values())
-		t.Error("tree.GetAround(3)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(40))
-	if Result != "[30 40 50]" {
-		t.Error(tree.Values())
-		t.Error("tree.GetAround(40)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(50))
-	if Result != "[40 50 <nil>]" {
-		t.Error(tree.Values())
-		t.Error("tree.GetAround(50)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(18))
-	if Result != "[17 <nil> 20]" {
-		t.Error(tree.Values())
-		t.Error("18 is not in list, tree.GetAround(18)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(5))
-	if Result != "[3 <nil> 7]" {
-		t.Error(tree.Values())
-		t.Error("5 is not in list, tree.GetAround(5)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(2))
-	if Result != "[<nil> <nil> 3]" {
-		t.Error(tree.Values())
-		t.Error("2 is not in list, tree.GetAround(2)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-	Result = spew.Sprint(tree.GetAround(100))
-	if Result != "[50 <nil> <nil>]" {
-		t.Error(tree.Values())
-		t.Error("50 is not in list, tree.GetAround(50)) is error", Result)
-		t.Error(tree.debugString())
-	}
-
-}
-
-// // for test error case
-
-// func TestPutComparatorRandom(t *testing.T) {
-
-// 	for n := 0; n < 300000; n++ {
-// 		tree := New(compare.Int)
-// 		godsavl := avltree.NewWithIntComparator()
-
-// 		content := ""
-// 		m := make(map[int]int)
-// 		for i := 0; len(m) < 10; i++ {
-// 			v := randomdata.Number(0, 65535)
-// 			if _, ok := m[v]; !ok {
-// 				m[v] = v
-// 				content += spew.Sprint(v) + ","
-// 				tree.Put(v, v)
-// 				godsavl.Put(v, v)
-// 			}
-// 		}
-
-// 		s1 := spew.Sprint(tree.Values())
-// 		s2 := spew.Sprint(godsavl.Values())
-
-// 		if s1 != s2 {
-// 			t.Error(godsavl.String())
-// 			t.Error(tree.debugString())
-// 			t.Error(content, n)
-// 			break
-// 		}
-// 	}
-// }
-
-func TestGet(t *testing.T) {
-	tree := New(compare.Int)
-	for _, v := range []int{2383, 7666, 3055, 39016, 57092, 27897, 36513, 1562, 22574, 23202} {
-		tree.Put(v)
-	}
-
-	for _, v := range []int{2383, 7666, 3055, 39016, 57092, 27897, 36513, 1562, 22574, 23202} {
-		v, ok := tree.Get(v)
-		if !ok {
-			t.Error("the val not found ", v)
-		}
-	}
-
-	if v, ok := tree.Get(10000); ok {
-		t.Error("the val(1000) is not in tree, but is found", v)
-	}
-}
-
-func TestDupGetRange(t *testing.T) {
-	tree := New(compare.Int)
-	for _, v := range []int{5, 10, 13, 5, 17, 1, 2, 10, 40, 30, 1} {
-		tree.Put(v)
-	}
-
-	result := tree.GetRange(0, 20)
-	if spew.Sprint(result) != "[1 2 5 10 13 17]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(0, 8)
-	if spew.Sprint(result) != "[1 2 5]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(-5, -1)
-	if spew.Sprint(result) != "[]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(7, 20)
-	if spew.Sprint(result) != "[10 13 17]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 40)
-	if spew.Sprint(result) != "[30 40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 60)
-	if spew.Sprint(result) != "[30 40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(40, 40)
-	if spew.Sprint(result) != "[40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(50, 60)
-	if spew.Sprint(result) != "[]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(50, 1)
-	if spew.Sprint(result) != "[40 30 17 13 10 5 2 1]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 20)
-	if spew.Sprint(result) != "[30]" {
-		t.Error(result)
-	}
-
-}
-
-func TestGetRange(t *testing.T) {
-	tree := New(compare.Int)
-	for _, v := range []int{5, 6, 8, 10, 13, 17, 1, 2, 40, 30} {
-		tree.Put(v)
-	}
-
-	// t.Error(tree.debugString())
-	// t.Error(tree.getArountNode(20))
-	// t.Error(tree.Values())
-
-	result := tree.GetRange(0, 20)
-	if spew.Sprint(result) != "[1 2 5 6 8 10 13 17]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(-5, -1)
-	if spew.Sprint(result) != "[]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(7, 20)
-	if spew.Sprint(result) != "[8 10 13 17]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 40)
-	if spew.Sprint(result) != "[30 40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 60)
-	if spew.Sprint(result) != "[30 40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(40, 40)
-	if spew.Sprint(result) != "[40]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(50, 60)
-	if spew.Sprint(result) != "[]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(50, 1)
-	if spew.Sprint(result) != "[40 30 17 13 10 8 6 5 2 1]" {
-		t.Error(result)
-	}
-
-	result = tree.GetRange(30, 20)
-	if spew.Sprint(result) != "[30]" {
-		t.Error(result)
-	}
-
-}
-
-func TestTravalsal(t *testing.T) {
-	tree := New(compare.Int)
-	for _, v := range []int{5, 6, 8, 10, 13, 17, 1, 2, 40, 30} {
-		tree.Put(v)
-	}
-
-	i := 0
-	var result []interface{}
-	tree.Traversal(func(v interface{}) bool {
-		result = append(result, v)
-		i++
-		if i >= 10 {
-			return false
-		}
-		return true
-	})
-
-	if spew.Sprint(result) != "[1 2 5 6 8 10 13 17 30 40]" {
-		t.Error(result)
-	}
-
-}
-
-// func TestRemoveAll(t *testing.T) {
-// ALL:
-// 	for c := 0; c < 5000; c++ {
-// 		tree := New(compare.Int)
-// 		gods := avltree.NewWithIntComparator()
-// 		var l []int
-// 		m := make(map[int]int)
-
-// 		for i := 0; len(l) < 50; i++ {
-// 			v := randomdata.Number(0, 100000)
-// 			if _, ok := m[v]; !ok {
-// 				m[v] = v
-// 				l = append(l, v)
-// 				tree.Put(v, v)
-// 				gods.Put(v, v)
-// 			}
-// 		}
-
-// 		for i := 0; i < 50; i++ {
-
-// 			tree.Remove(l[i])
-// 			gods.Remove(l[i])
-
-// 			s1 := spew.Sprint(tree.Values())
-// 			s2 := spew.Sprint(gods.Values())
-// 			if s1 != s2 {
-// 				t.Error("avl remove error", "avlsize = ", tree.Size())
-// 				t.Error(tree.root, i, l[i])
-// 				t.Error(s1)
-// 				t.Error(s2)
-// 				break ALL
-// 			}
-// 		}
-// 	}
-// }
-
-// func TestRemove(t *testing.T) {
-
-// ALL:
-// 	for N := 0; N < 5000; N++ {
-// 		tree := New(compare.Int)
-// 		gods := avltree.NewWithIntComparator()
-
-// 		var l []int
-// 		m := make(map[int]int)
-
-// 		for i := 0; len(l) < 20; i++ {
-// 			v := randomdata.Number(0, 100)
-// 			if _, ok := m[v]; !ok {
-// 				l = append(l, v)
-// 				m[v] = v
-// 				tree.Put(v, v)
-// 				gods.Put(v, v)
-// 			}
-// 		}
-
-// 		src1 := tree.String()
-// 		src2 := gods.String()
-
-// 		for i := 0; i < 20; i++ {
-// 			tree.Remove(l[i])
-// 			gods.Remove(l[i])
-// 			if tree.root != nil && spew.Sprint(gods.Values()) != spew.Sprint(tree.Values()) {
-// 				t.Error(src1)
-// 				t.Error(src2)
-// 				t.Error(tree.debugString())
-// 				t.Error(gods.String())
-// 				t.Error(l[i])
-// 				break ALL
-// 			}
-// 		}
-// 	}
-// }
-
-// func BenchmarkGetRange(b *testing.B) {
-
-// }
-
-// func BenchmarkIndexRange(b *testing.B) {
-// 	tree := New(compare.Int)
-// 	l := loadTestData()
-// 	b.N = len(l)
-
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 5
-// 	b.N = len(l) * execCount
-
-// 	for i := 0; i < execCount; i++ {
-// 		for range l {
-// 			tree.IndexRange(i, i+49)
-// 		}
-// 	}
-// }
-
-// func BenchmarkSkipListGet(b *testing.B) {
-// 	sl := skiplist.New(skiplist.Int)
-// 	l := loadTestData()
-// 	b.N = len(l)
-
-// 	for _, v := range l {
-// 		sl.Set(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 5
-// 	b.N = len(l) * execCount
-
-// 	for i := 0; i < execCount; i++ {
-// 		for _, v := range l {
-// 			sl.Get(v)
-// 			// e := sl.Get(v)
-// 			// var result [50]interface{}
-// 			// for i := 0; i < 50 && e != nil; i++ {
-// 			// 	result[i] = e.Value
-// 			// 	e = e.Next()
-// 			// }
-// 		}
-// 	}
-// }
-
-// func BenchmarkSkipListSet(b *testing.B) {
-
-// 	l := loadTestData()
-// 	execCount := 1
-// 	b.N = len(l) * execCount
-// 	for i := 0; i < execCount; i++ {
-// 		sl := skiplist.New(skiplist.Int)
-// 		for _, v := range l {
-// 			sl.Set(v, v)
-// 		}
-// 	}
-// }
-
-// func BenchmarkIterator(b *testing.B) {
-// 	tree := New(compare.Int)
-
-// 	l := loadTestData()
-// 	b.N = len(l)
-
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-// 	iter := tree.Iterator()
-// 	b.N = 0
-// 	for iter.Next() {
-// 		b.N++
-// 	}
-// 	for iter.Prev() {
-// 		b.N++
-// 	}
-// 	for iter.Next() {
-// 		b.N++
-// 	}
-// 	b.Log(b.N, len(l))
-// }
-
-// func BenchmarkRemove(b *testing.B) {
-// 	tree := New(compare.Int)
-
-// 	l := loadTestData()
-
-// 	b.N = len(l)
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	for i := 0; i < len(l); i++ {
-// 		tree.Remove(l[i])
-// 	}
-// }
-
-// func BenchmarkGodsRemove(b *testing.B) {
-// 	tree := avltree.NewWithIntComparator()
-
-// 	l := loadTestData()
-
-// 	b.N = len(l)
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	for i := 0; i < len(l); i++ {
-// 		tree.Remove(l[i])
-// 	}
-// }
-
-// func BenchmarkGodsRBRemove(b *testing.B) {
-// 	tree := redblacktree.NewWithIntComparator()
-
-// 	l := loadTestData()
-
-// 	b.N = len(l)
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	for i := 0; i < len(l); i++ {
-// 		tree.Remove(l[i])
-// 	}
-// }
-
-// func BenchmarkGet(b *testing.B) {
-
-// 	tree := New(compare.Int)
-
-// 	l := loadTestData()
-// 	b.N = len(l)
-// 	for i := 0; i < b.N; i++ {
-// 		tree.Put(l[i], i)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 10
-// 	b.N = len(l) * execCount
-
-// 	for i := 0; i < execCount; i++ {
-// 		for _, v := range l {
-// 			tree.Get(v)
-// 		}
-// 	}
-// }
-
-// func BenchmarkGodsRBGet(b *testing.B) {
-// 	tree := redblacktree.NewWithIntComparator()
-
-// 	l := loadTestData()
-// 	b.N = len(l)
-// 	for i := 0; i < b.N; i++ {
-// 		tree.Put(l[i], i)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 10
-// 	b.N = len(l) * execCount
-
-// 	for i := 0; i < execCount; i++ {
-// 		for _, v := range l {
-// 			tree.Get(v)
-// 		}
-// 	}
-// }
-
-// func BenchmarkGodsAvlGet(b *testing.B) {
-// 	tree := avltree.NewWithIntComparator()
-
-// 	l := loadTestData()
-// 	b.N = len(l)
-// 	for i := 0; i < b.N; i++ {
-// 		tree.Put(l[i], i)
-// 	}
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 10
-// 	b.N = len(l) * execCount
-
-// 	for i := 0; i < execCount; i++ {
-// 		for _, v := range l {
-// 			tree.Get(v)
-// 		}
-// 	}
-// }
-
-// func BenchmarkPut(b *testing.B) {
-// 	l := loadTestData()
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 50
-// 	b.N = len(l) * execCount
-// 	for i := 0; i < execCount; i++ {
-// 		tree := New(compare.Int)
-// 		for _, v := range l {
-// 			tree.Put(v, v)
-// 		}
-// 	}
-// }
-
-// func TestPutStable(t *testing.T) {
-
-// }
-
-// func BenchmarkGodsRBPut(b *testing.B) {
-// 	l := loadTestData()
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	execCount := 50
-// 	b.N = len(l) * execCount
-// 	for i := 0; i < execCount; i++ {
-// 		tree := redblacktree.NewWithIntComparator()
-// 		for _, v := range l {
-// 			tree.Put(v, v)
-// 		}
-// 	}
-// }
-
-// func BenchmarkGodsPut(b *testing.B) {
-// 	tree := avltree.NewWithIntComparator()
-
-// 	l := loadTestData()
-
-// 	b.ResetTimer()
-// 	b.StartTimer()
-
-// 	b.N = len(l)
-// 	for _, v := range l {
-// 		tree.Put(v, v)
-// 	}
-// }

tree/vbtdupkey/iterator.go

@@ -1,4 +1,4 @@
-package vbtdup
+package vbtkey
 
 import (
 	lastack "github.com/474420502/focus/stack/listarraystack"
@@ -47,7 +47,6 @@ func (iter *Iterator) ToHead() {
 		iter.cur = iter.cur.children[0]
 	}
 	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
@@ -64,7 +63,6 @@ func (iter *Iterator) ToTail() {
 		iter.cur = iter.cur.children[1]
 	}
 	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) SetNode(n *Node) {

tree/vbtdupkey/vbtdupkey.go

@@ -1,4 +1,4 @@
-package vbtkeydup
+package vbtkey
 
 import (
 	"github.com/davecgh/go-spew/spew"
@@ -347,7 +347,7 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 
 	for n := tree.root; n != nil; {
 		last = n
-		c := tree.Compare(key, n.key)
+		c := tree.Compare(key, n.value)
 		switch c {
 		case -1:
 			n = n.children[0]

tree/vbtdupkey/vbtdupkey_test.go

@@ -1,4 +1,4 @@
-package vbtkeydup
+package vbtkey
 
 import (
 	"bytes"
@@ -34,13 +34,12 @@ func TestIteratorHeadTail(t *testing.T) {
 
 	iter := tree.Iterator()
 	iter.ToHead() // 从小到大
-	iter.Next()
 	if iter.Value() != 1 {
 		t.Error("value error", iter.Value())
 	}
 
 	iter.ToTail()
-	iter.Prev()
+
 	if iter.Value() != 100 {
 		t.Error("value error", iter.Value())
 	}
@@ -58,7 +57,6 @@ func TestIteratorHeadTail(t *testing.T) {
 
 		iter = tree.Iterator()
 		iter.ToTail()
-		iter.Prev()
 		if iter.Value() != result[0] {
 			t.Error("ToTail error", result, iter.Value())
 		}
@@ -66,7 +64,6 @@ func TestIteratorHeadTail(t *testing.T) {
 		result = tree.GetAround(-1)
 
 		iter.ToHead()
-		iter.Next()
 		if iter.Value() != result[2] {
 			t.Error("ToTail error", result, iter.Value())
 		}

tree/vbtkey/iterator.go

@@ -35,36 +35,13 @@ func (iter *Iterator) GetNode() *Node {
 }
 
 func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
+	for iter.Prev() {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) ToTail() {
-
+	for iter.Next() {
-	if iter.cur == nil {
-		iter.cur = iter.up
 	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
 }
 
 func (iter *Iterator) SetNode(n *Node) {
@@ -73,10 +50,6 @@ func (iter *Iterator) SetNode(n *Node) {
 	iter.tstack.Clear()
 }
 
-func (iter *Iterator) Key() interface{} {
-	return iter.cur.key
-}
-
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }

tree/vbtkey/iterator_test.go

@@ -1,35 +0,0 @@
-package vbtkey
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v, v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}

tree/vbtkey/vbtkey.go

@@ -27,7 +27,6 @@ func (n *Node) String() string {
 	return spew.Sprint(n.value) + "(" + p + "|" + spew.Sprint(n.size) + ")"
 }
 
-// Tree increasing
 type Tree struct {
 	root    *Node
 	Compare compare.Compare
@@ -44,7 +43,7 @@ func New(Compare compare.Compare) *Tree {
 }
 
 func (tree *Tree) String() string {
-	str := "VBTree-Key\n"
+	str := "AVLTree\n"
 	if tree.root == nil {
 		return str + "nil"
 	}
@@ -348,7 +347,7 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 
 	for n := tree.root; n != nil; {
 		last = n
-		c := tree.Compare(key, n.key)
+		c := tree.Compare(key, n.value)
 		switch c {
 		case -1:
 			n = n.children[0]

tree/vbtkey/vbtkey_test.go

@@ -66,7 +66,7 @@ func TestLargePushRemove(t *testing.T) {
 		}
 
 		tree.Clear()
-		if tree.String() != "VBTree-Key\nnil" {
+		if tree.String() != "AVLTree\nnil" {
 			t.Error("tree String is error")
 		}
 	}

tree/vbtkeydup/iterator.go

@@ -1,252 +0,0 @@
-package vbtkeydup
-
-import (
-	lastack "github.com/474420502/focus/stack/listarraystack"
-)
-
-type Iterator struct {
-	dir    int
-	up     *Node
-	cur    *Node
-	tstack *lastack.Stack
-	// curnext *Node
-}
-
-func initIterator(avltree *Tree) *Iterator {
-	iter := &Iterator{tstack: lastack.New()}
-	iter.up = avltree.root
-	return iter
-}
-
-func NewIterator(n *Node) *Iterator {
-	iter := &Iterator{tstack: lastack.New()}
-	iter.up = n
-	return iter
-}
-
-func NewIteratorWithCap(n *Node, cap int) *Iterator {
-	iter := &Iterator{tstack: lastack.NewWithCap(cap)}
-	iter.up = n
-	return iter
-}
-
-func (iter *Iterator) GetNode() *Node {
-	return iter.cur
-}
-
-func (iter *Iterator) ToHead() {
-	if iter.cur == nil {
-		iter.cur = iter.up
-	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[0] != nil {
-		iter.cur = iter.cur.children[0]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
-}
-
-func (iter *Iterator) ToTail() {
-
-	if iter.cur == nil {
-		iter.cur = iter.up
-	}
-
-	for iter.cur.parent != nil {
-		iter.cur = iter.cur.parent
-	}
-
-	for iter.cur.children[1] != nil {
-		iter.cur = iter.cur.children[1]
-	}
-	iter.SetNode(iter.cur)
-	iter.cur = nil
-}
-
-func (iter *Iterator) SetNode(n *Node) {
-	iter.up = n
-	iter.dir = 0
-	iter.tstack.Clear()
-}
-
-func (iter *Iterator) Key() interface{} {
-	return iter.cur.key
-}
-
-func (iter *Iterator) Value() interface{} {
-	return iter.cur.value
-}
-
-func (iter *Iterator) GetNext(cur *Node, idx int) *Node {
-
-	// iter := NewIterator(cur)
-	iter.SetNode(cur)
-	iter.curPushNextStack(iter.up)
-	iter.up = iter.getNextUp(iter.up)
-
-	for i := 0; i < idx; i++ {
-
-		if iter.tstack.Size() == 0 {
-			if iter.up == nil {
-				return nil
-			}
-			iter.tstack.Push(iter.up)
-			iter.up = iter.getNextUp(iter.up)
-		}
-
-		if v, ok := iter.tstack.Pop(); ok {
-			iter.cur = v.(*Node)
-			if i == idx-1 {
-				return iter.cur
-			}
-			iter.curPushNextStack(iter.cur)
-		} else {
-			return nil
-		}
-	}
-
-	return cur
-}
-
-func (iter *Iterator) Next() (result bool) {
-
-	if iter.dir > -1 {
-		if iter.dir == 1 && iter.cur != nil {
-			iter.tstack.Clear()
-			iter.curPushNextStack(iter.cur)
-			iter.up = iter.getNextUp(iter.cur)
-		}
-		iter.dir = -1
-	}
-
-	if iter.tstack.Size() == 0 {
-		if iter.up == nil {
-			return false
-		}
-		iter.tstack.Push(iter.up)
-		iter.up = iter.getNextUp(iter.up)
-	}
-
-	if v, ok := iter.tstack.Pop(); ok {
-		iter.cur = v.(*Node)
-		iter.curPushNextStack(iter.cur)
-		return true
-	}
-
-	return false
-}
-func (iter *Iterator) GetPrev(cur *Node, idx int) *Node {
-
-	// iter := NewIterator(cur)
-	iter.SetNode(cur)
-	iter.curPushPrevStack(iter.up)
-	iter.up = iter.getPrevUp(iter.up)
-
-	for i := 0; i < idx; i++ {
-
-		if iter.tstack.Size() == 0 {
-			if iter.up == nil {
-				return nil
-			}
-			iter.tstack.Push(iter.up)
-			iter.up = iter.getPrevUp(iter.up)
-		}
-
-		if v, ok := iter.tstack.Pop(); ok {
-			iter.cur = v.(*Node)
-			if i == idx-1 {
-				return iter.cur
-			}
-			iter.curPushPrevStack(iter.cur)
-		} else {
-			return nil
-		}
-	}
-
-	return cur
-}
-
-func (iter *Iterator) Prev() (result bool) {
-
-	if iter.dir < 1 { // 非 1(next 方向定义 -1 为 prev)
-		if iter.dir == -1 && iter.cur != nil { // 如果上次为prev方向, 则清空辅助计算的栈
-			iter.tstack.Clear()
-			iter.curPushPrevStack(iter.cur)    // 把当前cur计算的回朔
-			iter.up = iter.getPrevUp(iter.cur) // cur 寻找下个要计算up
-		}
-		iter.dir = 1
-	}
-
-	// 如果栈空了, 把up的递归计算入栈, 重新计算 下次的up值
-	if iter.tstack.Size() == 0 {
-		if iter.up == nil {
-			return false
-		}
-		iter.tstack.Push(iter.up)
-		iter.up = iter.getPrevUp(iter.up)
-	}
-
-	if v, ok := iter.tstack.Pop(); ok {
-		iter.cur = v.(*Node)
-		iter.curPushPrevStack(iter.cur)
-		return true
-	}
-
-	// 如果再次计算的栈为空, 则只能返回false
-	return false
-}
-
-func getRelationship(cur *Node) int {
-	if cur.parent.children[1] == cur {
-		return 1
-	}
-	return 0
-}
-
-func (iter *Iterator) getPrevUp(cur *Node) *Node {
-	for cur.parent != nil {
-		if getRelationship(cur) == 1 { // next 在 降序 小值. 如果child在右边, parent 比 child 小, parent才有效, 符合降序
-			return cur.parent
-		}
-		cur = cur.parent
-	}
-	return nil
-}
-
-func (iter *Iterator) curPushPrevStack(cur *Node) {
-	Prev := cur.children[0] // 当前的左然后向右找, 找到最大, 就是最接近cur 并且小于cur的值
-
-	if Prev != nil {
-		iter.tstack.Push(Prev)
-		for Prev.children[1] != nil {
-			Prev = Prev.children[1]
-			iter.tstack.Push(Prev) // 入栈 用于回溯
-		}
-	}
-}
-
-func (iter *Iterator) getNextUp(cur *Node) *Node {
-	for cur.parent != nil {
-		if getRelationship(cur) == 0 { // Prev 在 降序 大值. 如果child在左边, parent 比 child 大, parent才有效 , 符合降序
-			return cur.parent
-		}
-		cur = cur.parent
-	}
-	return nil
-}
-
-func (iter *Iterator) curPushNextStack(cur *Node) {
-	next := cur.children[1]
-
-	if next != nil {
-		iter.tstack.Push(next)
-		for next.children[0] != nil {
-			next = next.children[0]
-			iter.tstack.Push(next)
-		}
-	}
-}

tree/vbtkeydup/iterator_test.go

@@ -1,35 +0,0 @@
-package vbtkeydup
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/474420502/focus/compare"
-)
-
-func TestIerator(t *testing.T) {
-	tree := New(compare.Int)
-	l := []int{5, 10, 100, 30, 40, 70, 45, 35, 23}
-	for _, v := range l {
-		tree.Put(v, v)
-	}
-
-	sort.Ints(l)
-
-	iter := tree.Iterator()
-	iter.ToHead()
-	for i := 0; iter.Next(); i++ {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-	iter.ToTail()
-	iter.Prev()
-	for i := len(l) - 1; iter.Next(); i-- {
-
-		if iter.Value() != l[i] {
-			t.Error(iter.Value(), l[i])
-		}
-	}
-}