Merge pull request #31 from RamanjaneyuluIdavalapati/master

service import place changed in command

Author: Ram Idavalapati

wordvecspace/command.py

@@ -5,7 +5,6 @@
 from .convert import GW2VectoWordVecSpaceFile
 from .mem import WordVecSpaceMem
 from .annoy import WordVecSpaceAnnoy
-from .server import WordVecSpaceServer
 from .exception import UnknownType
 
 class WordVecSpaceCommand(BaseScript):
@@ -60,6 +59,14 @@ def interact(self):
             raise UnknownType(self.args.type)
 
     def runserver(self):
+    # Installing service feature is optional.
+    # Service feature depends on kwikapi.
+
+    # We imported here because it should not distrub
+    # interact fuctionality even though kwikapi is not installed.
+
+        from .server import WordVecSpaceServer
+
         if self.args.type == 'mem':
             server = WordVecSpaceServer(self.args.type,
                     self.args.input_file,

wordvecspace/mem.py

@@ -384,9 +384,8 @@ def get_distances(self, row_words_or_indices, col_words_or_indices=None, metric=
         >>> check_equal(res, np.array([[  0.381, 0.,  0.9561]], dtype=np.float32), decimal=4)
         >>> res = wv.get_distances("for", ["to", "for", "inidia"])
         >>> check_equal(res, np.array([[  0.381, 0.,  1.]], dtype=np.float32), decimal=4)
-        >>> print(wv.get_distances(["india", "for"], ["to", "for", "usa"]))
-        [[ 1.0685  0.9561  0.3251]
-         [ 0.381   0.      1.4781]]
+        >>> res = wv.get_distances(["india", "for"], ["to", "for", "usa"])
+        >>> check_equal(res, np.array([[ 1.0685,  0.9561,  0.3251], [ 0.381,   0.,      1.4781]], dtype=np.float32), decimal=1)
         >>> print(wv.get_distances(["india", "usa"]))
         [[ 1.3853  0.4129  0.3149 ...,  1.1231  1.4595  0.7912]
          [ 1.3742  0.9549  1.0354 ...,  0.5556  1.0847  1.0832]]