Soup #7
Merged
Soup #7
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
damianhorna
approved these changes
Sep 7, 2019
multi_imbalance/resampling/SOUP.py
Outdated
| """ | ||
| Similarity Oversampling and Undersampling Preprocessing (SOUP) is an algorithm that equalizes number of samples | ||
| in each class. It also takes care of the similarity between classes, which means that it removes samples from | ||
| majority class, that are close to samples from the other class and duplicate samples from th minority classes, |
| @@ -0,0 +1,163 @@ | |||
| { | |||
There was a problem hiding this comment.
examples in ipynb format are good idea! 👍
hancia
requested changes
Sep 7, 2019
multi_imbalance/utils/plot.py
Outdated
|
|
||
| def plot_multi_dimensional_data(X, y, ax=None): | ||
| """ | ||
| This function reduce quantity of dimensions to 2 principal components and prepare pretty scatter plot for your data |
multi_imbalance/utils/plot.py
Outdated
| y = pd.DataFrame({'y': y}) | ||
|
|
||
| X_df = pd.DataFrame(data=X, columns=['x1', 'x2']) | ||
| df = pd.concat([X_df, y], axis=1) |
There was a problem hiding this comment.
Why not extract the data preparation to a separate method?
There was a problem hiding this comment.
100% agree that manipulating on data in function for plotting was bad. I decided to change this function to be only for manipulating data and moved rest to notebook
multi_imbalance/resampling/SOUP.py
Outdated
| for sample_id in indices_in_class: | ||
| neighbours_indices = self.neigh_clf.kneighbors([list(X[sample_id])], return_distance=False) | ||
| neighbours_classes = y[neighbours_indices[0]] | ||
| neighbours_quantities = Counter(neighbours_classes) |
There was a problem hiding this comment.
The body of the loop could possibly be extracted as a method
There was a problem hiding this comment.
I agree. I extracted but also decided to don't create unit tests for function only with sklearn knn and built-in Counter - nothing to test ;)
| @@ -0,0 +1,140 @@ | |||
| from collections import Counter, defaultdict | |||
jacekgry
approved these changes
Sep 7, 2019
plutasnyy
commented
Sep 8, 2019
multi_imbalance/resampling/SOUP.py
Outdated
| undersampled_X, undersampled_y = list(), list() | ||
| for idx, _ in safe_levels_list: | ||
| undersampled_X.append(X[idx]) | ||
| undersampled_y.append(y[idx]) |
There was a problem hiding this comment.
Comprehension here
plutasnyy
commented
Sep 8, 2019
setup.py
Outdated
| @@ -21,5 +21,8 @@ | |||
| install_requires=[ | |||
| "numpy>=1.17.0", | |||
| "scikit-learn>=0.21.3", | |||
| "pandas", | |||
| "seaborn", | |||
plutasnyy
commented
Sep 8, 2019
examples/resampling/SOUP.ipynb
Outdated
| "import matplotlib.pyplot as plt\n", | ||
| "\n", | ||
| "%matplotlib inline\n", | ||
| "rc = {'text.color':'white','axes.labelcolor':'white', 'xtick.color':'white','ytick.color':'white'}\n", |
…ng in soup example and added tests for invalid data
hancia
approved these changes
Sep 20, 2019
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.
#6