Skip to content

Commit 0c7ceed

Browse files
authored
Merge pull request #250 from jcarpent/devel
Update default value for update_preconditioner
2 parents a4ee494 + cd9c17a commit 0c7ceed

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

bindings/python/src/expose-qpobject.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ exposeQpObjectDense(pybind11::module_ m)
175175
pybind11::arg_v("u", nullopt, "lower inequality constraint vector"),
176176
pybind11::arg_v(
177177
"update_preconditioner",
178-
true,
178+
false,
179179
"update the preconditioner considering new matrices entries for "
180180
"reducing ill-conditioning and speeding up solver execution. If set up "
181181
"to false, use previous derived preconditioner."),
@@ -214,7 +214,7 @@ exposeQpObjectDense(pybind11::module_ m)
214214
"u_box", nullopt, "lower box inequality constraint vector"),
215215
pybind11::arg_v(
216216
"update_preconditioner",
217-
true,
217+
false,
218218
"update the preconditioner considering new matrices entries for "
219219
"reducing ill-conditioning and speeding up solver execution. If set up "
220220
"to false, use previous derived preconditioner."),
@@ -312,7 +312,7 @@ exposeQpObjectSparse(pybind11::module_ m)
312312
pybind11::arg_v("u", nullopt, "lower inequality constraint vector"),
313313
pybind11::arg_v(
314314
"update_preconditioner",
315-
true,
315+
false,
316316
"update the preconditioner or re-use previous derived for reducing "
317317
"ill-conditioning and speeding up solver execution."),
318318
pybind11::arg_v("rho", nullopt, "primal proximal parameter"),

cmake-module

doc/2-PROXQP_API/2-ProxQP_api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ In this table you have on the three columns from left to right: the name of the
397397
| mu_update_factor | 0.1 | Factor used for updating mu_eq and mu_in.
398398
| eps_primal_inf | 1.E-4 | Threshold under which primal infeasibility is detected.
399399
| eps_dual_inf | 1.E-4 | Threshold under which dual infeasibility is detected.
400-
| update_preconditioner | True | If set to true, the preconditioner will be re-derived with the update method, otherwise it uses previous one.
400+
| update_preconditioner | False | If set to true, the preconditioner will be re-derived with the update method, otherwise it uses previous one.
401401
| compute_preconditioner | True | If set to true, the preconditioner will be derived with the init method.
402402
| alpha_bcl | 0.1 | alpha parameter of the BCL algorithm.
403403
| beta_bcl | 0.9 | beta parameter of the BCL algorithm.

include/proxsuite/proxqp/dense/wrapper.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ struct QP
715715
optional<MatRef<T>> C,
716716
optional<VecRef<T>> l,
717717
optional<VecRef<T>> u,
718-
bool update_preconditioner = true,
718+
bool update_preconditioner = false,
719719
optional<T> rho = nullopt,
720720
optional<T> mu_eq = nullopt,
721721
optional<T> mu_in = nullopt)
@@ -821,7 +821,7 @@ struct QP
821821
optional<VecRef<T>> u,
822822
optional<VecRef<T>> l_box,
823823
optional<VecRef<T>> u_box,
824-
bool update_preconditioner = true,
824+
bool update_preconditioner = false,
825825
optional<T> rho = nullopt,
826826
optional<T> mu_eq = nullopt,
827827
optional<T> mu_in = nullopt)

include/proxsuite/proxqp/settings.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ struct Settings
170170
* @param initial_guess sets the initial guess option for initilizing x, y
171171
* and z.
172172
* @param update_preconditioner If set to true, the preconditioner will be
173-
* re-derived with the update method.
173+
* re-computed when calling the update method.
174174
* @param compute_preconditioner If set to true, the preconditioner will be
175-
* derived with the init method.
175+
* computed with the init method.
176176
* @param compute_timings If set to true, timings will be computed by the
177177
* solver (setup time, solving time, and run time = setup time + solving
178178
* time).
@@ -228,7 +228,7 @@ struct Settings
228228
// EQUALITY_CONSTRAINED_INITIAL_GUESS,
229229
// as most often we run only
230230
// once a problem
231-
bool update_preconditioner = true,
231+
bool update_preconditioner = false,
232232
bool compute_preconditioner = true,
233233
bool compute_timings = false,
234234
bool check_duality_gap = false,

include/proxsuite/proxqp/sparse/wrapper.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ struct QP
351351
const optional<SparseMat<T, I>> C,
352352
optional<VecRef<T>> l,
353353
optional<VecRef<T>> u,
354-
bool update_preconditioner = true,
354+
bool update_preconditioner = false,
355355
optional<T> rho = nullopt,
356356
optional<T> mu_eq = nullopt,
357357
optional<T> mu_in = nullopt)

0 commit comments

Comments
 (0)