Skip to content

FIX: make HuberRegressor accept boolean X #32

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
casey-brooks wants to merge 1 commit into
base: scikit-learn__scikit-learn-13328
Choose a base branch
from
Open

FIX: make HuberRegressor accept boolean X #32

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
4 changes: 3 additions & 1 deletion sklearn/linear_model/huber.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from ..utils import check_consistent_length
from ..utils import axis0_safe_slice
from ..utils.extmath import safe_sparse_dot
from ..utils.validation import FLOAT_DTYPES


def _huber_loss_and_gradient(w, X, y, epsilon, alpha, sample_weight=None):
Expand Down Expand Up @@ -251,7 +252,8 @@ def fit(self, X, y, sample_weight=None):
self : object
"""
X, y = check_X_y(
X, y, copy=False, accept_sparse=['csr'], y_numeric=True)
X, y, copy=False, accept_sparse=['csr'],
y_numeric=True, dtype=FLOAT_DTYPES)
if sample_weight is not None:
sample_weight = np.array(sample_weight)
check_consistent_length(y, sample_weight)
Expand Down
37 changes: 37 additions & 0 deletions sklearn/linear_model/tests/test_huber.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,40 @@ def test_huber_better_r2_score():

# The huber model should also fit poorly on the outliers.
assert_greater(ridge_outlier_score, huber_outlier_score)


def test_huber_bool_X_dense_cast_and_fit():
X, y = make_regression(n_samples=40, n_features=5, noise=2.0,
random_state=0)
X_bool = X > 0
X_float = X_bool.astype(np.float64)

huber_bool = HuberRegressor()
huber_bool.fit(X_bool, y)

huber_float = HuberRegressor()
huber_float.fit(X_float, y)

assert_array_almost_equal(huber_bool.coef_, huber_float.coef_)
assert_almost_equal(huber_bool.intercept_, huber_float.intercept_)
assert_array_almost_equal(huber_bool.predict(X_bool),
huber_float.predict(X_float))


def test_huber_bool_X_sparse_cast_and_fit():
X, y = make_regression(n_samples=40, n_features=5, noise=2.0,
random_state=0)
X_bool = X > 0
X_sparse_bool = sparse.csr_matrix(X_bool)
X_sparse_float = X_sparse_bool.astype(np.float64)

huber_bool = HuberRegressor()
huber_bool.fit(X_sparse_bool, y)

huber_float = HuberRegressor()
huber_float.fit(X_sparse_float, y)

assert_array_almost_equal(huber_bool.coef_, huber_float.coef_)
assert_almost_equal(huber_bool.intercept_, huber_float.intercept_)
assert_array_almost_equal(huber_bool.predict(X_sparse_bool),
huber_float.predict(X_sparse_float))