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

scipopt · Oct 10, 2024 · 075776f · 075776f
2 parents be3ef27 + bb6e0d9
commit 075776f
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 38 deletions.
diff --git a/.gitlab/merge_request_templates/Code_Review.md b/.gitlab/merge_request_templates/Code_Review.md
@@ -21,10 +21,9 @@
 ### Testing
 
 * [ ] ctest passes without errors (type some of `jenkins ctest {soplex master,soplex bugfix,cplex,gurobi,mosek,xpress,highs}`).
-* [ ] The performance impact on MILP has been checked (type some of `jenkins performance {mip,mip quick,mip continue}`), **or** the changed code will not be executed for MILP instances, **or** the changed code will not be executed by default.
-* [ ] The performance impact on MINLP has been checked (type some of `jenkins performance {minlp,minlplib,minlp quick,minlp continue}`) **or** the changed code will not be executed by default.
+* [ ] The performance impact has been checked (type some of `jenkins performance {mip,minlp,pb} (quick|continue|)`), **or** the changed code will not be executed by default.
 * [ ] The new code is sufficiently covered by tests (perhaps, new coverage settings or new unit tests have been added).
-* Consider a debug run (type some of `jenkins debug {short,minlp,mip}`).
+* Consider a debug run (type some of `jenkins debug {short,minlp,mip,pb}`).
 
 ### Does this merge request introduce an API change? :warning:
 

diff --git a/doc/xternal.c b/doc/xternal.c
@@ -8799,7 +8799,7 @@
   *   to use SCIP and SCIP-SDP from Matlab and Octave.
   * - <a href="https://github.com/scipopt/JSCIPOpt">JSCIPOpt</a> is an interface for Java.
   * - <a href="https://github.com/scipopt/russcip">Russcip</a> is an interface for Rust.
-  * - <a href="https://github.com/scipopt/SCIPpp">SCIP++</a> is a modeling interfaces for C++.
+  * - <a href="https://github.com/scipopt/SCIPpp">SCIP++</a> is a modeling interface for C++.
   *
   * Contributions to these projects are very welcome.
   *

