Minor bug fixes

joshivanhoe · Jan 16, 2024 · c0391b2 · c0391b2
1 parent a45c399
commit c0391b2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 42 deletions.
diff --git a/.github/workflows/python-package.yml → .github/workflows/ci.yml b/.github/workflows/python-package.yml → .github/workflows/ci.yml
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
diff --git a/src/sparsely/regressor.py b/src/sparsely/regressor.py
@@ -83,7 +83,6 @@ def fit(self, X: np.ndarray, y: np.ndarray) -> SparseLinearRegressor:
         model.add_linear_constr(sum(selected) <= self.k_)
         model.optimize()
         selected = np.round([model.var_value(var) for var in selected]).astype(bool)
-        model.reset()
 
         # Compute coefficients
         self.coef_ = np.zeros(self.n_features_in_)

diff --git a/src/sparsely/tune.py b/src/sparsely/tune.py
@@ -100,7 +100,8 @@ def tune_estimator(
     search_log = list()
 
     for k in tqdm(
-        range(k_min, k_max or X.shape[0], step_size), disable=not show_progress_bar
+        range(k_min, (k_max or X.shape[1]) + 1, step_size),
+        disable=not show_progress_bar,
     ):
         # Perform cross-validation
         output = cross_validate(

diff --git a/tests/test_tune.py b/tests/test_tune.py
@@ -23,7 +23,7 @@ def test_tune_estimator(
     if return_search_log:
         estimator, search_log = output
         assert isinstance(search_log, pd.DataFrame)
-        assert search_log.columns == ["k", "score", "std"]
+        assert (search_log.columns == ["k", "score", "std"]).all()
         if max_iters_no_improvement is None:
             assert len(search_log) == 5
         else: