Skip to content

Commit

Permalink
add gse.New() error return support
Browse files Browse the repository at this point in the history
  • Loading branch information
vcaesar committed Sep 2, 2021
1 parent ad5f28d commit e803282
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import (
var (
text = "Hello world, Helloworld. Winter is coming! 你好世界."

new = gse.New("zh,testdata/test_dict3.txt", "alpha")
new, _ = gse.New("zh,testdata/test_dict3.txt", "alpha")

seg gse.Segmenter
posSeg pos.Segmenter
Expand Down
2 changes: 1 addition & 1 deletion README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var (
seg gse.Segmenter
posSeg pos.Segmenter

new = gse.New("zh,testdata/test_dict3.txt", "alpha")
new, _ = gse.New("zh,testdata/test_dict3.txt", "alpha")

text = "你好世界, Hello world, Helloworld."
)
Expand Down
4 changes: 2 additions & 2 deletions examples/dict/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
)

var (
text = "旧金山湾金门大桥"
new = gse.New("zh,../../testdata/test_dict.txt")
text = "旧金山湾金门大桥"
new, _ = gse.New("zh,../../testdata/test_dict.txt")

seg gse.Segmenter
)
Expand Down
3 changes: 2 additions & 1 deletion examples/en/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
)

func main() {
seg := gse.New("zh,../../testdata/test_dict3.txt", "alpha")
seg, err := gse.New("zh,../../testdata/test_dict3.txt", "alpha")
fmt.Println("new gse error: ", err)
// var seg gse.Segmenter
// seg.AlphaNum = true
// seg.LoadDict("zh, ../../testdata/test_dict3.txt")
Expand Down
9 changes: 4 additions & 5 deletions gse.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

const (
// Version get the gse version
Version = "v0.62.1.510, Green Lake!"
Version = "v0.69.1.593, Green Lake!"

// minTokenFrequency = 2 // 仅从字典文件中读取大于等于此频率的分词
)
Expand All @@ -44,14 +44,13 @@ type Prob struct {
}

// New return new gse segmenter
func New(files ...string) Segmenter {
var seg Segmenter
func New(files ...string) (seg Segmenter, err error) {
if len(files) > 1 && files[1] == "alpha" {
seg.AlphaNum = true
}
seg.LoadDict(files...)

return seg
err = seg.LoadDict(files...)
return
}

// Cut cuts a str into words using accurate mode.
Expand Down
7 changes: 5 additions & 2 deletions gse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ func TestStop(t *testing.T) {
}

func TestNum(t *testing.T) {
seg := New("./testdata/test_dict3.txt")
seg, err := New("./testdata/test_dict3.txt")
tt.Nil(t, err)

seg.Num = true
text := "t123test123 num123-1"
s := seg.Cut(text)
Expand All @@ -253,7 +255,8 @@ func TestNum(t *testing.T) {
}

func TestUrl(t *testing.T) {
seg := New("./testdata/test_dict3.txt")
seg, err := New("./testdata/test_dict3.txt")
tt.Nil(t, err)

s1 := seg.CutUrls("https://www.g.com/search?q=test%m11.42&ie=UTF-8")
tt.Equal(t, "https www g com search q test m 11 42 ie utf 8", s1)
Expand Down
4 changes: 2 additions & 2 deletions hmm/idf/idf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
)

var (
segs = gse.New()
text = "那里湖面总是澄清, 那里空气充满宁静"
segs, _ = gse.New()
text = "那里湖面总是澄清, 那里空气充满宁静"
)

func TestExtAndRank(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion segmenter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ func TestInAlphaNum(t *testing.T) {
//
// AlphaNum = true
// ToLower = true
seg := New("zh,./testdata/test_dict3.txt", "alpha")
seg, err := New("zh,./testdata/test_dict3.txt", "alpha")
tt.Nil(t, err)

freq, ok := seg.Find("hello")
tt.Equal(t, 20, freq)
Expand Down
2 changes: 1 addition & 1 deletion testdata/test_dict3.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
hi 32
hello 20
world 20
world 20 n

0 comments on commit e803282

Please sign in to comment.