eson/focus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

再次修改TypeString 对比

Browse Source
This commit is contained in:
huangsimin 2019-08-19 15:24:22 +08:00
parent 874acd6243
commit 86253b5bfb
2 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tree/tried/tried.go
View File

@ -7,16 +7,20 @@ func (ts TriedString) Size() uint {
} }
func (ts TriedString) WordIndex(idx uint) uint { func (ts TriedString) WordIndex(idx uint) uint {
w := ts[idx] return uint(ts[idx]) - 'a'
if w >= 'a' && w <= 'z' {
return uint(w) - 'a'
} else if w >= 'A' && w <= 'Z' {
return uint(w) - 'A' + 26
} else {
return uint(w) - '0' + 52
}
} }
// func (ts TriedString) WordIndex(idx uint) uint {
// w := ts[idx]
// if w >= 'a' && w <= 'z' {
// return uint(w) - 'a'
// } else if w >= 'A' && w <= 'Z' {
// return uint(w) - 'A' + 26
// } else {
// return uint(w) - '0' + 52
// }
// }
type ObjectIndex interface { type ObjectIndex interface {
WordIndex(idx uint) uint WordIndex(idx uint) uint
Size() uint Size() uint
@ -40,20 +44,14 @@ func New() *Tried {
} }
func (tried *Tried) wordIndex(w byte) uint { func (tried *Tried) wordIndex(w byte) uint {
if w >= 'a' && w <= 'z' { return uint(w) - 'a'
return uint(w) - 'a'
} else if w >= 'A' && w <= 'Z' {
return uint(w) - 'A' + 26
} else {
return uint(w) - '0' + 52
}
} }
func (tried *Tried) Put(words string, values ...interface{}) { func (tried *Tried) Put(words ObjectIndex, values ...interface{}) {
cur := tried.root cur := tried.root
var n *Node var n *Node
for i := 0; i < len(words); i++ { for i := uint(0); i < words.Size(); i++ {
w := tried.wordIndex(words[i]) w := words.WordIndex(i)
if cur.data == nil { if cur.data == nil {
cur.data = make([]*Node, tried.datasize) cur.data = make([]*Node, tried.datasize)
@ -80,11 +78,11 @@ func (tried *Tried) Put(words string, values ...interface{}) {
} }
func (tried *Tried) Get(words string) interface{} { func (tried *Tried) Get(words ObjectIndex) interface{} {
cur := tried.root cur := tried.root
var n *Node var n *Node
for i := 0; i < len(words); i++ { for i := uint(0); i < words.Size(); i++ {
w := tried.wordIndex(words[i]) //TODO: 升级Index 函数 w := words.WordIndex(i) //TODO: 升级Index 函数
if n = cur.data[w]; n == nil { if n = cur.data[w]; n == nil {
return nil return nil
} }
@ -93,7 +91,7 @@ func (tried *Tried) Get(words string) interface{} {
return n.value return n.value
} }
func (tried *Tried) Has(words string) bool { func (tried *Tried) Has(words ObjectIndex) bool {
return tried.Get(words) != nil return tried.Get(words) != nil
} }

130
tree/tried/tried_test.go
View File

@ -6,80 +6,85 @@ import (
"github.com/Pallinder/go-randomdata" "github.com/Pallinder/go-randomdata"
) )
func TestTried_PutAndGet1(t *testing.T) { // func TestTried_PutAndGet1(t *testing.T) {
tried := New() // tried := New()
tried.Put(("asdf")) // tried.Put(("asdf"))
tried.Put(("hehe"), "hehe") // tried.Put(("hehe"), "hehe")
tried.Put(("xixi"), 3) // tried.Put(("xixi"), 3)
var result interface{} // var result interface{}
result = tried.Get("asdf") // result = tried.Get("asdf")
if result != tried { // if result != tried {
t.Error("result should be 3") // t.Error("result should be 3")
} // }
result = tried.Get("xixi") // result = tried.Get("xixi")
if result != 3 { // if result != 3 {
t.Error("result should be 3") // t.Error("result should be 3")
} // }
result = tried.Get("hehe") // result = tried.Get("hehe")
if result != "hehe" { // if result != "hehe" {
t.Error("result should be hehe") // t.Error("result should be hehe")
} // }
result = tried.Get("haha") // result = tried.Get("haha")
if result != nil { // if result != nil {
t.Error("result should be nil") // t.Error("result should be nil")
} // }
result = tried.Get("b") // result = tried.Get("b")
if result != nil { // if result != nil {
t.Error("result should be nil") // t.Error("result should be nil")
} // }
} // }
func TestTried_Traversal(t *testing.T) { // func TestTried_Traversal(t *testing.T) {
tried := New() // tried := New()
tried.Put("asdf") // tried.Put("asdf")
tried.Put(("abdf"), "ab") // tried.Put(("abdf"), "ab")
tried.Put(("hehe"), "hehe") // tried.Put(("hehe"), "hehe")
tried.Put(("xixi"), 3) // tried.Put(("xixi"), 3)
var result []interface{} // var result []interface{}
tried.Traversal(func(idx uint, v interface{}) bool { // tried.Traversal(func(idx uint, v interface{}) bool {
// t.Error(idx, v) // // t.Error(idx, v)
result = append(result, v) // result = append(result, v)
return true // return true
}) // })
if result[0] != "ab" { // if result[0] != "ab" {
t.Error(result[0]) // t.Error(result[0])
} // }
if result[1] != tried { // if result[1] != tried {
t.Error(result[1]) // t.Error(result[1])
} // }
if result[2] != "hehe" { // if result[2] != "hehe" {
t.Error(result[2]) // t.Error(result[2])
} // }
if result[3] != 3 { // if result[3] != 3 {
t.Error(result[3]) // t.Error(result[3])
} // }
} // }
func BenchmarkTried_Put(b *testing.B) { func BenchmarkTried_Put(b *testing.B) {
var data []string var data []TriedString
b.N = 100000 b.N = 1000000
count := 50 count := 10
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
data = append(data, (randomdata.RandStringRunes(10) + randomdata.RandStringRunes(4))) var content []rune
for c := 0; c < randomdata.Number(5, 15); c++ {
char := randomdata.Number(0, 26) + 'a'
content = append(content, rune(byte(char)))
}
data = append(data, TriedString(string(content)))
} }
b.ResetTimer() b.ResetTimer()
@ -94,12 +99,17 @@ func BenchmarkTried_Put(b *testing.B) {
func BenchmarkTried_Get(b *testing.B) { func BenchmarkTried_Get(b *testing.B) {
var data []string var data []TriedString
b.N = 100000 b.N = 1000000
count := 50 count := 10
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
data = append(data, (randomdata.RandStringRunes(10) + randomdata.RandStringRunes(4))) var content []rune
for c := 0; c < randomdata.Number(5, 15); c++ {
char := randomdata.Number(0, 26) + 'a'
content = append(content, rune(byte(char)))
}
data = append(data, TriedString(content))
} }
b.N = b.N * count b.N = b.N * count