From 970d3ec59823a206253428b21c559dd347a9cd5a Mon Sep 17 00:00:00 2001 From: "Sara A. Miskovich" Date: Tue, 26 Mar 2024 16:17:16 -0700 Subject: [PATCH] pass solver correctly to _cvx SD functions --- solardatatools/signal_decompositions.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/solardatatools/signal_decompositions.py b/solardatatools/signal_decompositions.py index 75f7c740..1a102668 100644 --- a/solardatatools/signal_decompositions.py +++ b/solardatatools/signal_decompositions.py @@ -93,6 +93,7 @@ def l2_l1d1_l2d2p365( yearly_periodic=yearly_periodic, return_all=return_all, transition_locs=transition_locs, + solver=solver, verbose=verbose, ) elif yearly_periodic: @@ -172,6 +173,7 @@ def tl1_l2d2p365( w1=w1, yearly_periodic=yearly_periodic, return_all=return_all, + solver=solver, verbose=verbose, ) else: @@ -226,7 +228,8 @@ def l1_l1d1_l2d2p365( if solver == "MOSEK": # MOSEK weights set in CVXPY function res = _cvx_l1_l1d1_l2d2p365( - signal=signal, use_ixs=use_ixs, return_all=return_all, verbose=verbose + signal=signal, use_ixs=use_ixs, return_all=return_all, + solver=solver, verbose=verbose ) else: res = _osd_l1_l1d1_l2d2p365( @@ -264,7 +267,8 @@ def l2_l1d2_constrained( """ if solver == "MOSEK": # MOSEK weights set in CVXPY function - res = _cvx_l2_l1d2_constrained(signal, return_all=return_all, verbose=verbose) + res = _cvx_l2_l1d2_constrained(signal, return_all=return_all, + solver=solver, verbose=verbose) else: res = _osd_l2_l1d2_constrained( signal, w0=w0, w1=w1, return_all=return_all, solver=solver, verbose=verbose