Merge remote-tracking branch 'origin/v9-minor'

scipopt · Apr 8, 2024 · 1da4f09 · 1da4f09
2 parents e4b587f + aac0b62
commit 1da4f09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/scip/presol_milp.cpp b/src/scip/presol_milp.cpp
@@ -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));
    }
 
@@ -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",

diff --git a/src/scip/prop_symmetry.c b/src/scip/prop_symmetry.c
@@ -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 ) );