fumiama/jieba
1
0
Fork 0
mirror of https://github.com/fumiama/jieba.git synced 2026-06-05 00:32:51 +08:00
Code Activity

small refactor according to go vet check results

Browse Source
This commit is contained in:
Wang Bin
2015-05-04 18:56:55 +08:00
parent cfed2de1cd
commit 87caff09cb
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
analyse/idf.go
View File

@@ -38,7 +38,7 @@ func (i *Idf) loadDictionary(fileName string) error {
return dictionary.LoadDictionary(i, fileName) return dictionary.LoadDictionary(i, fileName)
} }
func (i Idf) Frequency(key string) (float64, bool) { func (i *Idf) Frequency(key string) (float64, bool) {
i.RLock() i.RLock()
freq, ok := i.freqMap[key] freq, ok := i.freqMap[key]
i.RUnlock() i.RUnlock()

2
analyse/stopwords.go
View File

@@ -57,7 +57,7 @@ func NewStopWord() *StopWord {
return s return s
} }
func (s StopWord) IsStopWord(word string) bool { func (s *StopWord) IsStopWord(word string) bool {
s.RLock() s.RLock()
_, ok := s.stopWordMap[word] _, ok := s.stopWordMap[word]
s.RUnlock() s.RUnlock()

6
dictionary.go
View File

@@ -7,12 +7,14 @@ import (
"github.com/wangbin/jiebago/dictionary" "github.com/wangbin/jiebago/dictionary"
) )
// A Dictionary represents a thread-safe dictionary used for word segmentation.
type Dictionary struct { type Dictionary struct {
total, logTotal float64 total, logTotal float64
freqMap map[string]float64 freqMap map[string]float64
sync.RWMutex sync.RWMutex
} }
// Load loads all tokens from channel
func (d *Dictionary) Load(ch <-chan dictionary.Token) { func (d *Dictionary) Load(ch <-chan dictionary.Token) {
d.Lock() d.Lock()
for token := range ch { for token := range ch {
@@ -22,6 +24,7 @@ func (d *Dictionary) Load(ch <-chan dictionary.Token) {
d.updateLogTotal() d.updateLogTotal()
} }
// AddToken adds one token
func (d *Dictionary) AddToken(token dictionary.Token) { func (d *Dictionary) AddToken(token dictionary.Token) {
d.Lock() d.Lock()
d.addToken(token) d.addToken(token)
@@ -46,7 +49,8 @@ func (d *Dictionary) updateLogTotal() {
d.logTotal = math.Log(d.total) d.logTotal = math.Log(d.total)
} }
func (d Dictionary) Frequency(key string) (float64, bool) { // Frequency returns the frequency of give word, if not found, the second result is false
func (d *Dictionary) Frequency(key string) (float64, bool) {
d.RLock() d.RLock()
freq, ok := d.freqMap[key] freq, ok := d.freqMap[key]
d.RUnlock() d.RUnlock()

4
posseg/dictionary.go
View File

@@ -50,14 +50,14 @@ func (d *Dictionary) updateLogTotal() {
d.logTotal = math.Log(d.total) d.logTotal = math.Log(d.total)
} }
func (d Dictionary) Frequency(key string) (float64, bool) { func (d *Dictionary) Frequency(key string) (float64, bool) {
d.RLock() d.RLock()
freq, ok := d.freqMap[key] freq, ok := d.freqMap[key]
d.RUnlock() d.RUnlock()
return freq, ok return freq, ok
} }
func (d Dictionary) Pos(key string) (string, bool) { func (d *Dictionary) Pos(key string) (string, bool) {
d.RLock() d.RLock()
pos, ok := d.posMap[key] pos, ok := d.posMap[key]
d.RUnlock() d.RUnlock()