Skip to content

Commit 0b3a23d

Browse files
committed
add other fix for eps-rel
1 parent c188bbc commit 0b3a23d

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

include/proxsuite/proxqp/dense/helpers.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,7 @@ setup( //
437437
.select(qpmodel.l,
438438
Eigen::Matrix<T, Eigen::Dynamic, 1>::Zero(qpmodel.n_in).array() -
439439
T(1.E20));
440-
441-
qpwork.primal_feasibility_rhs_1_eq = infty_norm(qpmodel.b);
442-
qpwork.primal_feasibility_rhs_1_in_u = infty_norm(qpwork.u_scaled);
443-
qpwork.primal_feasibility_rhs_1_in_l = infty_norm(qpwork.l_scaled);
440+
444441
qpwork.dual_feasibility_rhs_2 = infty_norm(qpmodel.g);
445442

446443
switch (preconditioner_status) {

include/proxsuite/proxqp/dense/workspace.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ struct Workspace
7373

7474
//// Relative residuals constants
7575

76-
T primal_feasibility_rhs_1_eq;
77-
T primal_feasibility_rhs_1_in_u;
78-
T primal_feasibility_rhs_1_in_l;
7976
T dual_feasibility_rhs_2;
8077
T correction_guess_rhs_g;
8178
T correction_guess_rhs_b;
@@ -194,9 +191,6 @@ struct Workspace
194191
rhs.setZero();
195192
err.setZero();
196193

197-
primal_feasibility_rhs_1_eq = 0;
198-
primal_feasibility_rhs_1_in_u = 0;
199-
primal_feasibility_rhs_1_in_l = 0;
200194
dual_feasibility_rhs_2 = 0;
201195
correction_guess_rhs_g = 0;
202196
correction_guess_rhs_b = 0;

include/proxsuite/proxqp/sparse/solver.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ qp_solve(Results<T>& results,
519519
{ proxsuite::linalg::sparse::from_eigen, u_scaled_e },
520520
};
521521

522-
T const primal_feasibility_rhs_1_eq = infty_norm(data.b);
523522
T const dual_feasibility_rhs_2 = infty_norm(data.g);
524523

525524
// auto ldl_col_ptrs = work.ldl_col_ptrs_mut();
@@ -756,8 +755,7 @@ qp_solve(Results<T>& results,
756755
if (settings.eps_rel != 0) {
757756
rhs_pri += settings.eps_rel * std::max({
758757
primal_feasibility_eq_rhs_0,
759-
primal_feasibility_in_rhs_0,
760-
primal_feasibility_rhs_1_eq,
758+
primal_feasibility_in_rhs_0
761759
});
762760
}
763761
return primal_feasibility_lhs <= rhs_pri;

0 commit comments

Comments
 (0)