Skip to content

Commit

Permalink
Auto code format (#88)
Browse files Browse the repository at this point in the history
Co-authored-by: Mamba413 <[email protected]>
  • Loading branch information
github-actions[bot] and Mamba413 authored Apr 25, 2024
1 parent 1cde6ef commit 946d75e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
2 changes: 2 additions & 0 deletions pytest/test_skmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ def make_Clayton2_data(n, theta=15, lambda1=1, lambda2=1, c1=1, c2=1):

test_MultivariateFailure()


def test_IsotonicRegression():
# check_estimator(IsotonicRegression())
np.random.seed(0)
Expand All @@ -213,4 +214,5 @@ def test_IsotonicRegression():
X_new = model.transform(X)
print("IsotonicRegression passed test!")


test_IsotonicRegression()
23 changes: 11 additions & 12 deletions skscope/skmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,10 @@ def score(self, X, y, delta, sample_weight=None):
score = np.mean(tmp * delta)
return score


class IsotonicRegression(BaseEstimator):
r"""
Isotonic regression.
Isotonic regression.
Parameters
-----------
Expand All @@ -562,7 +563,7 @@ class IsotonicRegression(BaseEstimator):
}

def __init__(
self,
self,
sparsity=5,
):
self.sparsity = sparsity
Expand All @@ -576,11 +577,11 @@ def _check_input_data_shape(self, X):
raise ValueError(msg)

def fit(
self,
X,
self,
X,
y,
sample_weight=None,
):
):
"""Fit the model using X, y as training data.
Parameters
Expand Down Expand Up @@ -615,17 +616,15 @@ def fit(

def isotonic_loss(params):
return jnp.sum(jnp.square(y - jnp.cumsum(jnp.abs(params))))

solver = ScopeSolver(n, sparsity=self.sparsity)
self.params = solver.solve(isotonic_loss)
y_pred = np.cumsum(np.abs(self.params))
self.f_ = interpolate.interp1d(
X, y_pred, kind="linear"
)
self.f_ = interpolate.interp1d(X, y_pred, kind="linear")
return self


def transform(
self,
self,
X,
):
"""Transform new data by linear interpolation.
Expand Down Expand Up @@ -678,7 +677,7 @@ def score(self, X, y, sample_weight=None):
:math:`R^2` of ``self.predict(X)`` w.r.t. `y`.
"""
check_is_fitted(self)

y_pred = self.predict(X)
score = r2_score(y, y_pred, sample_weight=sample_weight)
return score
Expand All @@ -697,4 +696,4 @@ def predict(self, X):
Transformed data.
"""
y_pred = self.transform(X)
return y_pred
return y_pred

0 comments on commit 946d75e

Please sign in to comment.