[MRG+1] FIX all the examples to use the new cv classes #3

raghavrv · 2015-07-04T17:42:46Z

@amueller @vene @jnothman Please take a look :)

jnothman · 2015-07-04T22:22:56Z

travis says no

On 5 July 2015 at 03:42, Raghav R V notifications@github.com wrote:

@amueller https://github.com/amueller @vene https://github.com/vene

@jnothman https://github.com/jnothman Please take a look :)

You can view, comment on, or merge this pull request online at:

#3
Commit Summary

FIX all the examples to use the new cv classes

File Changes

M examples/applications/face_recognition.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-0 (4)

M examples/calibration/plot_calibration.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-1 (2)

M examples/calibration/plot_calibration_curve.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-2 (2)

M examples/classification/plot_classifier_comparison.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-3 (2)

M
examples/cluster/plot_feature_agglomeration_vs_univariate_selection.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-4 (6)

M examples/decomposition/plot_pca_vs_fa_model_selection.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-5 (4)

M examples/ensemble/plot_gradient_boosting_oob.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-6 (8)

M examples/ensemble/plot_partial_dependence.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-7 (2)

M examples/exercises/plot_cv_diabetes.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-8 (16)

M examples/exercises/plot_cv_digits.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-9 (5)

M
examples/feature_selection/plot_permutation_test_for_classification.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-10 (5)

M examples/feature_selection/plot_rfe_with_cross_validation.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-11 (4)

M examples/gaussian_process/gp_diabetes_dataset.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-12 (9)

M examples/linear_model/plot_sgd_comparison.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-13 (2)

M examples/missing_values.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-14 (2)

M examples/mixture/plot_gmm_classifier.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-15 (6)

M examples/model_selection/README.txt
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-16 (3)

M examples/model_selection/grid_search_digits.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-17 (4)

M examples/model_selection/grid_search_text_feature_extraction.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-18 (3)

M examples/model_selection/plot_confusion_matrix.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-19 (2)

M examples/model_selection/plot_learning_curve.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-20 (28)

M examples/model_selection/plot_precision_recall.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-21 (2)

M examples/model_selection/plot_roc.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-22 (2)

M examples/model_selection/plot_roc_crossval.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-23 (8)

M examples/model_selection/plot_underfitting_overfitting.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-24 (6)

M examples/model_selection/plot_validation_curve.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-25 (2)

M examples/model_selection/randomized_search.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-26 (3)

M examples/neural_networks/plot_rbm_logistic_classification.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-27 (2)

M examples/plot_cv_predict.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-28 (2)

M examples/svm/plot_rbf_parameters.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-29 (6)

M examples/svm/plot_svm_anova.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-30 (5)

M examples/svm/plot_svm_scale_c.py
https://github.com/rvraghav93/scikit-learn/pull/3/files#diff-31 (8)

Patch Links:

https://github.com/rvraghav93/scikit-learn/pull/3.patch

https://github.com/rvraghav93/scikit-learn/pull/3.diff

—
Reply to this email directly or view it on GitHub
#3.

raghavrv · 2015-07-05T06:07:58Z

@vene till scikit-learn#4252 is fixed we'll have to use 2D X (at least for the cross_val_score and cross_val_predict)

raghavrv · 2015-07-05T06:08:24Z

haha it should say yes now!! ;)

vene · 2015-07-07T15:26:26Z

Why is the 2D X comment relevant in this PR? It looks like there are test-related commits that belong in scikit-learn#4294 rather than here.

raghavrv · 2015-07-07T15:29:03Z

I haven't rebased this I think... That should fix it :)

raghavrv · 2015-07-10T16:18:50Z

fixed :)

amueller · 2015-07-10T19:14:43Z

this looks good.

raghavrv · 2015-07-10T19:16:45Z

Thanks for the review!!

raghavrv · 2015-08-13T14:23:36Z

@vene +1 on this??

raghavrv · 2015-08-13T14:24:31Z

BTW I'll merge this to model_selection branch (scikit-learn#4294) just before that gets merged...

[MRG+1] FIX all the examples to use the new cv classes