diff --git a/src/scip/branch_allfullstrong.c b/src/scip/branch_allfullstrong.c
@@ -104,10 +104,6 @@ SCIP_RETCODE branch(
    int npseudocands;
    int npriopseudocands;
    int bestpseudocand;
-#ifndef NDEBUG
-   SCIP_Real cutoffbound;
-   cutoffbound = SCIPgetCutoffbound(scip);
-#endif
 
    assert(branchrule != NULL);
    assert(strcmp(SCIPbranchruleGetName(branchrule), BRANCHRULE_NAME) == 0);
@@ -165,7 +161,7 @@ SCIP_RETCODE branch(
 
          assert(*result == SCIP_DIDNOTRUN);
          assert(0 <= bestpseudocand && bestpseudocand < npseudocands);
-         assert(SCIPisLT(scip, provedbound, cutoffbound));
+         assert(SCIPisLT(scip, provedbound, SCIPgetCutoffbound(scip)));
 
          var = pseudocandscopy[bestpseudocand];
 
@@ -316,10 +312,6 @@ SCIP_RETCODE SCIPselectVarPseudoStrongBranching(
    SCIP_Real lpobjval;
    SCIP_Bool allcolsinlp;
    SCIP_Bool exactsolve;
-#ifndef NDEBUG
-   SCIP_Real cutoffbound;
-   cutoffbound = SCIPgetCutoffbound(scip);
-#endif
 
    assert(scip != NULL);
    assert(pseudocands != NULL);
@@ -442,8 +434,8 @@ SCIP_RETCODE SCIPselectVarPseudoStrongBranching(
          up = MAX(up, lpobjval);
          downgain = down - lpobjval;
          upgain = up - lpobjval;
-         assert(!allcolsinlp || exactsolve || !downvalid || downinf == SCIPisGE(scip, down, cutoffbound));
-         assert(!allcolsinlp || exactsolve || !upvalid || upinf == SCIPisGE(scip, up, cutoffbound));
+         assert(!allcolsinlp || exactsolve || !downvalid || downinf == SCIPisGE(scip, down, SCIPgetCutoffbound(scip)));
+         assert(!allcolsinlp || exactsolve || !upvalid || upinf == SCIPisGE(scip, up, SCIPgetCutoffbound(scip)));
          assert(downinf || !downconflict);
          assert(upinf || !upconflict);
 

diff --git a/src/scip/scip_prob.c b/src/scip/scip_prob.c
@@ -3725,7 +3725,9 @@ SCIP_RETCODE SCIPupdateLocalLowerbound(
 }
 
 /** if given value is tighter (higher for minimization, lower for maximization) than the node's dual bound, sets the
- *  node's dual bound to the new value. Only applicable to non-leafs because the node priority queue remains untouched.
+ *  node's dual bound to the new value.
+ *
+ *  @note must not be used on a leaf because the node priority queue remains untouched
  *
  *  @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
  *          SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -3747,7 +3749,9 @@ SCIP_RETCODE SCIPupdateNodeDualbound(
 }
 
 /** if given value is higher than the node's lower bound (in transformed problem), sets the node's lower bound to the
- *  new value. Only applicable to non-leafs because the node priority queue remains untouched.
+ *  new value.
+ *
+ *  @note must not be used on a leaf because the node priority queue remains untouched
  *
  *  @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
  *          SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.

diff --git a/src/scip/scip_tree.c b/src/scip/scip_tree.c
@@ -424,6 +424,8 @@ SCIP_RETCODE SCIPgetOpenNodesData(
 }
 
 /** cuts off node and whole sub tree from branch and bound tree
+ *
+ *  @note must not be used on a leaf because the node priority queue remains untouched
  *
  *  @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
  *          SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.

diff --git a/src/scip/scip_var.c b/src/scip/scip_var.c
@@ -2946,7 +2946,7 @@ SCIP_RETCODE SCIPgetVarStrongbranchFrac(
 
    assert(var != NULL);
    assert(lperror != NULL);
-   assert(!SCIPtreeProbing(scip->tree)); /* we should not be in strong branching with propagation mode */
+   assert(!SCIPinProbing(scip)); /* we should not be in strong branching with propagation mode */
    assert(var->scip == scip);
 
    SCIP_CALL( SCIPcheckStage(scip, "SCIPgetVarStrongbranchFrac", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
@@ -3044,15 +3044,13 @@ SCIP_RETCODE SCIPgetVarStrongbranchFrac(
    {
       if( !idempotent ) /*lint !e774*/
       {
-         SCIP_CALL( analyzeStrongbranch(scip, var, downinf, upinf, downconflict, upconflict) );
-      }
-      else
-      {
-         if( downinf != NULL )
-            *downinf = localdownvalid && SCIPsetIsGE(scip->set, localdown, scip->lp->cutoffbound);
-         if( upinf != NULL )
-            *upinf = localupvalid && SCIPsetIsGE(scip->set, localup, scip->lp->cutoffbound);
+         SCIP_CALL( analyzeStrongbranch(scip, var, NULL, NULL, downconflict, upconflict) );
       }
+
+      if( downinf != NULL )
+         *downinf = localdownvalid && SCIPsetIsGE(scip->set, localdown, scip->lp->cutoffbound);
+      if( upinf != NULL )
+         *upinf = localupvalid && SCIPsetIsGE(scip->set, localup, scip->lp->cutoffbound);
    }
 
    if( down != NULL )
@@ -3766,11 +3764,12 @@ SCIP_RETCODE SCIPgetVarStrongbranchInt(
    SCIP_Bool localdownvalid;
    SCIP_Bool localupvalid;
 
-   SCIP_CALL( SCIPcheckStage(scip, "SCIPgetVarStrongbranchInt", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
-
+   assert(var != NULL);
    assert(lperror != NULL);
    assert(var->scip == scip);
 
+   SCIP_CALL( SCIPcheckStage(scip, "SCIPgetVarStrongbranchInt", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
+
    lpobjval = SCIPgetLPObjval(scip);
    if( downvalid != NULL )
       *downvalid = FALSE;
@@ -3864,15 +3863,13 @@ SCIP_RETCODE SCIPgetVarStrongbranchInt(
    {
       if( !idempotent ) /*lint !e774*/
       {
-         SCIP_CALL( analyzeStrongbranch(scip, var, downinf, upinf, downconflict, upconflict) );
-      }
-      else
-      {
-         if( downinf != NULL )
-            *downinf = localdownvalid && SCIPsetIsGE(scip->set, localdown, scip->lp->cutoffbound);
-         if( upinf != NULL )
-            *upinf = localupvalid && SCIPsetIsGE(scip->set, localup, scip->lp->cutoffbound);
+         SCIP_CALL( analyzeStrongbranch(scip, var, NULL, NULL, downconflict, upconflict) );
       }
+
+      if( downinf != NULL )
+         *downinf = localdownvalid && SCIPsetIsGE(scip->set, localdown, scip->lp->cutoffbound);
+      if( upinf != NULL )
+         *upinf = localupvalid && SCIPsetIsGE(scip->set, localup, scip->lp->cutoffbound);
    }
 
    if( down != NULL )

diff --git a/src/scip/tree.c b/src/scip/tree.c
@@ -1231,7 +1231,10 @@ SCIP_RETCODE SCIPnodeFree(
    return SCIP_OKAY;
 }
 
-/** cuts off node and whole sub tree from branch and bound tree */
+/** cuts off node and whole sub tree from branch and bound tree
+ *
+ *  @note must not be used on a leaf because the node priority queue remains untouched
+ */
 SCIP_RETCODE SCIPnodeCutoff(
    SCIP_NODE*            node,               /**< node that should be cut off */
    SCIP_SET*             set,                /**< global SCIP settings */
@@ -2377,7 +2380,10 @@ SCIP_RETCODE treeApplyPendingBdchgs(
    return SCIP_OKAY;
 }
 
-/** if given value is larger than the node's lower bound, sets the node's lower bound to the new value */
+/** if given value is larger than the node's lower bound, sets the node's lower bound to the new value
+ *
+ *  @note must not be used on a leaf because the node priority queue remains untouched
+ */
 void SCIPnodeUpdateLowerbound(
    SCIP_NODE*            node,               /**< node to update lower bound for */
    SCIP_STAT*            stat,               /**< problem statistics */