完成stack的接口标准

priority_queue/iterator.go

@@ -1,7 +1,7 @@
 package pqueue
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

priority_queuekey/iterator.go

@@ -1,7 +1,7 @@
 package pqueuekey
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

stack/listarraystack/lastack.go

@@ -1,6 +1,7 @@
 package lastack
 
 import (
+	"github.com/474420502/focus/stack"
 	"github.com/davecgh/go-spew/spew"
 )
 
@@ -13,7 +14,11 @@ type Node struct {
 type Stack struct {
 	top   *Node
 	cache *Node
-	size  int
+	size  uint
+}
+
+func assertImplementation() {
+	var _ stack.IStack = (*Stack)(nil)
 }
 
 func (as *Stack) grow() bool {
@@ -25,7 +30,7 @@ func (as *Stack) grow() bool {
 			grownode.cur = -1
 			as.cache = nil
 		} else {
-			var growsize int
+			var growsize uint
 			if as.size <= 256 {
 				growsize = as.size << 1
 			} else {
@@ -78,10 +83,11 @@ func (as *Stack) Empty() bool {
 	return as.size == 0
 }
 
-func (as *Stack) Size() int {
+func (as *Stack) Size() uint {
 	return as.size
 }
 
+// String 左为Top
 func (as *Stack) String() string {
 	content := ""
 	cur := as.top
@@ -119,7 +125,7 @@ func (as *Stack) Values() []interface{} {
 	return result
 }
 
-func (as *Stack) Get(idx int) (interface{}, bool) {
+func (as *Stack) Index(idx int) (interface{}, bool) {
 	if idx < 0 {
 		return nil, false
 	}

stack/listarraystack/lastack_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestPush(t *testing.T) {
 	var result string
-	s := New()
+	s := NewWithCap(10)
 
 	result = spew.Sprint(s.Values())
 	if result != "[]" {
@@ -67,9 +67,24 @@ func TestPush(t *testing.T) {
 		t.Error(result)
 	}
 
+	for i := 0; i < 100; i++ {
+		s.Push(i)
+	}
+
+	if v, _ := s.Index(50); v != 49 {
+		t.Error(v)
+	}
+
+	for i := 0; i < 50; i++ {
+		s.Pop()
+	}
+
+	if v, _ := s.Peek(); v != 49 {
+		t.Error(s.Peek())
+	}
 }
 
-func TestGet(t *testing.T) {
+func TestBase(t *testing.T) {
 	s := New()
 
 	l := []int{10, 7, 3, 4, 5, 15}
@@ -77,7 +92,34 @@ func TestGet(t *testing.T) {
 		s.Push(v)
 	}
 
-	if v, isfound := s.Get(0); isfound {
+	if _, ok := s.Index(-1); ok {
+		t.Error("not ok")
+	}
+
+	if s.String() != "15 5 4 3 7 10" {
+		t.Error(s.String())
+	}
+
+	if s.Size() != 6 {
+		t.Error("Size error, is", s.Size())
+	}
+
+	s.Clear()
+	if !s.Empty() {
+		t.Error("Size should be Empty, is Clean.")
+	}
+
+}
+
+func TestIndex(t *testing.T) {
+	s := New()
+
+	l := []int{10, 7, 3, 4, 5, 15}
+	for _, v := range l {
+		s.Push(v)
+	}
+
+	if v, isfound := s.Index(0); isfound {
 		if v != 15 {
 			t.Error("15 is not equal to 15")
 		}
@@ -86,7 +128,7 @@ func TestGet(t *testing.T) {
 	}
 
 	for i, tv := range l {
-		if v, isfound := s.Get(len(l) - 1 - i); isfound {
+		if v, isfound := s.Index(len(l) - 1 - i); isfound {
 			if v != tv {
 				t.Error(v, "is not equal to", tv)
 			}
@@ -100,7 +142,7 @@ func TestGet(t *testing.T) {
 	l = l[0 : len(l)-1]
 	for i, tv := range l {
 		index := len(l) - 1 - i
-		if v, isfound := s.Get(index); isfound {
+		if v, isfound := s.Index(index); isfound {
 			if v != tv {
 				t.Error(v, "is not equal to", tv)
 			}
@@ -110,7 +152,7 @@ func TestGet(t *testing.T) {
 	}
 }
 
-// func BenchmarkGet(b *testing.B) {
+// func BenchmarkIndex(b *testing.B) {
 // 	s := New()
 // 	b.N = 20000000
 
@@ -123,7 +165,7 @@ func TestGet(t *testing.T) {
 // 	b.StartTimer()
 
 // 	for i := 0; i < b.N; i++ {
-// 		s.Get(i)
+// 		s.Index(i)
 // 	}
 // }
 

stack/liststack/stack.go

@@ -0,0 +1,102 @@
+package lastack
+
+import (
+	"github.com/474420502/focus/stack"
+	"github.com/davecgh/go-spew/spew"
+)
+
+type Node struct {
+	value interface{}
+	down  *Node
+}
+
+type Stack struct {
+	top  *Node
+	size uint
+}
+
+func assertImplementation() {
+	var _ stack.IStack = (*Stack)(nil)
+}
+
+
+func New() *Stack {
+	s := &Stack{}
+	s.size = 0
+	return s
+}
+
+func (as *Stack) Clear() {
+	as.size = 0
+	as.top = nil
+}
+
+func (as *Stack) Empty() bool {
+	return as.size == 0
+}
+
+func (as *Stack) Size() uint {
+	return as.size
+}
+
+// String 从左到右 左边第一个表示Top 如链表 a(top)->b->c
+func (as *Stack) String() string {
+	content := ""
+	cur := as.top
+	for ; cur != nil; cur = cur.down {
+		content += spew.Sprint(cur.value) + " "
+	}
+
+	if len(content) > 0 {
+		content = content[0 : len(content)-1]
+	} else {
+		content = ""
+	}
+
+	return content
+}
+
+func (as *Stack) Values() []interface{} {
+
+	if as.size == 0 {
+		return nil
+	}
+
+	result := make([]interface{}, as.size, as.size)
+
+	cur := as.top
+	n := 0
+	for ; cur != nil; cur = cur.down {
+		result[n] = cur.value
+		n++
+	}
+
+	return result
+}
+
+func (as *Stack) Push(v interface{}) {
+	nv := &Node{value: v}
+	nv.down = as.top
+	as.top = nv
+	as.size++
+}
+
+func (as *Stack) Pop() (interface{}, bool) {
+	if as.size == 0 {
+		return nil, false
+	}
+
+	as.size--
+
+	result := as.top
+	as.top = as.top.down
+	result.down = nil
+	return result.value, true
+}
+
+func (as *Stack) Peek() (interface{}, bool) {
+	if as.size == 0 {
+		return nil, false
+	}
+	return as.top.value, true
+}

stack/stack.go

@@ -1,96 +1,20 @@
-package lastack
+package stack
 
-import (
+type IStack interface {
-	"github.com/davecgh/go-spew/spew"
+	Clear()
-)
 
-type Node struct {
+	Empty() bool
-	value interface{}
+
-	down  *Node
+	Size() uint
-}
+
-
+	// String 从左到右 左边第一个表示Top 如链表 a(top)->b->c
-type Stack struct {
+	String() string
-	top  *Node
+
-	size int
+	Values() []interface{}
-}
+
-
+	Push(v interface{})
-func New() *Stack {
+
-	s := &Stack{}
+	Pop() (interface{}, bool)
-	s.size = 0
+
-	return s
+	Peek() (interface{}, bool)
-}
-
-func (as *Stack) Clear() {
-	as.size = 0
-	as.top = nil
-}
-
-func (as *Stack) Empty() bool {
-	return as.size == 0
-}
-
-func (as *Stack) Size() int {
-	return as.size
-}
-
-// String 从左到右 左边第一个表示Top 如链表 a(top)->b->c
-func (as *Stack) String() string {
-	content := ""
-	cur := as.top
-	for ; cur != nil; cur = cur.down {
-		content += spew.Sprint(cur.value) + " "
-	}
-
-	if len(content) > 0 {
-		content = content[0 : len(content)-1]
-	} else {
-		content = ""
-	}
-
-	return content
-}
-
-func (as *Stack) Values() []interface{} {
-
-	if as.size == 0 {
-		return nil
-	}
-
-	result := make([]interface{}, as.size, as.size)
-
-	cur := as.top
-	n := 0
-	for ; cur != nil; cur = cur.down {
-		result[n] = cur.value
-		n++
-	}
-
-	return result
-}
-
-func (as *Stack) Push(v interface{}) {
-	nv := &Node{value: v}
-	nv.down = as.top
-	as.top = nv
-	as.size++
-}
-
-func (as *Stack) Pop() (interface{}, bool) {
-	if as.size <= 0 {
-		return nil, false
-	}
-
-	as.size--
-
-	result := as.top
-	as.top = as.top.down
-	result.down = nil
-	return result.value, true
-}
-
-func (as *Stack) Peek() (interface{}, bool) {
-	if as.size <= 0 {
-		return nil, false
-	}
-	return as.top.value, true
 }

tree/avl/iterator.go

@@ -1,7 +1,7 @@
 package avl
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

tree/avldup/iterator.go

@@ -1,7 +1,7 @@
 package avldup
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

tree/avlkey/iterator.go

@@ -1,7 +1,7 @@
 package avlkey
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

tree/avlkeydup/iterator.go

@@ -1,7 +1,7 @@
 package avlkeydup
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

tree/vbt/iterator.go

@@ -1,7 +1,7 @@
 package vbt
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {

tree/vbtkey/iterator.go

@@ -1,7 +1,7 @@
 package vbtkey
 
 import (
-	"github.com/474420502/focus/lastack"
+	"github.com/474420502/focus/stack/listarraystack"
 )
 
 type Iterator struct {