API transform solver functions into classes (#63)

Co-authored-by: Pierre-Antoine Bannier <[email protected]>
Co-authored-by: Badr MOUFAD <[email protected]>

Author: 3 people

examples/plot_logreg_various_penalties.py

@@ -38,14 +38,14 @@
 clf_enet = GeneralizedLinearEstimator(
     Logistic(),
     L1_plus_L2(alpha, l1_ratio),
-    )
+)
 y_pred_enet = clf_enet.fit(X_train, y_train).predict(X_test)
 f1_score_enet = f1_score(y_test, y_pred_enet)
 
 clf_mcp = GeneralizedLinearEstimator(
     Logistic(),
     MCPenalty(alpha, gamma),
-    )
+)
 y_pred_mcp = clf_mcp.fit(X_train, y_train).predict(X_test)
 f1_score_mcp = f1_score(y_test, y_pred_mcp)
 

examples/plot_sparse_recovery.py

@@ -16,7 +16,7 @@
 from sklearn.metrics import f1_score, mean_squared_error
 
 from skglm.utils import make_correlated_data
-from skglm.solvers import cd_solver_path
+from skglm.solvers import AndersonCD
 from skglm.datafits import Quadratic
 from skglm.utils import compiled_clone
 from skglm.penalties import L1, MCPenalty, L0_5, L2_3, SCAD
@@ -69,11 +69,13 @@
 l0 = {}
 mse_ref = mean_squared_error(np.zeros_like(y_test), y_test)
 
+solver = AndersonCD(ws_strategy="fixpoint", fit_intercept=False)
+
 for idx, estimator in enumerate(penalties.keys()):
     print(f'Running {estimator}...')
-    estimator_path = cd_solver_path(
+    estimator_path = solver.path(
         X, y, compiled_clone(datafit), compiled_clone(penalties[estimator]),
-        alphas=alphas, ws_strategy="fixpoint")
+        alphas=alphas)
 
     f1_temp = np.zeros(n_alphas)
     prediction_error_temp = np.zeros(n_alphas)