Fix bug in AMFClassifier and finish AMFRegressor (#1166) #1281
Conversation
This file contains 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
* AMF Classifier & Mondrian Tree Classifier implementation * [Pull request Update] - Adding a "mondrian" folder in the "tree" folder for better file structure - Using "random.choices" instead of the "sample_discrete" functions in "utils.py", and removing "sample_discrete" from the "utils.py" * [Pull Request] - Removing the "__repr__" method of AMF - Removing the @Setter and @getter - Removing the "loss" parameter of the classifiers since only the "log-loss" is being used in the end * Updating docstring * [Pull request] - Making `learn_one` and `predict_proba_one` accepting all kinds of supported labels for `y` as input - `predict_proba_one` outputs a dictionary of scores with matching labels * [Fix] Reability Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * [Fix] Language Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * [Fix] Language Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * [Fix] math package implementation usage Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * [Pull request] - Leaving `__all__` in alphabetical order for the classifiers - Removing type parameters in the description of `log_2_sum` of math utils - Replacing java-like getters and setters by python-like properties and setter * - Adding support for random state (seed) - Replacing Overflow from infinity to maximum possible float (so it makes computations still possible) * [Ignoring testing environment] * Fixing style & typos Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * [Pull request] - Fixing import order in __init__ file of ensemble - Using LaTeX formulation in AMFClassifier description - Making all nodes related methods private (it shouldn't be used outside) - Docstring syntax update and fixes - Importing river.base instead of typing module for better readability - Adding a short description to the MondrianTreeClassifier - Renaming MondrianTreeLeaf into MondrianLeaf - Reordering functions in MondrianTreeClassifier for better readability * Pre-commit clean up * Pre-commit clean up * [MyPy issue] - Trying to fix the left-right issue uppercast (that shouldn't be a problem normally, but mypy keeps being unhappy) - Fixing assignment issue to the parent during upward procedure - Fixing type assignment to the root branch of the tree - Fixing arg-type for list of intensities - Fixing arg-type issue with current samples proceeding - Fixing dirichlet arg-type issue - Fixing some typing issues - Removing call-overload as int in the memories features range list - Correcting output of predict function * Fixing MyPy issues (detyping) * suggestions and style issues fix * addingnecessary files, classes and methods for regressor * minor import modifications * minor list to typing.List and dict to typing.Dict modifs * minor modifs to pass tests * minor changes * changing names * Fixing predict function to support the "model not trained" situation instead of raising an exception * more style suggestions * testing * regressor fix * fixing docstring * [Pull request Update] - Fixing some TODOs from Mastelini suggestions - Factorizing a bit of code from nodes that should be shared with regressor - Removing branch structure as of now for future changes * Removing all "array-like" structure for full dict support * Pre-commit hookups fixes * regressor fix * Delete tests.py * [Pull request] - Adding suggestions from Mastelini on keys usage - Removing useless initialization of scores in the MondrianTreeClassifier * bug fix * fix conflicts * refactored, but has bugs * remove mypy skip * tests * tests * cleanup * better, but not fixed * minor fix * [Fixes] - Fixing scoring bug (no propagation of counts) - Removing unused parameters in docs - Replacing type union of Python 3.10 in 3.9 annotations - Adding little description for MondrianBranch * Pre-commit hookups fixes * fix some tests * Reworking intensities * fix remaining tests and remove duplicated method call * [Pull request] - Adding examples for AMF & Mondrian Tree Classifiers - Reordering __init__ in alphabetical order - Cleaning the comments - Adding string representation for nodes * Hiding MondrianTree from users visibility * Fixing import on Mondrian Tree example Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> * tests * merge fix * merge fix * docstring fixes --------- Co-authored-by: AlexandreChaussard <alexandre.chaussard@telecom-sudparis.eu> Co-authored-by: Alexandre Chaussard <78101027+AlexandreChaussard@users.noreply.github.com> Co-authored-by: Saulo Martiello Mastelini <mastelini@usp.br> Co-authored-by: Kenza Ben jelloun <kenza.ben_jelloun@telecom-sudparis.eu> Co-authored-by: Saulo Martiello Mastelini <saulomastelini@gmail.com>
smastelini
changed the title
MaxHalford
reviewed
Jul 10, 2023
| self.n_samples = 0 | ||
| self.mean = stats.Mean() | ||
|
|
||
| def replant(self, leaf: MondrianNodeRegressor, copy_all: bool = False): |
Co-authored-by: Max Halford <maxhalford25@gmail.com>
Co-authored-by: Max Halford <maxhalford25@gmail.com>
MaxHalford
reviewed
Jul 10, 2023
Co-authored-by: Max Halford <maxhalford25@gmail.com>
MaxHalford
approved these changes
Jul 11, 2023
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.
Thanks to a comment in the Fellowship of Online Machine's discord, I was able to track a bug affecting both the classifier and regression versions of AMF.
In my preliminary tests, the predictive performance improved in both cases. @kenzabenjelloun, thanks for your work on the AMFRegressor. I think the bug you mentioned in the previous PR might have been fixed :D