Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed _calc_score for *scikit-learn* version compatibility #1109

Merged
merged 5 commits into from
Nov 5, 2024

Conversation

d-kleine
Copy link
Contributor

@d-kleine d-kleine commented Nov 5, 2024

Description

Refactor _calc_score to accommodate scikit-learn versioning

  • Updated _calc_score to dynamically select the appropriate parameter name ('fit_params' or 'params') for cross_val_score based on the scikit-learn version.
  • Ensures compatibility with both older versions (below 1.4) and newer versions (1.4 and above) of scikit-learn

Related issues or pull requests

fixes #1082

Pull Request Checklist

  • Added a note about the modification or contribution to the ./docs/sources/CHANGELOG.md file (if applicable)
  • Added appropriate unit test functions in the ./mlxtend/*/tests directories (if applicable)
  • Modify documentation in the corresponding Jupyter Notebook under mlxtend/docs/sources/ (if applicable)
  • Ran PYTHONPATH='.' pytest ./mlxtend -sv and make sure that all unit tests pass (for small modifications, it might be sufficient to only run the specific test file, e.g., PYTHONPATH='.' pytest ./mlxtend/classifier/tests/test_stacking_cv_classifier.py -sv)
  • Checked for style issues by running flake8 ./mlxtend

@d-kleine
Copy link
Contributor Author

d-kleine commented Nov 5, 2024

Example code for testing:

import numpy as np
from sklearn.linear_model import LogisticRegression
from mlxtend.feature_selection import SequentialFeatureSelector as SFS

# Generate random values
np.random.seed(42)  # For reproducibility
n_samples = 100     # Number of samples
n_features = 10     # Number of features

# Generate random features (X) and binary target (y)
X_train = np.random.rand(n_samples, n_features)
y_train = np.random.randint(0, 2, size=n_samples)

# Now run Sequential Feature Selection
sfs = SFS(LogisticRegression(),
          k_features=5,          # number of features to select
          forward=True,          # forward selection
          floating=False,        # no floating selection
          scoring='accuracy',
          verbose=5,
          cv=5).fit(X_train, y_train)

This is the issue:
grafik

This is how it looks like after fixing it:
grafik

@d-kleine d-kleine changed the title Sklearn cvscore params Fixed _calc_score for *scikit-learn* version compatibility Nov 5, 2024
@d-kleine
Copy link
Contributor Author

d-kleine commented Nov 5, 2024

@rasbt ready for review

It would be great if a new version of the packages could be released with the recent changes

@d-kleine d-kleine marked this pull request as ready for review November 5, 2024 11:54
Copy link
Owner

@rasbt rasbt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I haven't used sklearn in a while and had no idea this has changed!

@rasbt rasbt merged commit 8e80778 into rasbt:master Nov 5, 2024
2 checks passed
@d-kleine d-kleine deleted the sklearn_cvscore_params branch November 5, 2024 14:09
@rasbt
Copy link
Owner

rasbt commented Nov 5, 2024

It would be great if a new version of the packages could be released with the recent changes

Done!

@d-kleine
Copy link
Contributor Author

d-kleine commented Nov 5, 2024

Done!

Great, thanks! 👍🏻

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use params instead of fit_params (deprecated since 1.4) when calling cross_validate from sklearn
2 participants