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

scipopt · Mar 17, 2024 · 96c9990 · 96c9990
2 parents ae3a309 + c533c8c
commit 96c9990
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/scip/heur_alns.c b/src/scip/heur_alns.c
@@ -616,6 +616,8 @@ void updateFixingRate(
    case SCIP_STATUS_TIMELIMIT:
    case SCIP_STATUS_MEMLIMIT:
    case SCIP_STATUS_GAPLIMIT:
+   case SCIP_STATUS_PRIMALLIMIT:
+   case SCIP_STATUS_DUALLIMIT:
    case SCIP_STATUS_RESTARTLIMIT:
    case SCIP_STATUS_UNBOUNDED:
    default:
@@ -668,17 +670,17 @@ void updateTargetNodeLimit(
    case SCIP_STATUS_INFORUNBD:
    case SCIP_STATUS_SOLLIMIT:
    case SCIP_STATUS_BESTSOLLIMIT:
-      break;
    case SCIP_STATUS_USERINTERRUPT:
    case SCIP_STATUS_TERMINATE:
    case SCIP_STATUS_UNKNOWN:
    case SCIP_STATUS_TOTALNODELIMIT:
    case SCIP_STATUS_TIMELIMIT:
    case SCIP_STATUS_MEMLIMIT:
    case SCIP_STATUS_GAPLIMIT:
+   case SCIP_STATUS_PRIMALLIMIT:
+   case SCIP_STATUS_DUALLIMIT:
    case SCIP_STATUS_RESTARTLIMIT:
    case SCIP_STATUS_UNBOUNDED:
-      break;
    default:
       break;
    }
@@ -760,6 +762,8 @@ void updateMinimumImprovement(
    case SCIP_STATUS_TIMELIMIT:
    case SCIP_STATUS_MEMLIMIT:
    case SCIP_STATUS_GAPLIMIT:
+   case SCIP_STATUS_PRIMALLIMIT:
+   case SCIP_STATUS_DUALLIMIT:
    case SCIP_STATUS_RESTARTLIMIT:
    case SCIP_STATUS_UNBOUNDED:
    case SCIP_STATUS_TERMINATE:

diff --git a/src/scip/heur_localbranching.c b/src/scip/heur_localbranching.c
@@ -476,6 +476,8 @@ SCIP_RETCODE setupAndSolveSubscipLocalbranching(
    case SCIP_STATUS_TIMELIMIT:
    case SCIP_STATUS_MEMLIMIT:
    case SCIP_STATUS_GAPLIMIT:
+   case SCIP_STATUS_PRIMALLIMIT:
+   case SCIP_STATUS_DUALLIMIT:
    case SCIP_STATUS_SOLLIMIT:
    case SCIP_STATUS_RESTARTLIMIT:
    case SCIP_STATUS_UNBOUNDED:

diff --git a/src/scip/heur_scheduler.c b/src/scip/heur_scheduler.c
@@ -649,6 +649,8 @@ void updateFixingRate(
    case SCIP_STATUS_TOTALNODELIMIT:
    case SCIP_STATUS_MEMLIMIT:
    case SCIP_STATUS_GAPLIMIT:
+   case SCIP_STATUS_PRIMALLIMIT:
+   case SCIP_STATUS_DUALLIMIT:
    case SCIP_STATUS_RESTARTLIMIT:
    case SCIP_STATUS_UNBOUNDED:
    default: