From 73ff152f5a62caf2220238d96c4bac4033da07fc Mon Sep 17 00:00:00 2001 From: Christophe Van Gysel Date: Mon, 23 Jan 2017 10:29:35 +0100 Subject: [PATCH 1/3] Fixes bug in LsiModel that occurs when id2word is a Python 3 dictionary. --- gensim/models/lsimodel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gensim/models/lsimodel.py b/gensim/models/lsimodel.py index 36f3d89a43..31f1a2dc2e 100644 --- a/gensim/models/lsimodel.py +++ b/gensim/models/lsimodel.py @@ -298,7 +298,8 @@ def __init__(self, corpus=None, num_topics=200, id2word=None, chunksize=20000, self.id2word = utils.dict_from_corpus(corpus) self.num_terms = len(self.id2word) else: - self.num_terms = 1 + max([-1] + self.id2word.keys()) + self.num_terms = ( + 1 + max(self.id2word.keys()) if self.id2word else -1) self.docs_processed = 0 self.projection = Projection(self.num_terms, self.num_topics, power_iters=self.power_iters, extra_dims=self.extra_samples) From be806a1218f4a88e7e7c0d0dfa0de3cacf7acae4 Mon Sep 17 00:00:00 2001 From: Christophe Van Gysel Date: Mon, 23 Jan 2017 13:49:08 +0100 Subject: [PATCH 2/3] Move expression back to single line. --- gensim/models/lsimodel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gensim/models/lsimodel.py b/gensim/models/lsimodel.py index 31f1a2dc2e..2ba01c23f6 100644 --- a/gensim/models/lsimodel.py +++ b/gensim/models/lsimodel.py @@ -298,8 +298,7 @@ def __init__(self, corpus=None, num_topics=200, id2word=None, chunksize=20000, self.id2word = utils.dict_from_corpus(corpus) self.num_terms = len(self.id2word) else: - self.num_terms = ( - 1 + max(self.id2word.keys()) if self.id2word else -1) + self.num_terms = 1 + max(self.id2word.keys()) if self.id2word else -1 self.docs_processed = 0 self.projection = Projection(self.num_terms, self.num_topics, power_iters=self.power_iters, extra_dims=self.extra_samples) From 4a665db4264c9cba76e7b3c0e0a4534bfd8371a3 Mon Sep 17 00:00:00 2001 From: Christophe Van Gysel Date: Mon, 23 Jan 2017 15:48:40 +0100 Subject: [PATCH 3/3] Adds brackets around ternary expression. --- gensim/models/lsimodel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/models/lsimodel.py b/gensim/models/lsimodel.py index 2ba01c23f6..bc0cc4fb0f 100644 --- a/gensim/models/lsimodel.py +++ b/gensim/models/lsimodel.py @@ -298,7 +298,7 @@ def __init__(self, corpus=None, num_topics=200, id2word=None, chunksize=20000, self.id2word = utils.dict_from_corpus(corpus) self.num_terms = len(self.id2word) else: - self.num_terms = 1 + max(self.id2word.keys()) if self.id2word else -1 + self.num_terms = 1 + (max(self.id2word.keys()) if self.id2word else -1) self.docs_processed = 0 self.projection = Projection(self.num_terms, self.num_topics, power_iters=self.power_iters, extra_dims=self.extra_samples)