Skip to content

Commit 171b8e6

Browse files
committed
clean ups
1 parent 4dd48a0 commit 171b8e6

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

skglm/experimental/pdcd_ws.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def _solve(self, X, y, datafit, penalty, w_init=None, Xw_init=None):
161161
# inplace update of w, Xw, z, z_bar
162162
PDCD_WS._solve_subproblem(
163163
y, X, w, Xw, z, z_bar, datafit, penalty,
164-
primal_steps, dual_step, ws, self.max_epochs, tol_in=0.3*stop_crit, verbose=self.verbose-1)
164+
primal_steps, dual_step, ws, self.max_epochs, tol_in=0.3*stop_crit)
165165

166166
current_p_obj = datafit.value(y, w, Xw) + penalty.value(w)
167167
p_objs.append(current_p_obj)
@@ -179,7 +179,7 @@ def _solve(self, X, y, datafit, penalty, w_init=None, Xw_init=None):
179179
@njit
180180
def _solve_subproblem(
181181
y, X, w, Xw, z, z_bar, datafit, penalty, primal_steps,
182-
dual_step, ws, max_epochs, tol_in, verbose):
182+
dual_step, ws, max_epochs, tol_in):
183183
n_features = X.shape[1]
184184

185185
for epoch in range(max_epochs):
@@ -208,15 +208,6 @@ def _solve_subproblem(
208208
opt_dual_in = _score_dual(y, z, Xw, datafit, dual_step)
209209

210210
stop_crit_in = max(max(opts_primal_in), opt_dual_in)
211-
# if verbose:
212-
# current_p_obj = datafit.value(y, w, X@w) + penalty.value(w)
213-
# print(
214-
# f"|----- epoch {epoch+1}: {current_p_obj:.10f}, "
215-
# f"opt primal: {max(opts_primal_in):.2e}, opt dual: {opt_dual_in:.2e}")
216-
217-
# print(f' epoch {epoch}, inner stopping crit: ', stop_crit_in)
218-
# # print(opt_dual_in)
219-
# # print(opts_primal_in)
220211

221212
if stop_crit_in <= tol_in:
222213
break

0 commit comments

Comments
 (0)