summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--search/bst.go4
-rw-r--r--search/elementary.go4
-rw-r--r--search/search_test.go26
-rw-r--r--search/set.go6
4 files changed, 20 insertions, 20 deletions
diff --git a/search/bst.go b/search/bst.go
index 0eecb9e..b1d12bc 100644
--- a/search/bst.go
+++ b/search/bst.go
@@ -1,4 +1,4 @@
-package set
+package search
import "fmt"
@@ -44,7 +44,7 @@ func (t *BST) Empty() bool {
return t.root == nil
}
-func (t *BST) Set(key, val int) {
+func (t *BST) Put(key, val int) {
if t.Empty() {
t.root = &node{key, val, nil, nil}
return
diff --git a/search/elementary.go b/search/elementary.go
index a9d367e..b522cd0 100644
--- a/search/elementary.go
+++ b/search/elementary.go
@@ -1,4 +1,4 @@
-package set
+package search
type ElementaryElem struct {
key int
@@ -18,7 +18,7 @@ func (s *Elementary) Empty() bool {
return s.root == nil
}
-func (s *Elementary) Set(key int, val int) {
+func (s *Elementary) Put(key int, val int) {
if s.Empty() {
s.root = &ElementaryElem{key, val, nil}
return
diff --git a/search/search_test.go b/search/search_test.go
index 098947d..bf1d1b5 100644
--- a/search/search_test.go
+++ b/search/search_test.go
@@ -1,4 +1,4 @@
-package set
+package search
import (
"fmt"
@@ -27,7 +27,7 @@ func TestBST(t *testing.T) {
}
}
-func test(s Set, l int, t *testing.T) {
+func test(s Put, l int, t *testing.T) {
keys := ds.NewRandomArrayList(l, l)
randoms := ds.NewRandomArrayList(l, -1)
mapping := make(map[int]int, l)
@@ -63,17 +63,17 @@ func test(s Set, l int, t *testing.T) {
testGet := func(key int) int { return get(key, false) }
testDel := func(key int) int { return get(key, true) }
- testSet := func(key, val int) {
- s.Set(key, val)
+ testPut := func(key, val int) {
+ s.Put(key, val)
mapping[key] = val
- //t.Log("Set", key, val)
+ //t.Log("Put", key, val)
testGet(key)
}
- t.Log("Set random key-values", l)
+ t.Log("Put random key-values", l)
var prevKey int
for _, key := range sort.Shuffle(keys) {
- testSet(key, randoms[key])
+ testPut(key, randoms[key])
testGet(prevKey)
prevKey = key
}
@@ -88,9 +88,9 @@ func test(s Set, l int, t *testing.T) {
}
}
-func TestBalancedBST(t *testing.T) {
+func TestRedBlackBST(t *testing.T) {
for i := minLength; i <= maxLength; i *= factor {
- test(NewBalancedBST(), i, t)
+ test(NewRedBlackBST(), i, t)
}
}
@@ -108,20 +108,20 @@ func BenchmarkBST(t *testing.B) {
}
}
-func BenchmarkBalancedBST(t *testing.B) {
- s := NewBalancedBST()
+func BenchmarkRedBlackBST(t *testing.B) {
+ s := NewRedBlackBST()
for i := minLength; i <= maxLength; i *= factor {
benchmark(s, i, t)
}
}
-func benchmark(s Set, l int, b *testing.B) {
+func benchmark(s Put, l int, b *testing.B) {
list := ds.NewRandomArrayList(l, -1)
b.Run(fmt.Sprintf("random(%d)", l), func(b *testing.B) {
b.ResetTimer()
for i, a := range list {
- s.Set(a, i)
+ s.Put(a, i)
}
for _, a := range list {
benchResult, _ = s.Get(a)
diff --git a/search/set.go b/search/set.go
index 29bfad7..17024ea 100644
--- a/search/set.go
+++ b/search/set.go
@@ -1,4 +1,4 @@
-package set
+package search
import "fmt"
@@ -7,9 +7,9 @@ var (
NotImplemented = fmt.Errorf("method not implemented")
)
-type Set interface {
+type Put interface {
Empty() bool
- Set(key int, val int)
+ Put(key int, val int)
Get(key int) (int, error)
Del(key int) (int, error)
}