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

scipopt · Dec 19, 2024 · ca3b387 · ca3b387
2 parents 49cd0df + dc76d68
commit ca3b387
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/scip/cons_nonlinear.c b/src/scip/cons_nonlinear.c
@@ -3469,7 +3469,7 @@ SCIP_RETCODE detectNlhdlrs(
 
    assert(conss != NULL || nconss == 0);
    assert(nconss >= 0);
-   assert(SCIPgetStage(scip) == SCIP_STAGE_PRESOLVING || SCIPgetStage(scip) == SCIP_STAGE_INITSOLVE || SCIPgetStage(scip) == SCIP_STAGE_SOLVING);  /* should only be called in presolve or initsolve or consactive */
+   assert(SCIPgetStage(scip) >= SCIP_STAGE_PRESOLVING && SCIPgetStage(scip) <= SCIP_STAGE_SOLVING);  /* should only be called in presolve or initsolve or consactive */
 
    conshdlrdata = SCIPconshdlrGetData(conshdlr);
    assert(conshdlrdata != NULL);

diff --git a/src/scip/reopt.c b/src/scip/reopt.c
@@ -8163,6 +8163,9 @@ SCIP_RETCODE SCIPreoptSaveGlobalBounds(
    /* store the global bounds */
    for( int i = 0; i < nvars; ++i )
    {
+      if( SCIPvarIsRelaxationOnly(vars[i]) )
+         continue;
+
       assert(!SCIPhashmapExists(reopt->glblb, (void*)vars[i]));
       assert(!SCIPhashmapExists(reopt->glbub, (void*)vars[i]));
 
@@ -8246,6 +8249,9 @@ SCIP_RETCODE SCIPreoptInstallBounds(
       SCIP_Real lb;
       SCIP_Real ub;
 
+      if( SCIPvarIsRelaxationOnly(vars[i]) )
+         continue;
+
       assert(SCIPhashmapExists(reopt->glblb, (void*)vars[i]));
       assert(SCIPhashmapExists(reopt->glbub, (void*)vars[i]));