Skip to content

Commit 9cb6102

Browse files
committed
Merge branch 'fix-safe-success' into 'master'
Fix safe success See merge request integer/scip!3856
2 parents 98fa965 + db453eb commit 9cb6102

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/scip/conflict_general.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,8 @@ SCIP_RETCODE addRowToAggrRow(
834834
else
835835
{
836836
*success = FALSE;
837-
SCIP_CALL( SCIPaggrRowAddRowSafely(set->scip, aggrrow, row, weight, negated ? -1 : 1, success) );
837+
/**@todo add row safely */
838+
/* SCIP_CALL( SCIPaggrRowAddRowSafely(set->scip, aggrrow, row, weight, negated ? -1 : 1, success) ); */
838839
}
839840

840841
SCIPsetDebugMsg(set, " -> add %s row <%s>[%g,%g](lp depth: %d): dual=%g -> dualrhs=%g\n",

src/scip/cuts.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,6 +2897,7 @@ SCIP_RETCODE SCIPaggrRowAddRowSafely(
28972897
int i;
28982898

28992899
assert(SCIPisExact(scip));
2900+
assert(success != NULL);
29002901

29012902
/* update local flag */
29022903
aggrrow->local = aggrrow->local || row->local;
@@ -2981,6 +2982,7 @@ SCIP_RETCODE SCIPaggrRowAddRowSafely(
29812982
QUAD_ASSIGN(aggrrow->rhs, sidevalchg);
29822983

29832984
/* add up coefficients */
2985+
*success = TRUE;
29842986
SCIP_CALL( varVecAddScaledRowCoefsSafely(scip, aggrrow->inds, aggrrow->vals, &aggrrow->nnz, userow, weight, &sidevalchg, success) );
29852987

29862988
sidevalchg += QUAD_TO_DBL(aggrrow->rhs);

0 commit comments

Comments
 (0)