Skip to content

[MRG] DOC covariance doctest examples#12124

Merged
TomDLT merged 8 commits intoscikit-learn:masterfrom
adrinjalali:doc/covariance
Sep 24, 2018
Merged

[MRG] DOC covariance doctest examples#12124
TomDLT merged 8 commits intoscikit-learn:masterfrom
adrinjalali:doc/covariance

Conversation

@adrinjalali
Copy link
Copy Markdown
Member

@adrinjalali adrinjalali commented Sep 20, 2018

See #3846

Adds examples to all sklearn/covariance classes except the ones being handled in PR #11732

@adrinjalali
Copy link
Copy Markdown
Member Author

adrinjalali commented Sep 21, 2018 •
edited
Loading

Removed the elliptic example, it shows the same issue as what I saw in PR #11732

@adrinjalali adrinjalali changed the title DOC covariance doctest examples [MRG] DOC covariance doctest examples Sep 21, 2018
@adrinjalali adrinjalali mentioned this pull request Sep 21, 2018
Closed
rth
rth approved these changes Sep 21, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@rth rth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, thanks @adrinjalali ! Actually the cov.location_ is not documented in the docstring, maybe add it as well?

rth
rth reviewed Sep 21, 2018
View reviewed changes
albertcthomas
albertcthomas reviewed Sep 21, 2018
View reviewed changes
sklearn/covariance/elliptic_envelope.py Outdated
>>> np.random.seed(0)
>>> X = np.random.multivariate_normal(mean=[0, 0],
... cov=real_cov,
... size=300)
Copy link
Copy Markdown
Contributor

@albertcthomas albertcthomas Sep 21, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You put 300 here, whereas it should be 500 if you want to have the same output as for MinCovDet, see comment

@TomDLT TomDLT merged commit e8ca4cd into scikit-learn:master Sep 24, 2018
@TomDLT
Copy link
Copy Markdown
Member

TomDLT commented Sep 24, 2018

Thanks @adrinjalali !

@albertcthomas
Copy link
Copy Markdown
Contributor

albertcthomas commented Sep 24, 2018 •
edited
Loading

@adrinjalali I think you might have missed my comment about the EllipticEnveloppe issue: you put n_samples=300, whereas it should be 500 if you want to have the same output as for MinCovDet.

@adrinjalali adrinjalali deleted the doc/covariance branch September 24, 2018 09:39
@adrinjalali
Copy link
Copy Markdown
Member Author

adrinjalali commented Sep 24, 2018

@albertcthomas I haven't missed it. The issue I report there is not the inconsistency between the two methods, and is rather just for the EllipticEnvelope. However, if the two methods are supposed to give the same results, it would mean EllipticEnvelope should also be stable if the number of samples is increased to 500. For that I need to do more tests on different systems/servers and haven't had the chance to do so yet. I'll respond to your comment on the issue #12127 once I run the tests.

