From 6679cba338b17b008b5e0d7c0f276aa7653d5c7e Mon Sep 17 00:00:00 2001
From: eson <474420502@qq.com>
Date: Tue, 20 Aug 2019 01:39:14 +0800
Subject: [PATCH] =?UTF-8?q?TODO:=20Test=20Prefix=20=E6=89=80=E6=9C=89Index?=
 =?UTF-8?q?2word=E5=87=BD=E6=95=B0=E6=98=AF=E5=90=A6=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tree/tried/tried.go       | 41 +++++++++++++++++++-----
 tree/tried/tried_index.go | 10 +++---
 tree/tried/tried_test.go  | 66 +++++++++++++++++++++++++++++++++++----
 3 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/tree/tried/tried.go b/tree/tried/tried.go
index abfe0b8..d0052de 100644
--- a/tree/tried/tried.go
+++ b/tree/tried/tried.go
@@ -1,5 +1,7 @@
 package tried
 
+import "github.com/davecgh/go-spew/spew"
+
 // func (ts TriedString) WordIndex(idx uint) uint {
 // 	w := ts[idx]
 // 	if w >= 'a' && w <= 'z' {
@@ -90,6 +92,10 @@ func (tried *Tried) Has(words string) bool {
 	return tried.Get(words) != nil
 }
 
+func (tried *Tried) HasPrefix(words string) bool {
+	return tried.Get(words) != nil
+}
+
 func (tried *Tried) Traversal(every func(cidx uint, value interface{}) bool) {
 
 	var traversal func(*Node)
@@ -112,10 +118,31 @@ func (tried *Tried) Traversal(every func(cidx uint, value interface{}) bool) {
 	traversal(root)
 }
 
-// func (tried *Tried) String() []string {
-// 	var result []string
-// 	tried.Traversal(func(cidx uint, value interface{}) bool {
-// 		result = append(result, spew.)
-// 	})
-// 	return result
-// }
+func (tried *Tried) WordsArray() []string {
+	var result []string
+
+	var traversal func([]rune, *Node)
+	traversal = func(prefix []rune, cur *Node) {
+
+		for i, n := range cur.data {
+			if n != nil {
+				prefix = append(prefix, rune(tried.wiStore.Index2Byte(uint(i))))
+				traversal(prefix, n)
+				if n.value != nil {
+					result = append(result, string(prefix))
+				}
+			}
+		}
+
+	}
+
+	if tried.root != nil {
+		traversal([]rune{}, tried.root)
+	}
+
+	return result
+}
+
+func (tried *Tried) String() string {
+	return spew.Sprint(tried.WordsArray())
+}
diff --git a/tree/tried/tried_index.go b/tree/tried/tried_index.go
index 00c2a80..62a489a 100644
--- a/tree/tried/tried_index.go
+++ b/tree/tried/tried_index.go
@@ -67,7 +67,7 @@ func indexWordDigital(w uint) byte {
 //
 func wordIndexUpperLower(w byte) uint {
 	iw := uint(w)
-	if iw > 'a' {
+	if iw >= 'a' {
 		return iw - 'a'
 	}
 	return iw - 'A' + 26
@@ -84,7 +84,7 @@ func indexWordUpperLower(w uint) byte {
 //
 func wordIndexLowerDigital(w byte) uint {
 	iw := uint(w)
-	if iw > 'a' {
+	if iw >= 'a' {
 		return iw - 'a'
 	}
 	return iw - '0' + 26
@@ -100,7 +100,7 @@ func indexWordLowerDigital(w uint) byte {
 //
 func wordIndexUpperDigital(w byte) uint {
 	iw := uint(w)
-	if iw > 'A' {
+	if iw >= 'A' {
 		return iw - 'A'
 	}
 	return iw - '0' + 26
@@ -116,9 +116,9 @@ func indexWordUpperDigital(w uint) byte {
 //
 func wordIndexUpperLowerDigital(w byte) uint {
 	iw := uint(w)
-	if iw > 'a' {
+	if iw >= 'a' {
 		return iw - 'a'
-	} else if iw > 'A' {
+	} else if iw >= 'A' {
 		return iw - 'A' + 26
 	}
 	return iw - '0' + 52
diff --git a/tree/tried/tried_test.go b/tree/tried/tried_test.go
index 422c18c..a9585de 100644
--- a/tree/tried/tried_test.go
+++ b/tree/tried/tried_test.go
@@ -10,12 +10,9 @@ import (
 )
 
 func TestTried_NewWith(t *testing.T) {
-	tried := NewWithWordType(WordIndex32to126)
-	words := "~ 23fd "
-	tried.Put(words)
-	if tried.Get(words) == nil {
-		t.Error("should be not nil")
-	}
+
+	var tried *Tried
+	var words string
 
 	tried = NewWithWordType(WordIndexLower)
 	words = "az"
@@ -37,6 +34,63 @@ func TestTried_NewWith(t *testing.T) {
 	if tried.Get(words) == nil {
 		t.Error("should be not nil")
 	}
+
+	tried = NewWithWordType(WordIndexUpperDigital)
+	words = "AZ021365546987"
+	tried.Put(words)
+	if tried.Get(words) == nil {
+		t.Error("should be not nil")
+	}
+
+	tried = NewWithWordType(WordIndexLowerDigital)
+	words = "azfdgyjmnbjhkpuizxasd021365546987"
+	tried.Put(words)
+	if tried.Get(words) == nil {
+		t.Error("should be not nil")
+	}
+
+	tried = NewWithWordType(WordIndexUpperLowerDigital)
+	words = "AZazsdfsd131209"
+	tried.Put(words)
+	if tried.Get(words) == nil {
+		t.Error("should be not nil")
+	}
+
+	tried = NewWithWordType(WordIndex256)
+	words = "21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! 09-阿萨德发生的官方说的对符合规定"
+	tried.Put(words)
+	if tried.Get(words) == nil {
+		t.Error("should be not nil")
+	}
+
+	tried = NewWithWordType(WordIndex32to126)
+	words = " 21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**!  "
+	tried.Put(words)
+	if tried.Get(words) == nil {
+		t.Error("should be not nil")
+	}
+}
+
+func TestTried_String(t *testing.T) {
+	var tried *Tried
+	var wordsCollection []string
+	var wordsList [][]string
+	var triedList []*Tried
+
+	triedList = append(triedList, NewWithWordType(WordIndexLower))
+	wordsList = append(wordsList, []string{"adazx", "assdfhgnvb", "ewqyiouyasdfmzvxz"})
+
+	for i := 0; i < len(triedList); i++ {
+		tried = triedList[i]
+		wordsCollection = wordsList[i]
+		for _, words := range wordsCollection {
+			tried.Put(words)
+			if tried.Get(words) == nil {
+				t.Error("should be not nil")
+			}
+		}
+		t.Error(tried.WordsArray())
+	}
 }
 
 func TestTried_PutAndGet1(t *testing.T) {