Merge pull request #1428 from chinmayapancholi13/skl_ipynb_changes

[MRG] Updated IPython notebook for scikit-learn wrappers
piskvorky · Jun 21, 2017 · b4da23c · b4da23c
2 parents 2ea1af0 + 4547c1e
commit b4da23c
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 68 deletions.
diff --git a/docs/notebooks/sklearn_wrapper.ipynb b/docs/notebooks/sklearn_wrapper.ipynb
diff --git a/gensim/sklearn_integration/__init__.py b/gensim/sklearn_integration/__init__.py
@@ -8,3 +8,10 @@
 See [1] for complete set of conventions.
 [1] http://scikit-learn.org/stable/developers/
 """
+
+
+from .base_sklearn_wrapper import BaseSklearnWrapper  # noqa: F401
+from .sklearn_wrapper_gensim_ldamodel import SklLdaModel  # noqa: F401
+from .sklearn_wrapper_gensim_lsimodel import SklLsiModel  # noqa: F401
+from .sklearn_wrapper_gensim_rpmodel import SklRpModel  # noqa: F401
+from .sklearn_wrapper_gensim_ldaseqmodel import SklLdaSeqModel  # noqa: F401
diff --git a/gensim/sklearn_integration/sklearn_wrapper_gensim_ldamodel.py b/gensim/sklearn_integration/sklearn_wrapper_gensim_ldamodel.py
@@ -16,10 +16,10 @@
 
 from gensim import models
 from gensim import matutils
-from gensim.sklearn_integration import base_sklearn_wrapper
+from gensim.sklearn_integration import BaseSklearnWrapper
 
 
-class SklLdaModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
+class SklLdaModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
     """
     Base LDA module
     """
@@ -64,6 +64,7 @@ def set_params(self, **parameters):
         Set all parameters.
         """
         super(SklLdaModel, self).set_params(**parameters)
+        return self
 
     def fit(self, X, y=None):
         """

diff --git a/gensim/sklearn_integration/sklearn_wrapper_gensim_ldaseqmodel.py b/gensim/sklearn_integration/sklearn_wrapper_gensim_ldaseqmodel.py
@@ -14,10 +14,10 @@
 from sklearn.exceptions import NotFittedError
 
 from gensim import models
-from gensim.sklearn_integration import base_sklearn_wrapper
+from gensim.sklearn_integration import BaseSklearnWrapper
 
 
-class SklLdaSeqModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
+class SklLdaSeqModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
     """
     Base LdaSeq module
     """
@@ -61,6 +61,7 @@ def set_params(self, **parameters):
         Set all parameters.
         """
         super(SklLdaSeqModel, self).set_params(**parameters)
+        return self
 
     def fit(self, X, y=None):
         """

diff --git a/gensim/sklearn_integration/sklearn_wrapper_gensim_lsimodel.py b/gensim/sklearn_integration/sklearn_wrapper_gensim_lsimodel.py
@@ -16,10 +16,10 @@
 
 from gensim import models
 from gensim import matutils
-from gensim.sklearn_integration import base_sklearn_wrapper
+from gensim.sklearn_integration import BaseSklearnWrapper
 
 
-class SklLsiModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
+class SklLsiModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
     """
     Base LSI module
     """
@@ -51,6 +51,7 @@ def set_params(self, **parameters):
         Set all parameters.
         """
         super(SklLsiModel, self).set_params(**parameters)
+        return self
 
     def fit(self, X, y=None):
         """

diff --git a/gensim/sklearn_integration/sklearn_wrapper_gensim_rpmodel.py b/gensim/sklearn_integration/sklearn_wrapper_gensim_rpmodel.py
@@ -14,10 +14,10 @@
 from sklearn.exceptions import NotFittedError
 
 from gensim import models
-from gensim.sklearn_integration import base_sklearn_wrapper
+from gensim.sklearn_integration import BaseSklearnWrapper
 
 
-class SklRpModel(base_sklearn_wrapper.BaseSklearnWrapper, TransformerMixin, BaseEstimator):
+class SklRpModel(BaseSklearnWrapper, TransformerMixin, BaseEstimator):
     """
     Base RP module
     """
@@ -41,6 +41,7 @@ def set_params(self, **parameters):
         Set all parameters.
         """
         super(SklRpModel, self).set_params(**parameters)
+        return self
 
     def fit(self, X, y=None):
         """