Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v9-minor'
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Oct 4, 2024
2 parents 1ba27b5 + 24b2354 commit 10a3dd5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ Interface changes

- added SCIPtpiIsAvailable() to check whether a working task processing interface is available (TPI != none)
- added SCIPtpiGetLibraryName() and SCIPtpiGetLibraryDesc()
- SCIPdelCons() can now also be called in SCIP_STAGE_TRANSFORMED

### Command line interface
### Interfaces to external software
Expand Down
3 changes: 2 additions & 1 deletion src/scip/scip_prob.c
Original file line number Diff line number Diff line change
Expand Up @@ -2847,7 +2847,7 @@ SCIP_RETCODE SCIPdelCons(
{
assert(cons != NULL);

SCIP_CALL( SCIPcheckStage(scip, "SCIPdelCons", FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE, FALSE, TRUE, TRUE, FALSE, TRUE, FALSE, FALSE) );
SCIP_CALL( SCIPcheckStage(scip, "SCIPdelCons", FALSE, TRUE, FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, TRUE, FALSE, TRUE, FALSE, FALSE) );

switch( scip->set->stage )
{
Expand All @@ -2859,6 +2859,7 @@ SCIP_RETCODE SCIPdelCons(
/* only added constraints can be removed in (de-)initialization process of presolving, otherwise the reduction
* might be wrong
*/
case SCIP_STAGE_TRANSFORMED:
case SCIP_STAGE_INITPRESOLVE:
case SCIP_STAGE_EXITPRESOLVE:
assert(SCIPconsIsAdded(cons));
Expand Down

0 comments on commit 10a3dd5

Please sign in to comment.