Skip to content

Fix future warning #150

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 6, 2025
Merged

Fix future warning #150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3177bf8
Fix future warning
mirand863 Mar 6, 2025
97cf27c
Apply black
mirand863 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions hiclass/HierarchicalClassifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@
from joblib import Parallel, delayed
from sklearn.base import BaseEstimator
from sklearn.linear_model import LogisticRegression
from sklearn.utils.validation import _check_sample_weight
from sklearn.utils.validation import check_array, check_is_fitted
from sklearn.utils.validation import (
_check_sample_weight,
check_array,
check_is_fitted,
validate_data,
)

from hiclass.probability_combiner import (
GeometricMeanCombiner,
ArithmeticMeanCombiner,
GeometricMeanCombiner,
MultiplyCombiner,
)

from hiclass.probability_combiner import (
init_strings as probability_combiner_init_strings,
)
Expand Down Expand Up @@ -173,8 +176,8 @@ def _pre_fit(self, X, y, sample_weight):
# Check that X and y have correct shape
# and convert them to np.ndarray if need be

self.X_, self.y_ = self._validate_data(
X, y, multi_output=True, accept_sparse="csr", allow_nd=True
self.X_, self.y_ = validate_data(
self, X, y, multi_output=True, accept_sparse="csr", allow_nd=True
)

if sample_weight is not None:
Expand Down