8000 [MRG] DOC Version added and changed labels added for v0.18 (#wimlds) by brigitteunger · Pull Request #16222 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]

Skip to content

[MRG] DOC Version added and changed labels added for v0.18 (#wimlds) #16222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2020

Conversation

brigitteunger
Copy link
Contributor

referencing #15426
together with @hhnnhh, @shravaniCD
for version 0.18: added labels versionadded and versionchanged
#wimlds #ScikitLearnSprint @noatamir @adrinjalali

Copy link
Member
@adrinjalali adrinjalali left a comment

Choose a reason for hiding this comment

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

You have failing tests and linter issues. Once you fix those, the docs will be generated and you can check how they look as explained here https://scikit-learn.org/dev/developers/contributing.html#pull-request-checklist

@@ -728,6 +728,9 @@ class KMeans(TransformerMixin, ClusterMixin, BaseEstimator):
The "elkan" variation is more efficient by using the triangle
inequality, but currently doesn't support sparse data. "auto" chooses
"elkan" for dense data and "full" for sparse data.

.. versionchanged:: 0.18
Added ''algorithm="elkan"'' implementing Elkan's fast K-Means algorithm
Copy link
Member

Choose a reason for hiding this comment

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

You need to indent this line further

Copy link
Contributor

Choose a reason for hiding this comment

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

Done!

@@ -776,6 +778,8 @@ def matthews_corrcoef(y_true, y_pred, sample_weight=None):
sample_weight : array-like of shape (n_samples,), default=None
Sample weights.

.. versionadded:: 0.18
Copy link
Member

Choose a reason for hiding this comment

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

I think if this is for the sample_weight, you need and extra indent. Check the rendered docs and the other instances as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

Done! All issues should be fixed now.

@noatamir
Copy link
Contributor

@brigitteunger can you continue to work on this?

@hhnnhh
Copy link
Contributor
hhnnhh commented Feb 26, 2020

I'm working on fixing it. Will create a PR soon. @brigitteunger @noatamir @adrinjalali

@noatamir
Copy link
Contributor

Thank you both for the update! and Gute Besserung @brigitteunger!!

@noatamir
Copy link
Contributor

@hhnnhh let me know if you need help finishing this 😃 I just finished my PR for documenting v.19 changes and would be happy to pair remotely

@hhnnhh hhnnhh force-pushed the my_feature branch 6 times, most recently from 88b952d to ff1e295 Compare April 25, 2020 22:03
Copy link
Member
@NicolasHug NicolasHug left a comment

Choose a reason for hiding this comment

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

Thanks @brigitteunger @hhnnhh, @shravaniCD !

Only one minor nitpick but LGTM anyway.

@cmarmo do you want to do another pass?

Comment on lines 838 to 839
Added ''algorithm="elkan"'' implementing Elkan's fast K-Means
algorithm
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Added ''algorithm="elkan"'' implementing Elkan's fast K-Means
algorithm
Added Elkan algorithm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor
@cmarmo cmarmo left a comment

Choose a reason for hiding this comment

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

Approved once the indent fixed.
Thanks @brigitteunger

@@ -789,6 +791,8 @@ def matthews_corrcoef(y_true, y_pred, *, sample_weight=None):
sample_weight : array-like of shape (n_samples,), default=None
Sample weights.

.. versionadded:: 0.18
Copy link
Contributor

Choose a reason for hiding this comment

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

The versionadded directive should be indented as in line

.. versionadded:: 0.18

Right now the directive is rendered in bold but the needed rendering is italic.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -2034,7 +2038,7 @@ def hamming_loss(y_true, y_pred, *, sample_weight=None):
sample_weight : array-like of shape (n_samples,), default=None
Sample weights.

.. versionadded:: 0.18
.. versionadded:: 0.18
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment as above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -2152,7 +2156,8 @@ def log_loss(y_true, y_pred, *, eps=1e-15, normalize=True, sample_weight=None,
If not provided, labels will be inferred from y_true. If ``labels``
is ``None`` and ``y_pred`` has shape (n_samples,) the labels are
assumed to be binary and are inferred from ``y_true``.
.. versionadded:: 0.18

.. versionadded:: 0.18
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment as above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@thomasjpfan thomasjpfan merged commit dbc3593 into scikit-learn:master Apr 27, 2020
@thomasjpfan
Copy link
Member

Thank you @brigitteunger !

Ping #17010 (comment)

@brigitteunger brigitteunger deleted the my_feature branch April 28, 2020 10:00
adrinjalali pushed a commit that referenced this pull request Apr 30, 2020
* Versionlabels added to v0.18 (#wimlds)

* documentation issues: label changed and added for version 0.18

* fix intends and shorten description

Co-authored-by: Hannah <32333241+hhnnhh@users.noreply.github.com>
Co-authored-by: Brigitte@home <unger@nue.tu-berlin.de>
gio8tisu pushed a commit to gio8tisu/scikit-learn that referenced this pull request May 15, 2020
…t-learn#16222)

* Versionlabels added to v0.18 (#wimlds)

* documentation issues: label changed and added for version 0.18

* fix intends and shorten description

Co-authored-by: Hannah <32333241+hhnnhh@users.noreply.github.com>
Co-authored-by: Brigitte@home <unger@nue.tu-berlin.de>
viclafargue pushed a commit to viclafargue/scikit-learn that referenced this pull request Jun 26, 2020
…t-learn#16222)

* Versionlabels added to v0.18 (#wimlds)

* documentation issues: label changed and added for version 0.18

* fix intends and shorten description

Co-authored-by: Hannah <32333241+hhnnhh@users.noreply.github.com>
Co-authored-by: Brigitte@home <unger@nue.tu-berlin.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants
0