Skip to content

Commit b9c951f

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 0aa0efd + 853582a commit b9c951f

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/scip/tree.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,6 +2130,17 @@ SCIP_RETCODE SCIPnodeAddBoundinfer(
21302130

21312131
assert(!node->active || SCIPnodeGetType(node) == SCIP_NODETYPE_PROBINGNODE);
21322132

2133+
/* compute the child's new lower bound */
2134+
newpseudoobjval = SCIPlpGetModifiedPseudoObjval(lp, set, transprob, var, oldbound, newbound, boundtype);
2135+
2136+
if( SCIPsetIsInfinity(set, newpseudoobjval) )
2137+
{
2138+
SCIPmessageFPrintWarning(set->scip->messagehdlr, "Cutting off node with pseudo objective bound %g larger than numerics/infinity (%g)\n", newpseudoobjval, SCIPsetInfinity(set));
2139+
SCIP_CALL( SCIPnodeCutoff(node, set, stat, eventfilter, tree, transprob, origprob, reopt, lp, blkmem) );
2140+
2141+
return SCIP_OKAY;
2142+
}
2143+
21332144
/* get the solution value of variable in last solved LP on the active path:
21342145
* - if the LP was solved at the current node, the LP values of the columns are valid
21352146
* - if the last solved LP was the one in the current lpstatefork, the LP value in the columns are still valid
@@ -2150,9 +2161,6 @@ SCIP_RETCODE SCIPnodeAddBoundinfer(
21502161
if( SCIPnodeGetType(node) != SCIP_NODETYPE_PROBINGNODE )
21512162
SCIPdomchgAddCurrentCertificateIndex(node->domchg, stat->certificate);
21522163

2153-
/* update the child's lower bound */
2154-
newpseudoobjval = SCIPlpGetModifiedPseudoObjval(lp, set, transprob, var, oldbound, newbound, boundtype);
2155-
21562164
/* print bound to certificate */
21572165
if( set->exact_enable && SCIPisCertified(set->scip)
21582166
&& !SCIPtreeProbing(tree) && newpseudoobjval > SCIPnodeGetLowerbound(node) )
@@ -2169,6 +2177,7 @@ SCIP_RETCODE SCIPnodeAddBoundinfer(
21692177
SCIPrationalSetReal(bound, oldbound);
21702178
}
21712179

2180+
/* update the child's lower bound */
21722181
SCIP_CALL( SCIPnodeUpdateLowerbound(node, stat, set, eventfilter, tree, transprob, origprob, newpseudoobjval, NULL) );
21732182
}
21742183
else

0 commit comments

Comments
 (0)