Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v80-bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Jun 30, 2023
2 parents 9ccd2cf + 4b053bb commit 94d725d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/scip/cutsel_hybrid.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,13 @@ SCIP_RETCODE SCIPselectCutsHybrid(

/* if the best cut of the remaining cuts is considered bad, we discard it and all remaining cuts */
if( scores[0] < badscore )
goto TERMINATE;
break;

++(*nselectedcuts);

/* if the maximal number of cuts was selected, we can stop here */
if( *nselectedcuts == maxselectedcuts )
goto TERMINATE;
break;

/* move the pointers to the next position and filter the remaining cuts to enforce the maximum parallelism constraint */
++cuts;
Expand All @@ -517,7 +517,6 @@ SCIP_RETCODE SCIPselectCutsHybrid(
ncuts = filterWithParallelism(selectedcut, cuts, scores, ncuts, goodscore, goodmaxparall, maxparall);
}

TERMINATE:
SCIPfreeBufferArray(scip, &scoresptr);

return SCIP_OKAY;
Expand Down

0 comments on commit 94d725d

Please sign in to comment.