Skip to content

Commit faa4f79

Browse files
authored
Merge pull request #258 from Bambade/fix_typo_rel
Fix typo #254
2 parents 7374db8 + 5496b15 commit faa4f79

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

include/proxsuite/proxqp/dense/utils.hpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,18 @@ global_primal_residual(const Model<T>& qpmodel,
217217
helpers::negative_part(
218218
qpwork.primal_residual_in_scaled_up.head(qpmodel.n_in) - qpmodel.l);
219219
if (box_constraints) {
220-
primal_feasibility_in_rhs_0 = std::max(
221-
primal_feasibility_in_rhs_0, infty_norm(qpresults.si.tail(qpmodel.dim)));
222220
qpresults.si.tail(qpmodel.dim) =
223221
helpers::positive_part(
224222
qpwork.primal_residual_in_scaled_up.tail(qpmodel.dim) - qpmodel.u_box) +
225223
helpers::negative_part(
226224
qpwork.primal_residual_in_scaled_up.tail(qpmodel.dim) - qpmodel.l_box);
225+
qpwork.active_part_z.tail(qpmodel.dim) =
226+
qpresults.x - qpresults.si.tail(qpmodel.dim);
227+
primal_feasibility_in_rhs_0 =
228+
std::max(primal_feasibility_in_rhs_0,
229+
infty_norm(qpwork.active_part_z.tail(qpmodel.dim)));
230+
primal_feasibility_in_rhs_0 =
231+
std::max(primal_feasibility_in_rhs_0, infty_norm(qpresults.x));
227232
}
228233
// qpwork.primal_residual_eq_scaled -= qpmodel.b;
229234
qpresults.se -= qpmodel.b;

0 commit comments

Comments
 (0)