Merge pull request #2 from Kensuke-Mitsuzawa/devel

fix a bug which it can not keep index positon of each node when more …
Kensuke-Mitsuzawa · Feb 13, 2017 · c52624b · c52624b
2 parents 341b2a7 + a137e72
commit c52624b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 name='word2vec_wikification_py'
-version='0.13'
+version='0.14'
 description='A package to run wikification'
 author='Kensuke Mitsuzawa'
 author_email='kensuke.mit@gmail.com'

diff --git a/word2vec_wikification_py/models.py b/word2vec_wikification_py/models.py
@@ -4,6 +4,7 @@
 from itertools import product
 import pickle, json, csv, os, shutil
 import copy
+import itertools
 
 # this class is from https://code.activestate.com/recipes/576642/
 class PersistentDict(dict):
@@ -210,9 +211,15 @@ def __init__(self,
         self.index_tuple_route = self.__generate_edge_routes()
         self.seq_wiki_article_name = seq_wiki_article_name
         if not seq_wiki_article_name is None:
-            self.label2WikiArticleObj = {wiki_article_name: wiki_article_obj
-                                         for wiki_article_obj in self.seq_wiki_article_name
-                                         for wiki_article_name in wiki_article_obj.candidate_article_name}
+            ## It constructs dict of wiki-article-name <-> (index-in-list, wiki-article-object) ##
+            function_key = lambda tuple_wikilabel_wikiobj: tuple_wikilabel_wikiobj[0]
+            seq_tuple_wikilabel_wikiobj = [(wiki_article_name, wiki_obj_index, wiki_article_obj)
+                                           for wiki_obj_index, wiki_article_obj in enumerate(self.seq_wiki_article_name)
+                                           for wiki_article_name in wiki_article_obj.candidate_article_name]
+            self.label2WikiArticleObj = {}  # type: Dict[str,List[Tuple[int, WikipediaArticleObject]]]
+            for wiki_label_name, g_obj in itertools.groupby(sorted(seq_tuple_wikilabel_wikiobj, key=function_key), key=function_key):
+                self.label2WikiArticleObj[wiki_label_name] = [(tuple_wikilabel_wiki_obj[1], tuple_wikilabel_wiki_obj[2])
+                                                              for tuple_wikilabel_wiki_obj in g_obj]
         else:
             self.label2WikiArticleObj = None
 
@@ -288,9 +295,10 @@ def __generate_wiki_article_object_sequence(self, seq_label_name:List[str])->Lis
         """
         seq_wiki_article_obj = [None] * len(seq_label_name)
         for l_index, label in enumerate(seq_label_name):
-            wiki_article_obj = copy.deepcopy(self.label2WikiArticleObj[label])
-            wiki_article_obj.article_name = label
-            seq_wiki_article_obj[l_index] = wiki_article_obj
+            seq_tuple_index_wikiobj = self.label2WikiArticleObj[label]
+            wiki_article_obj_in_index = [tuple_index_wikiobj for tuple_index_wikiobj in seq_tuple_index_wikiobj if tuple_index_wikiobj[0]==l_index][0][1]  # type: WikipediaArticleObject
+            wiki_article_obj_in_index.article_name = label
+            seq_wiki_article_obj[l_index] = wiki_article_obj_in_index
 
         return list(filter(lambda element: True if not element is None else False, seq_wiki_article_obj))