Skip to content

Update data validation function during fit #285

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

Open
pedrobslima wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update data validation function during fit #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions deslib/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from sklearn.neighbors import KNeighborsClassifier
from sklearn.preprocessing import LabelEncoder, normalize
from sklearn.utils.validation import (check_X_y, check_is_fitted, check_array,
check_random_state)
check_random_state, validate_data)

from deslib.util import KNNE
from deslib.util import faiss_knn_wrapper
Expand Down Expand Up @@ -83,7 +83,8 @@ class labels of each example in X.
self
"""
self.random_state_ = check_random_state(self.random_state)
X, y = self._validate_data(
X, y = validate_data(
self,
X,
y,
accept_sparse="csr",
Expand Down
5 changes: 3 additions & 2 deletions deslib/static/oracle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# License: BSD 3 clause

import numpy as np
from sklearn.utils.validation import check_X_y, check_array
from sklearn.utils.validation import check_X_y, check_array, validate_data

from deslib.static.base import BaseStaticEnsemble

Expand Down Expand Up @@ -68,7 +68,8 @@ class labels of each example in X.
self : object
Returns self.
"""
X, y = self._validate_data(
X, y = validate_data(
self,
X,
y,
accept_sparse="csr",
Expand Down
5 changes: 3 additions & 2 deletions deslib/static/single_best.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np
from sklearn.metrics import check_scoring
from sklearn.utils.validation import check_X_y, check_is_fitted, check_array
from sklearn.utils.validation import check_X_y, check_is_fitted, check_array, validate_data

from .base import BaseStaticEnsemble

Expand Down Expand Up @@ -74,7 +74,8 @@ def fit(self, X, y):
class labels of each example in X.

"""
X, y = self._validate_data(
X, y = validate_data(
self,
X,
y,
accept_sparse="csr",
Expand Down
5 changes: 3 additions & 2 deletions deslib/static/stacked.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
from sklearn.linear_model import LogisticRegression
from sklearn.utils.validation import check_X_y, check_array, check_is_fitted
from sklearn.utils.validation import check_X_y, check_array, check_is_fitted, validate_data

from deslib.static.base import BaseStaticEnsemble

Expand Down Expand Up @@ -70,7 +70,8 @@ def fit(self, X, y):
class labels of each example in X.

"""
X, y = self._validate_data(
X, y = validate_data(
self,
X,
y,
accept_sparse="csr",
Expand Down
5 changes: 3 additions & 2 deletions deslib/static/static_selection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np
from sklearn.metrics import check_scoring
from sklearn.utils.validation import check_is_fitted, check_X_y, check_array
from sklearn.utils.validation import check_is_fitted, check_X_y, check_array, validate_data

from deslib.util.aggregation import majority_voting_rule
from deslib.util.aggregation import predict_proba_ensemble
Expand Down Expand Up @@ -86,7 +86,8 @@ class labels of each example in X.
self : object
Returns self.
"""
X, y = self._validate_data(
X, y = validate_data(
self,
X,
y,
accept_sparse="csr",
Expand Down