Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v90-bugfix' into v9-minor
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Apr 8, 2024
2 parents 2da8884 + 5f63f54 commit aac0b62
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/scip/presol_milp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,8 @@ SCIP_DECL_PRESOLEXEC(presolExecMILP)

if( 0 != strncmp(data->filename, DEFAULT_FILENAME_PROBLEM, strlen(DEFAULT_FILENAME_PROBLEM)) )
{
SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL,
" writing transformed problem to %s (only enforced constraints)\n", data->filename);
SCIP_CALL(SCIPwriteTransProblem(scip, data->filename, NULL, FALSE));
}

Expand Down Expand Up @@ -980,7 +982,7 @@ SCIP_RETCODE SCIPincludePresolMILP(
&presoldata->enablesparsify, TRUE, DEFAULT_ENABLESPARSIFY, NULL, NULL) );

SCIP_CALL( SCIPaddStringParam(scip, "presolving/" PRESOL_NAME "/probfilename",
"filename to store the problem before MILP presolving starts",
"filename to store the problem before MILP presolving starts (only enforced constraints)",
&presoldata->filename, TRUE, DEFAULT_FILENAME_PROBLEM, NULL, NULL) );

SCIP_CALL(SCIPaddIntParam(scip, "presolving/" PRESOL_NAME "/verbosity",
Expand Down
1 change: 0 additions & 1 deletion src/scip/prop_symmetry.c
Original file line number Diff line number Diff line change
Expand Up @@ -5280,7 +5280,6 @@ SCIP_RETCODE addOrbitopesDynamic(
consvars[0] = propdata->permvars[varidxmatrix[0][i]];
consvars[1] = propdata->permvars[varidxmatrix[0][i + 1]];

/* enforce, but do not check */
SCIP_CALL( SCIPcreateConsLinear(scip, &cons, name, 2, consvars, conscoefs, -SCIPinfinity(scip), 0.0,
propdata->conssaddlp, propdata->conssaddlp, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE ) );

Expand Down

0 comments on commit aac0b62

Please sign in to comment.