…scikit-learn#7838) * initial commit for return_std * initial commit for return_std * adding tests, examples, ARD predict_std * adding tests, examples, ARD predict_std * a smidge more documentation * a smidge more documentation * Missed a few PEP8 issues * Changing predict_std to return_std #1 * Changing predict_std to return_std #2 * Changing predict_std to return_std #3 * Changing predict_std to return_std final * adding better plots via polynomial regression * trying to fix flake error * fix to ARD plotting issue * fixing some flakes * Two blank lines part 1 * Two blank lines part 2 * More newlines! * Even more newlines * adding info to the doc string for the two plot files * Rephrasing "polynomial" for Bayesian Ridge Regression * Updating "polynomia" for ARD * Adding more formal references * Another asked-for improvement to doc string. * Fixing flake8 errors * Cleaning up the tests a smidge. * A few more flakes * requested fixes from Andy * Mini bug fix * Final pep8 fix * pep8 fix round 2 * Fix beta_ to alpha_ in the comments

* add test for _preprocess_data and make it consistent * fix pep8 * add doc, cast systematically y in X.dtype and update test_coordinate_descent.py * test if input values don't change with copy=True * test if input values don't change with copy=True #2 * fix doc * fix doc #2 * fix doc #3

raghavrv mentioned this pull request Jul 4, 2015

[MRG+1] Make cross-validators data independent + Reorganize grid_search, cross_validation and learning_curve into model_selection scikit-learn/scikit-learn#4294

Merged

24 tasks

raghavrv force-pushed the model_selection_fix_examples branch from fcc2f80 to 974610b Compare July 5, 2015 06:00

raghavrv force-pushed the model_selection branch from a331be3 to 8d39d5d Compare July 7, 2015 05:48

raghavrv force-pushed the model_selection_fix_examples branch from 974610b to cb25539 Compare July 10, 2015 16:18

raghavrv force-pushed the model_selection branch from 8d39d5d to fb8b1ac Compare July 10, 2015 18:38

raghavrv force-pushed the model_selection_fix_examples branch from cb25539 to 3da1fc5 Compare July 10, 2015 18:40

raghavrv changed the title ~~[MRG] FIX all the examples to use the new cv classes~~ [MRG+1] FIX all the examples to use the new cv classes Jul 10, 2015

raghavrv force-pushed the model_selection branch 7 times, most recently from 51d6829 to b114063 Compare August 3, 2015 04:19

raghavrv force-pushed the model_selection branch 8 times, most recently from 525fcc2 to b2c6417 Compare August 11, 2015 19:03

raghavrv force-pushed the model_selection_fix_examples branch 2 times, most recently from cf28df3 to c402cda Compare August 11, 2015 19:22

FIX all the examples to use the new cv classes

0d7d738

raghavrv force-pushed the model_selection_fix_examples branch from c402cda to 0d7d738 Compare August 12, 2015 11:50

raghavrv force-pushed the model_selection branch 3 times, most recently from cb082ff to b5077d2 Compare August 13, 2015 12:40

raghavrv added a commit that referenced this pull request Aug 13, 2015

Merge pull request #3 from rvraghav93/model_selection_fix_examples

beec231

[MRG+1] FIX all the examples to use the new cv classes

raghavrv merged commit beec231 into model_selection Aug 13, 2015

raghavrv deleted the model_selection_fix_examples branch August 13, 2015 17:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRG+1] FIX all the examples to use the new cv classes #3

[MRG+1] FIX all the examples to use the new cv classes #3

raghavrv commented Jul 4, 2015

jnothman commented Jul 4, 2015

@jnothman https://github.com/jnothman Please take a look :)

raghavrv commented Jul 5, 2015

raghavrv commented Jul 5, 2015

vene commented Jul 7, 2015

raghavrv commented Jul 7, 2015

raghavrv commented Jul 10, 2015

amueller commented Jul 10, 2015

raghavrv commented Jul 10, 2015

raghavrv commented Aug 13, 2015

raghavrv commented Aug 13, 2015

[MRG+1] FIX all the examples to use the new cv classes #3

[MRG+1] FIX all the examples to use the new cv classes #3

Conversation

raghavrv commented Jul 4, 2015

jnothman commented Jul 4, 2015

@jnothman https://github.com/jnothman Please take a look :)

raghavrv commented Jul 5, 2015

raghavrv commented Jul 5, 2015

vene commented Jul 7, 2015

raghavrv commented Jul 7, 2015

raghavrv commented Jul 10, 2015

amueller commented Jul 10, 2015

raghavrv commented Jul 10, 2015

raghavrv commented Aug 13, 2015

raghavrv commented Aug 13, 2015