Merged
Conversation
…learn into jakevdp-balltree-wrapper
* use size_t consistently * use auto_ptr to prevent memory leaks * some minor fixes
The user can now choose either Mean Squared Error, Root Mean Squared Error or Sum of Squared Errors through a keyword. Others types of error may be implemented depending on future needs.
* predict_proba now gives true probabilities (by normalizing by the evidence) * if use_priors is False, use uniform priors instead of skipping computation
I feel it is a little hacky since I copy init at the very begining, not in "_init_centroids". But in this function, X_mean would not be available. And I like this solution better than adding another argument to _init_centroids.
…learn into svmlight_format
No link for reference to Manning et al. since nlp.stanford.edu seems to be down. Should add this later.
Naive Bayes classifier for multivariate Bernoulli (binary features)
Also some minor refactoring
Memory leak and exception safety in SVMlight reader
Conflicts: doc/modules/datasets.rst
Fast loader for the svmlight / libsvm format
Tested with SciPy 0.7.2.
jakevdp
pushed a commit
that referenced
this pull request
Aug 1, 2012
REF: hack to be able to share distutils utilities.
jakevdp
pushed a commit
that referenced
this pull request
Jul 2, 2013
jakevdp
pushed a commit
that referenced
this pull request
Jul 2, 2013
jakevdp
pushed a commit
that referenced
this pull request
Mar 2, 2017
…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
agramfort
pushed a commit
that referenced
this pull request
Jul 18, 2018
* Add averaging option to AMI and NMI Leave current behavior unchanged * Flake8 fixes * Incorporate tests of means for AMI and NMI * Add note about `average_method` in NMI * Update docs from AMI, NMI changes (#1) * Correct the NMI and AMI descriptions in docs * Update docstrings due to averaging changes - V-measure - Homogeneity - Completeness - NMI - AMI * Update documentation and remove nose tests (#2) * Update v0.20.rst * Update test_supervised.py * Update clustering.rst * Fix multiple spaces after operator * Rename all arguments * No more arbitrary values! * Improve handling of floating-point imprecision * Clearly state when the change occurs * Update AMI/NMI docs * Update v0.20.rst * Catch FutureWarnings in AMI and NMI
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
Hi here are a couple of fixes to try to make the merge with current master possible.