iskm/wordfreq
1
0
Fork 0
mirror of https://github.com/rspeer/wordfreq.git synced 2024-12-25 10:15:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed default to minimum for word_frequency

Browse Source 
Former-commit-id: 9aa773aa2b
This commit is contained in:
Joshua Chin 2015-07-07 15:03:26 -04:00
parent 16494f1869
commit d88470df4e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test.py
View File

@ -46,7 +46,7 @@ def test_twitter():
def test_defaults(): def test_defaults():
eq_(word_frequency('esquivalience', 'en'), 0) eq_(word_frequency('esquivalience', 'en'), 0)
eq_(word_frequency('esquivalience', 'en', default=1e-6), 1e-6) eq_(word_frequency('esquivalience', 'en', minimum=1e-6), 1e-6)
def test_most_common_words(): def test_most_common_words():

8
wordfreq/__init__.py
View File

@ -243,7 +243,7 @@ def half_harmonic_mean(a, b):
@lru_cache(maxsize=CACHE_SIZE) @lru_cache(maxsize=CACHE_SIZE)
def word_frequency(word, lang, wordlist='combined', default=0.): def word_frequency(word, lang, wordlist='combined', minimum=0.):
""" """
Get the frequency of `word` in the language with code `lang`, from the Get the frequency of `word` in the language with code `lang`, from the
specified `wordlist`. The default wordlist is 'combined', built from specified `wordlist`. The default wordlist is 'combined', built from
@ -261,7 +261,7 @@ def word_frequency(word, lang, wordlist='combined', default=0.):
Words that we believe occur at least once per million tokens, based on Words that we believe occur at least once per million tokens, based on
the average of these lists, will appear in the word frequency list. the average of these lists, will appear in the word frequency list.
If you look up a word that's not in the list, you'll get the `default` If you look up a word that's not in the list, you'll get the `minimum`
value, which itself defaults to 0. value, which itself defaults to 0.
If a word decomposes into multiple tokens, we'll return a smoothed estimate If a word decomposes into multiple tokens, we'll return a smoothed estimate
@ -273,12 +273,12 @@ def word_frequency(word, lang, wordlist='combined', default=0.):
tokens = tokenize(word, lang) tokens = tokenize(word, lang)
if len(tokens) == 0: if len(tokens) == 0:
return default return minimum
for token in tokens: for token in tokens:
if token not in freqs: if token not in freqs:
# If any word is missing, just return the default value # If any word is missing, just return the default value
return default return minimum
value = freqs[token] value = freqs[token]
if combined_value is None: if combined_value is None:
combined_value = value combined_value = value