diff --git a/tree/tried/tried.go b/tree/tried/tried.go index d0052de..4b511bb 100644 --- a/tree/tried/tried.go +++ b/tree/tried/tried.go @@ -126,10 +126,10 @@ func (tried *Tried) WordsArray() []string { for i, n := range cur.data { if n != nil { - prefix = append(prefix, rune(tried.wiStore.Index2Byte(uint(i)))) - traversal(prefix, n) + nextPrefix := append(prefix, rune(tried.wiStore.Index2Byte(uint(i)))) + traversal(nextPrefix, n) if n.value != nil { - result = append(result, string(prefix)) + result = append(result, string(nextPrefix)) } } } diff --git a/tree/tried/tried_index.go b/tree/tried/tried_index.go index 62a489a..657773a 100644 --- a/tree/tried/tried_index.go +++ b/tree/tried/tried_index.go @@ -76,7 +76,7 @@ func wordIndexUpperLower(w byte) uint { func indexWordUpperLower(w uint) byte { if w >= 26 { - return byte(w) + 'A' + return byte(w) - 26 + 'A' } return byte(w) + 'a' } @@ -92,7 +92,7 @@ func wordIndexLowerDigital(w byte) uint { func indexWordLowerDigital(w uint) byte { if w >= 26 { - return byte(w) + '0' + return byte(w) - 26 + '0' } return byte(w) + 'a' } @@ -108,9 +108,9 @@ func wordIndexUpperDigital(w byte) uint { func indexWordUpperDigital(w uint) byte { if w >= 26 { - return byte(w) + '0' + return byte(w) - 26 + '0' } - return byte(w) + 'a' + return byte(w) + 'A' } // @@ -126,14 +126,14 @@ func wordIndexUpperLowerDigital(w byte) uint { func indexWordUpperLowerDigital(w uint) byte { if w >= 52 { - return byte(w) + '0' + return byte(w) - 52 + '0' } else if w >= 26 { - return byte(w) + 'A' + return byte(w) - 26 + 'A' } return byte(w) + 'a' } -// wordIndex256 all byte +// wordIndex256 all byte 不支持中文 func wordIndex256(w byte) uint { return uint(w) } diff --git a/tree/tried/tried_test.go b/tree/tried/tried_test.go index a9585de..5ec2f7e 100644 --- a/tree/tried/tried_test.go +++ b/tree/tried/tried_test.go @@ -4,70 +4,55 @@ import ( "bytes" "encoding/gob" "os" + "sort" "testing" + "github.com/davecgh/go-spew/spew" + "github.com/Pallinder/go-randomdata" ) func TestTried_NewWith(t *testing.T) { - var tried *Tried - var words string + var wordsCollection []string + var wordsList [][]string + var triedList []*Tried - tried = NewWithWordType(WordIndexLower) - words = "az" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexLower)) + wordsList = append(wordsList, []string{"adazx", "assdfhgnvb", "ewqyiouyasdfmzvxz"}) - tried = NewWithWordType(WordIndexUpper) - words = "AZ" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexUpper)) + wordsList = append(wordsList, []string{"ADFSZ", "DEFASEWRQWER", "GFHJERQWREWTNBVFGFH"}) - tried = NewWithWordType(WordIndexUpperLower) - words = "AZazsdfsd" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexUpperLower)) + wordsList = append(wordsList, []string{"adazxAZDSAFASZRETHGFTUIPK", "assdfhgDSFGnvb", "yaXZLMPOIQsdGHFfmFBzvxz"}) - tried = NewWithWordType(WordIndexUpperDigital) - words = "AZ021365546987" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexUpperDigital)) + wordsList = append(wordsList, []string{"AZ3428934470193", "ZPQPDEK09876543629812", "AZEWIRU0192456FDEWR9032"}) - tried = NewWithWordType(WordIndexLowerDigital) - words = "azfdgyjmnbjhkpuizxasd021365546987" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexLowerDigital)) + wordsList = append(wordsList, []string{"az3428934470193", "zpqwe0987654362sf9812", "az21301az09azdstr540"}) - tried = NewWithWordType(WordIndexUpperLowerDigital) - words = "AZazsdfsd131209" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndexUpperLowerDigital)) + wordsList = append(wordsList, []string{"azAZ09", "aRGFDSFDSzAasdZ06789", "A28374JHFudfsu09qwzzdsw874FDSAZfer"}) - tried = NewWithWordType(WordIndex256) - words = "21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! 09-阿萨德发生的官方说的对符合规定" - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") - } + triedList = append(triedList, NewWithWordType(WordIndex256)) + wordsList = append(wordsList, []string{"21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! 09-阿萨德发生的官方说的对符合规定", "符号!@$*#))(#*", "╜╝╞╟╠╡╢╣╤╥╦╧╨╩╪╫╬╭╮╯╰╱╲╳▁▂▃▄▅▆▇█ ▉ ▊▋▌▍▎▏"}) - tried = NewWithWordType(WordIndex32to126) - words = " 21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! " - tried.Put(words) - if tried.Get(words) == nil { - t.Error("should be not nil") + triedList = append(triedList, NewWithWordType(WordIndex32to126)) + wordsList = append(wordsList, []string{" 21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! ", "AZaz09~ dys!@#$)(*^$#", "<>.,?/"}) + + 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 the type is ", tried.wiStore.Type) + } + } + // t.Error(tried.WordsArray()) } } @@ -80,16 +65,56 @@ func TestTried_String(t *testing.T) { triedList = append(triedList, NewWithWordType(WordIndexLower)) wordsList = append(wordsList, []string{"adazx", "assdfhgnvb", "ewqyiouyasdfmzvxz"}) + triedList = append(triedList, NewWithWordType(WordIndexUpper)) + wordsList = append(wordsList, []string{"ADFSZ", "DEFASEWRQWER", "GFHJERQWREWTNBVFGFH"}) + + triedList = append(triedList, NewWithWordType(WordIndexUpperLower)) + wordsList = append(wordsList, []string{"adazxAZDSAFASZRETHGFTUIPK", "assdfhgDSFGnvb", "yaXZLMPOIQsdGHFfmFBzvxz"}) + + triedList = append(triedList, NewWithWordType(WordIndexUpperDigital)) + wordsList = append(wordsList, []string{"AZ3428934470193", "ZPQPDEK09876543629812", "AZEWIRU0192456FDEWR9032"}) + + triedList = append(triedList, NewWithWordType(WordIndexLowerDigital)) + wordsList = append(wordsList, []string{"az3428934470193", "zpqwe0987654362sf9812", "az21301az09azdstr540"}) + + triedList = append(triedList, NewWithWordType(WordIndexUpperLowerDigital)) + wordsList = append(wordsList, []string{"azAZ09", "aRGFDSFDSzAasdZ06789", "A28374JHFudfsu09qwzzdsw874FDSAZfer"}) + + triedList = append(triedList, NewWithWordType(WordIndex256)) + wordsList = append(wordsList, []string{"21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**!\x01 09-213", "!@$*#))(#*", `\/213dsfsdf`}) + + triedList = append(triedList, NewWithWordType(WordIndex32to126)) + wordsList = append(wordsList, []string{" 21`3tcdbxcfhyop8901zc[]\\'/?()#$%^&**! ", "AZaz09~ dys!@#$)(*^$#", "<>.,?/"}) + 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("should be not nil the type is ", tried.wiStore.Type) } } - t.Error(tried.WordsArray()) + sort.Slice(wordsCollection, func(i, j int) bool { + if wordsCollection[i] < wordsCollection[j] { + return true + } + return false + }) + + resultArray := tried.WordsArray() + sort.Slice(resultArray, func(i, j int) bool { + if resultArray[i] < resultArray[j] { + return true + } + return false + }) + result1 := spew.Sprint(resultArray) + result2 := spew.Sprint(wordsCollection) + if result1 != result2 { + t.Error(result1, " != ", result2) + } + // t.Error(tried.WordsArray()) } }