Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit efb4aac

Browse files
petrushevpetrushev
committed
Minor tidy-up
1 parent 3938adc commit efb4aac

3 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎doc/whats_new.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Miscellaneous
5757
- Added optional parameter ``verbose`` in functions `pipeline.make_pipeline`
5858
and `pipeline.make_union` to extend the same functionality as the
5959
corresponding classes. :issue:`9668` by
60-
:user:`Baze Petrushev <petrushev>`.
60+
:user:`Baze Petrushev <petrushev>` and :user:`Karan Desai <karandesai-96>`.
6161

6262

6363
Bug fixes
@@ -5766,5 +5766,4 @@ David Huard, Dave Morrill, Ed Schofield, Travis Oliphant, Pearu Peterson.
57665766

57675767
.. _Neeraj Gangwar: http://neerajgangwar.in
57685768
.. _Arthur Mensch: https://amensch.fr
5769-
57705769
.. _Karan Desai: https://www.github.com/karandesai-96

‎sklearn/pipeline.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
from .base import clone, TransformerMixin
1919
from .externals.joblib import Parallel, delayed
2020
from .externals import six
21-
from .utils.metaestimators import if_delegate_has_method, _BaseComposition
21+
from .utils.metaestimators import if_delegate_has_method
2222
from .utils import Bunch
2323
from .utils.validation import check_memory
2424

25+
from .utils.metaestimators import _BaseComposition
2526

2627
__all__ = ['Pipeline', 'FeatureUnion']
2728

@@ -627,16 +628,16 @@ def make_pipeline(*steps, **kwargs):
627628
return Pipeline(_name_estimators(steps), memory=memory, verbose=verbose)
628629

629630

630-
def _fit_one_transformer(trans, X, y, verbose=False, idx=None,
631+
def _fit_one_transformer(transformer, X, y, verbose=False, idx=None,
631632
total_steps=None, name=None):
632633
# idx, total_steps and name are not required when verbosity is disabled
633634
step_start_time = time.time()
634-
trans = trans.fit(X, y)
635+
transformer = transformer.fit(X, y)
635636
step_time_elapsed = time.time() - step_start_time
636637
if verbose:
637638
_pretty_print('[FeatureUnion] (step %d of %d) %s ... %.5fs' %
638639
(idx + 1, total_steps, name, step_time_elapsed))
639-
return trans
640+
return transformer
640641

641642

642643
def _transform_one(transformer, weight, X):
@@ -647,22 +648,22 @@ def _transform_one(transformer, weight, X):
647648
return res * weight
648649

649650

650-
def _fit_transform_one(trans, weight, X, y, verbose=False, idx=None,
651+
def _fit_transform_one(transformer, weight, X, y, verbose=False, idx=None,
651652
total_steps=None, name=None, **fit_params):
652653
# idx, total_steps and name are not required when verbosity is disabled
653654
step_start_time = time.time()
654-
if hasattr(trans, 'fit_transform'):
655-
res = trans.fit_transform(X, y, **fit_params)
655+
if hasattr(transformer, 'fit_transform'):
656+
res = transformer.fit_transform(X, y, **fit_params)
656657
else:
657-
res = trans.fit(X, y, **fit_params).transform(X)
658+
res = transformer.fit(X, y, **fit_params).transform(X)
658659
step_time_elapsed = time.time() - step_start_time
659660
if verbose:
660661
_pretty_print('[FeatureUnion] (step %d of %d) %s ... %.5fs' %
661662
(idx + 1, total_steps, name, step_time_elapsed))
662663
# if we have a weight for this transformer, multiply output
663664
if weight is None:
664-
return res, trans
665-
return res * weight, trans
665+
return res, transformer
666+
return res * weight, transformer
666667

667668

668669
class FeatureUnion(_BaseComposition, TransformerMixin):
@@ -792,15 +793,14 @@ def fit(self, X, y=None):
792793
This estimator
793794
"""
794795
self._validate_transformers()
795-
all_transformers = [(name, trans, weight) for name, trans, weight in
796-
self._iter()]
796+
all_transformers = list(self._iter())
797797
total_steps = len(all_transformers)
798798
# Keep a record of time elapsed
799799
start_time = time.time()
800800
transformers = Parallel(n_jobs=self.n_jobs)(
801-
delayed(_fit_one_transformer)(trans, X, y, self.verbose, idx,
802-
total_steps, name)
803-
for idx, (name, trans, _) in enumerate(all_transformers))
801+
delayed(_fit_one_transformer)(transformer, X, y, self.verbose,
802+
idx, total_steps, name)
803+
for idx, (name, transformer, _) in enumerate(all_transformers))
804804
time_elapsed = time.time() - start_time
805805
if self.verbose:
806806
_pretty_print(
@@ -826,15 +826,15 @@ def fit_transform(self, X, y=None, **fit_params):
826826
sum of n_components (output dimension) over transformers.
827827
"""
828828
self._validate_transformers()
829-
all_transformers = [(name, trans, weight) for name, trans, weight in
830-
self._iter()]
829+
all_transformers = list(self._iter())
831830
total_steps = len(all_transformers)
832831
# Keep a record of time elapsed
833832
start_time = time.time()
834833
result = Parallel(n_jobs=self.n_jobs)(
835-
delayed(_fit_transform_one)(trans, weight, X, y, self.verbose,
836-
idx, total_steps, name)
837-
for idx, (name, trans, weight) in enumerate(all_transformers))
834+
delayed(_fit_transform_one)(transformer, weight, X, y,
835+
self.verbose, idx, total_steps, name,
836+
**fit_params)
837+
for idx, (name, transformer, weight) in enumerate(all_transformers))
838838
time_elapsed = time.time() - start_time
839839
if self.verbose:
840840
_pretty_print(

‎sklearn/tests/test_pipeline.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ def set_params(self, **params):
6767

6868

6969
class NoInvTransf(NoTrans):
70-
def transform(self, X, y=None):
70+
def transform(self, X):
7171
return X
7272

7373

7474
class Transf(NoInvTransf):
75-
def transform(self, X, y=None):
75+
def transform(self, X):
7676
return X
7777

7878
def inverse_transform(self, X):

0 commit comments

Comments
 (0)