Fixed chatopera#51 return editor distance with empty vectors

hailiang-wang · hailiang-wang · commit a9e86a4f3bb9 · 2018-03-09T09:32:35.000+08:00
diff --git a/VALUATION.md b/VALUATION.md
@@ -1,4 +1,4 @@
-# synonyms 分数评测 [(v3.3.7)](https://pypi.python.org/pypi/synonyms/3.3.7)
+# synonyms 分数评测 [(v3.3.9)](https://pypi.python.org/pypi/synonyms/3.3.9)
 | 词1 |  词2 |   synonyms  |  人工评定 |
 | --- | --- | --- | --- |
 | 轿车 | 汽车 | 1.0  |  0.98 |
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='synonyms',
-    version='3.3.8',
+    version='3.3.9',
     description='Chinese Synonyms for Natural Language Processing and Understanding',
     long_description=LONGDOC,
     author='Hai Liang Wang, Hu Ying Xi',
diff --git a/synonyms/__init__.py b/synonyms/__init__.py
@@ -1,5 +1,15 @@
-__all__ = ["seg", "nearby", "compare", "display", "KeyedVectors", "__version__"]
+__all__ = ["seg",
+    "nearby", 
+    "compare", 
+    "display", 
+    "KeyedVectors", 
+    "any2utf8",
+    "sigmoid",
+    "cosine",
+    "any2unicode",
+    "__version__"]
 
-from synonyms.word2vec import *
-from synonyms.synonyms import *
-from synonyms.synonyms import __version__
+from .word2vec import *
+from .synonyms import *
+import jieba
+from .synonyms import __version__
diff --git a/synonyms/synonyms.py b/synonyms/synonyms.py
@@ -20,7 +20,7 @@
 __copyright__ = "Copyright (c) 2017 . All Rights Reserved"
 __author__ = "Hu Ying Xi<>, Hai Liang Wang<hailiang.hl.wang@gmail.com>"
 __date__ = "2017-09-27"
-__version__ = "3.3.8"
+__version__ = "3.3.9"
 
 import os
 import sys
@@ -48,13 +48,13 @@
 import gzip
 import shutil
 from absl import logging
-from synonyms.word2vec import KeyedVectors
-from synonyms.utils import any2utf8
-from synonyms.utils import any2unicode
-from synonyms.utils import sigmoid
-from synonyms.utils import cosine
-from synonyms import jieba
-from synonyms.jieba import posseg as _tokenizer
+from .word2vec import KeyedVectors
+from .utils import any2utf8
+from .utils import any2unicode
+from .utils import sigmoid
+from .utils import cosine
+import jieba
+from .jieba import posseg as _tokenizer
 
 '''
 globals
@@ -226,7 +226,10 @@ def _similarity_distance(s1, s2):
     '''
     compute similarity with distance measurement
     '''
-    g = cosine(_flat_sum_array(_get_wv(s1)), _flat_sum_array(_get_wv(s2)))
+    g = 0.0
+    try:
+        g = cosine(_flat_sum_array(_get_wv(s1)), _flat_sum_array(_get_wv(s2)))
+    except: pass
     u = _nearby_levenshtein_distance(s1, s2)
     # print("g: %s, u: %s" % (g, u))
     if u >= 0.99:
@@ -240,7 +243,7 @@ def _similarity_distance(s1, s2):
     elif u > 0.2:
         r = _similarity_smooth(g, 0.5, u, 0.1)
     else:
-        r = g
+        r = _similarity_smooth(g, 1, u, 0)
 
     if r < 0: r = abs(r)
     r = min(r, 1.0)
diff --git a/synonyms/word2vec.py b/synonyms/word2vec.py
@@ -30,7 +30,7 @@
 
 from absl import logging
 
-import synonyms.utils as utils
+import utils
 from numpy import dot, zeros, dtype, float32 as REAL,\
     double, array, vstack, fromstring, sqrt, newaxis,\
     ndarray, sum as np_sum, prod, ascontiguousarray,\

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# synonyms 分数评测 [(v3.3.7)](https://pypi.python.org/pypi/synonyms/3.3.7)`
	`1`	`+# synonyms 分数评测 [(v3.3.9)](https://pypi.python.org/pypi/synonyms/3.3.9)`
`2`	`2`	`\| 词1 \| 词2 \| synonyms \| 人工评定 \|`
`3`	`3`	`\| --- \| --- \| --- \| --- \|`
`4`	`4`	`\| 轿车 \| 汽车 \| 1.0 \| 0.98 \|`