[MRG] Replace all the deprecated random_integers by randint. #6712
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -627,7 +627,7 @@ def lasso_stability_path(X, y, scaling=0.5, random_state=None, | |||
| paths = Parallel(n_jobs=n_jobs, verbose=verbose)( | |||
| delayed(_lasso_stability_path)( | |||
| X, y, mask=rng.rand(n_samples) < sample_fraction, | |||
| weights=1. - scaling * rng.random_integers(0, 1, | |||
| weights=1. - scaling * rng.randint(0, 1, | |||
| size=(n_features,)), | |||
|
Please check indentation, and where possible avoid line wrapping. |
26921cd to
d2a8abd
Compare
|
Sorry for that, it's corrected now. |
|
LGTM, +1 once CI is all-green. |
d2a8abd to
fc5e305
Compare
| @@ -23,7 +23,11 @@ def compute_bench(samples_range, features_range): | |||
| print('Iteration %03d of %03d' % (it, max_it)) | |||
| print('==============================') | |||
| print() | |||
| data = nr.random_integers(-50, 50, (n_samples, n_features)) | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
There are some merge conflicts you missed...
|
+1 from me too! |
|
+1 after cleaning the conflict |
fc5e305 to
91c4279
Compare
|
Sorry for the forgotten HEAD. |
91c4279 to
af42686
Compare
olologin
pushed a commit
to olologin/scikit-learn
that referenced
this pull request
Aug 24, 2016
TomDLT
pushed a commit
to TomDLT/scikit-learn
that referenced
this pull request
Oct 3, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The function random_integers was recently deprecated in numpy resulting a lot of warnings during the test. This PR is done to correct that.