Skip to content

Commit

Permalink
Merge branch '3761-emphasis-optimality-causes-assertion-fail' into 'm…
Browse files Browse the repository at this point in the history
…aster'

fix check of available bestpscand in branch_relpscost.c

Closes #3761

See merge request integer/scip!3529
  • Loading branch information
GioniMexi committed Oct 10, 2024
2 parents 240c7e6 + 6c524fa commit be3ef27
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/scip/branch_relpscost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1233,8 +1233,8 @@ SCIP_RETCODE execRelpscost(
for( c = 0; c < nbranchcands; ++c )
{
if( needsStrongBranching(scip, branchrule, branchcands[c], branchcandsfrac[c],
bestpscand > 0 ? branchcands[bestpscand] : NULL,
bestpscand > 0 ? branchcandsfrac[bestpscand] : 0.0,
bestpscand >= 0 ? branchcands[bestpscand] : NULL,
bestpscand >= 0 ? branchcandsfrac[bestpscand] : 0.0,
reliable, relerrorthreshold, clevel, useancpscost) )
{
useancpscost = FALSE;
Expand Down Expand Up @@ -1336,8 +1336,8 @@ SCIP_RETCODE execRelpscost(
size = MIN(downsize, upsize);

usesb = needsStrongBranching(scip, branchrule, branchcands[c], branchcandsfrac[c],
bestpscand > 0 ? branchcands[bestpscand] : NULL,
bestpscand > 0 ? branchcandsfrac[bestpscand] : 0.0,
bestpscand >= 0 ? branchcands[bestpscand] : NULL,
bestpscand >= 0 ? branchcandsfrac[bestpscand] : 0.0,
reliable, relerrorthreshold, clevel, FALSE);

/* count the number of variables that are completely uninitialized */
Expand Down

0 comments on commit be3ef27

Please sign in to comment.