From 3177bf88811ebaab8ca0ad173af9083d4671e354 Mon Sep 17 00:00:00 2001
From: Fabio <miranda.fmm@gmail.com>
Date: Wed, 5 Mar 2025 21:52:08 -0300
Subject: [PATCH 1/2] Fix future warning
---
hiclass/HierarchicalClassifier.py | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/hiclass/HierarchicalClassifier.py b/hiclass/HierarchicalClassifier.py
index c7b5ab36..8b06a374 100644
--- a/hiclass/HierarchicalClassifier.py
+++ b/hiclass/HierarchicalClassifier.py
@@ -11,18 +11,14 @@
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,
- MultiplyCombiner,
-)
-
-from hiclass.probability_combiner import (
- init_strings as probability_combiner_init_strings,
-)
+from hiclass.probability_combiner import (ArithmeticMeanCombiner,
+ GeometricMeanCombiner,
+ MultiplyCombiner)
+from hiclass.probability_combiner import \
+ init_strings as probability_combiner_init_strings
try:
import ray
@@ -173,8 +169,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:
From 97cf27c583ccfa9d47f1e8ae1476d24274e2196a Mon Sep 17 00:00:00 2001
From: Fabio <miranda.fmm@gmail.com>
Date: Wed, 5 Mar 2025 21:53:56 -0300
Subject: [PATCH 2/2] Apply black
---
hiclass/HierarchicalClassifier.py | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/hiclass/HierarchicalClassifier.py b/hiclass/HierarchicalClassifier.py
index 8b06a374..0de6e611 100644
--- a/hiclass/HierarchicalClassifier.py
+++ b/hiclass/HierarchicalClassifier.py
@@ -11,14 +11,21 @@
from joblib import Parallel, delayed
from sklearn.base import BaseEstimator
from sklearn.linear_model import LogisticRegression
-from sklearn.utils.validation import (_check_sample_weight, check_array,
- check_is_fitted, validate_data)
-
-from hiclass.probability_combiner import (ArithmeticMeanCombiner,
- GeometricMeanCombiner,
- MultiplyCombiner)
-from hiclass.probability_combiner import \
- init_strings as probability_combiner_init_strings
+from sklearn.utils.validation import (
+ _check_sample_weight,
+ check_array,
+ check_is_fitted,
+ validate_data,
+)
+
+from hiclass.probability_combiner import (
+ ArithmeticMeanCombiner,
+ GeometricMeanCombiner,
+ MultiplyCombiner,
+)
+from hiclass.probability_combiner import (
+ init_strings as probability_combiner_init_strings,
+)
try:
import ray