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 Jan 27, 2025
2 parents b77bb88 + 27bfd33 commit 951f3dd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Miscellaneous

- the output precision for writing CIP/OPB files has been increased at several places for nonlinear constraints
- the solchecker tool now also supports SCIP solutions without unknown or infinite values
- generate an error for MPS files that use linear constraints in several indicator constraints

Known bugs
----------
Expand Down
13 changes: 11 additions & 2 deletions src/scip/cons_indicator.c
Original file line number Diff line number Diff line change
Expand Up @@ -8587,9 +8587,18 @@ SCIP_RETCODE SCIPcreateConsIndicatorGenericLinConsPure(
for (j = 0; j < nvars; ++j)
{
if ( ! SCIPvarIsIntegral(vars[j]) || ! SCIPisIntegral(scip, vals[j]) )
{
slackvartype = SCIP_VARTYPE_CONTINUOUS;
break;

/* Check whether variable is marked to not be multi-aggregated: this should only be the case for slack variables
* added by the indicator constraint handler. */
if ( SCIPdoNotMultaggrVar(scip, vars[j]) )
{
/* double check name */
if ( strncmp(SCIPvarGetName(vars[j]), "indslack", 8) == 0 )
{
SCIPerrorMessage("Linear constraint <%s> already used in an indicator constraint.\n", SCIPconsGetName(lincons));
return SCIP_INVALIDDATA;
}
}
}

Expand Down

0 comments on commit 951f3dd

Please sign in to comment.