@amueller amueller mentioned this pull request Sep 24, 2018
Merged
amueller pushed a commit to amueller/scikit-learn that referenced this pull request Sep 24, 2018
@adrinjalali @amueller
[MRG] DOC covariance doctest examples (scikit-learn#12124)
673218c
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 29, 2018
@yarikoptic
Merge tag '0.20.0' into releases
ebbc522 
* tag '0.20.0': (77 commits)
  ColumnTransformer generalization to work on empty lists (scikit-learn#12084)
  add sparse_threshold to make_columns_transformer (scikit-learn#12152)
  [MRG] Convert ColumnTransformer input list to numpy array (scikit-learn#12104)
  Change version to 0.20.0
  BUG: check equality instead of identity in check_cv (scikit-learn#12155)
  [MRG] Fix FutureWarnings in logistic regression examples (scikit-learn#12114)
  [MRG] Update test_metaestimators to pass y parameter when calling score (scikit-learn#12089)
  DOC Removed duplicated doc in tree.rst (scikit-learn#11922)
  [MRG] DOC covariance doctest examples (scikit-learn#12124)
  typo and formatting fixes in 0.20 doc (scikit-learn#11963)
  DOC Replaced the deprecated early_stopping parameter with n_iter_no_change. (scikit-learn#12133)
  [MRG +1] ColumnTransformer: store evaluated function column specifier during fit (scikit-learn#12107)
  Fix typo (scikit-learn#12126)
  DOC Typo in OneHotEncoder
  DOC Update fit_transform docstring of OneHotEncoder (scikit-learn#12117)
  DOC Removing quotes from variant names. (scikit-learn#12113)
  DOC BaggingRegressor missing default value for oob_score in docstring (scikit-learn#12108)
  [MRG] MNT Re-enable PyPy CI (scikit-learn#12039)
  MNT Only checks warnings on latest depedendencies versions in CI (scikit-learn#12048)
  TST Ignore warnings in common test to avoid collection errors (scikit-learn#12093)
  ...
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 29, 2018
@yarikoptic
Merge branch 'releases' into dfsg
3065314 
* releases: (77 commits)
  ColumnTransformer generalization to work on empty lists (scikit-learn#12084)
  add sparse_threshold to make_columns_transformer (scikit-learn#12152)
  [MRG] Convert ColumnTransformer input list to numpy array (scikit-learn#12104)
  Change version to 0.20.0
  BUG: check equality instead of identity in check_cv (scikit-learn#12155)
  [MRG] Fix FutureWarnings in logistic regression examples (scikit-learn#12114)
  [MRG] Update test_metaestimators to pass y parameter when calling score (scikit-learn#12089)
  DOC Removed duplicated doc in tree.rst (scikit-learn#11922)
  [MRG] DOC covariance doctest examples (scikit-learn#12124)
  typo and formatting fixes in 0.20 doc (scikit-learn#11963)
  DOC Replaced the deprecated early_stopping parameter with n_iter_no_change. (scikit-learn#12133)
  [MRG +1] ColumnTransformer: store evaluated function column specifier during fit (scikit-learn#12107)
  Fix typo (scikit-learn#12126)
  DOC Typo in OneHotEncoder
  DOC Update fit_transform docstring of OneHotEncoder (scikit-learn#12117)
  DOC Removing quotes from variant names. (scikit-learn#12113)
  DOC BaggingRegressor missing default value for oob_score in docstring (scikit-learn#12108)
  [MRG] MNT Re-enable PyPy CI (scikit-learn#12039)
  MNT Only checks warnings on latest depedendencies versions in CI (scikit-learn#12048)
  TST Ignore warnings in common test to avoid collection errors (scikit-learn#12093)
  ...
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 29, 2018
@yarikoptic
Merge branch 'dfsg' into debian-old
fb9c55c 
* dfsg: (77 commits)
  ColumnTransformer generalization to work on empty lists (scikit-learn#12084)
  add sparse_threshold to make_columns_transformer (scikit-learn#12152)
  [MRG] Convert ColumnTransformer input list to numpy array (scikit-learn#12104)
  Change version to 0.20.0
  BUG: check equality instead of identity in check_cv (scikit-learn#12155)
  [MRG] Fix FutureWarnings in logistic regression examples (scikit-learn#12114)
  [MRG] Update test_metaestimators to pass y parameter when calling score (scikit-learn#12089)
  DOC Removed duplicated doc in tree.rst (scikit-learn#11922)
  [MRG] DOC covariance doctest examples (scikit-learn#12124)
  typo and formatting fixes in 0.20 doc (scikit-learn#11963)
  DOC Replaced the deprecated early_stopping parameter with n_iter_no_change. (scikit-learn#12133)
  [MRG +1] ColumnTransformer: store evaluated function column specifier during fit (scikit-learn#12107)
  Fix typo (scikit-learn#12126)
  DOC Typo in OneHotEncoder
  DOC Update fit_transform docstring of OneHotEncoder (scikit-learn#12117)
  DOC Removing quotes from variant names. (scikit-learn#12113)
  DOC BaggingRegressor missing default value for oob_score in docstring (scikit-learn#12108)
  [MRG] MNT Re-enable PyPy CI (scikit-learn#12039)
  MNT Only checks warnings on latest depedendencies versions in CI (scikit-learn#12048)
  TST Ignore warnings in common test to avoid collection errors (scikit-learn#12093)
  ...
@adrinjalali adrinjalali mentioned this pull request Jan 13, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

4 more reviewers

@rth rth rth approved these changes

@albertcthomas albertcthomas albertcthomas left review comments

@eamanu eamanu eamanu approved these changes

@TomDLT TomDLT TomDLT approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@adrinjalali @TomDLT @albertcthomas @rth @eamanu