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

scipopt · Oct 14, 2024 · a8367b1 · a8367b1
2 parents 00bf61e + 5d215fb
commit a8367b1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 93 deletions.
diff --git a/src/scip/cons_pseudoboolean.c b/src/scip/cons_pseudoboolean.c
@@ -5157,9 +5157,6 @@ SCIP_RETCODE correctConshdlrdata(
             if( !looseorcolumn )
             {
                SCIP_CALL( SCIPsetConsInitial(scip, consanddata->cons, FALSE) );
-#if 0
-               SCIP_CALL( SCIPsetConsSeparated(scip, consanddata->cons, FALSE) );
-#endif
             }
             SCIP_CALL( SCIPsetConsChecked(scip, consanddata->cons, TRUE) );
          }
@@ -5341,9 +5338,6 @@ SCIP_RETCODE updateConsanddataUses(
             if( !looseorcolumn )
             {
                SCIP_CALL( SCIPsetConsInitial(scip, consanddata->cons, FALSE) );
-#if 0
-               SCIP_CALL( SCIPsetConsSeparated(scip, consanddata->cons, FALSE) );
-#endif
             }
             SCIP_CALL( SCIPsetConsChecked(scip, consanddata->cons, TRUE) );
          }
@@ -7246,20 +7240,15 @@ SCIP_RETCODE findAggregation(
                (*ndelconss) += 2;
             }
          }
-#if 0
-         else
-         {
-            /* @todo */
-            /* delete allvars[samepos] from all and-constraints which appear in this pseudoboolean constraint, and delete
-             * all but one of the remaining and-constraint
-             *
-             * it is the same like aggregating linvar with the resultant of the product, which is the same in all and-
-             * constraints without allvars[samepos]
-             *
-             * e.g. x1 + x2*x_3*...x_n + ~x2*x_3*...x_n = 1 => x1 = 1 - x_3*...x_n
-             */
-         }
-#endif
+         /* @todo handle case nvars > 2:
+          * delete allvars[samepos] from all and-constraints which appear in this pseudoboolean constraint, and delete
+          * all but one of the remaining and-constraint
+          *
+          * it is the same as aggregating linvar with the resultant of the product, which is the same in all and-
+          * constraints without allvars[samepos]
+          *
+          * e.g. x1 + x2*x_3*...x_n + ~x2*x_3*...x_n = 1 => x1 = 1 - x_3*...x_n
+          */
       } /*lint !e438*/
       /* we have a constraint in the form of: x1 + x2 * x3 + ~x2 * x3 + ~x2 * ~x3 == 1
        * this leads to the aggregation x1 = x2 * ~x3

diff --git a/src/scip/nlhdlr_perspective.c b/src/scip/nlhdlr_perspective.c
@@ -1241,14 +1241,6 @@ SCIP_DECL_NLHDLRFREEEXPRDATA(nlhdlrFreeExprDataPerspective)
    return SCIP_OKAY;
 }
 
-/** callback to be called in initialization */
-#if 0
-static
-SCIP_DECL_NLHDLRINIT(nlhdlrInitPerspective)
-{  /*lint --e{715}*/
-   return SCIP_OKAY;
-}
-#endif
 
 /** callback to be called in deinitialization */
 static
@@ -1496,18 +1488,6 @@ SCIP_DECL_NLHDLRINITSEPA(nlhdlrInitSepaPerspective)
 }
 
 
-#if 0
-/** separation deinitialization method of a nonlinear handler (called during CONSEXITSOL) */
-static
-SCIP_DECL_NLHDLREXITSEPA(nlhdlrExitSepaPerspective)
-{ /*lint --e{715}*/
-   SCIPerrorMessage("method of perspective nonlinear handler not implemented yet\n");
-   SCIPABORT(); /*lint --e{527}*/
-
-   return SCIP_OKAY;
-}
-#endif
-
 /** nonlinear handler enforcement callback
  *
  * "Perspectivies" cuts produced by other nonlinear handlers.

diff --git a/src/scip/nlhdlr_soc.c b/src/scip/nlhdlr_soc.c
@@ -2404,37 +2404,6 @@ SCIP_DECL_NLHDLRFREEEXPRDATA(nlhdlrFreeExprDataSoc)
    return SCIP_OKAY;
 }
 
-
-/** callback to be called in initialization */
-#if 0
-static
-SCIP_DECL_NLHDLRINIT(nlhdlrInitSoc)
-{  /*lint --e{715}*/
-   SCIPerrorMessage("method of soc nonlinear handler not implemented yet\n");
-   SCIPABORT(); /*lint --e{527}*/
-
-   return SCIP_OKAY;
-}
-#else
-#define nlhdlrInitSoc NULL
-#endif
-
-
-/** callback to be called in deinitialization */
-#if 0
-static
-SCIP_DECL_NLHDLREXIT(nlhdlrExitSoc)
-{  /*lint --e{715}*/
-   SCIPerrorMessage("method of soc nonlinear handler not implemented yet\n");
-   SCIPABORT(); /*lint --e{527}*/
-
-   return SCIP_OKAY;
-}
-#else
-#define nlhdlrExitSoc NULL
-#endif
-
-
 /** callback to detect structure in expression tree */
 static
 SCIP_DECL_NLHDLRDETECT(nlhdlrDetectSoc)
@@ -3164,7 +3133,6 @@ SCIP_RETCODE SCIPincludeNlhdlrSoc(
    SCIPnlhdlrSetCopyHdlr(nlhdlr, nlhdlrCopyhdlrSoc);
    SCIPnlhdlrSetFreeHdlrData(nlhdlr, nlhdlrFreehdlrdataSoc);
    SCIPnlhdlrSetFreeExprData(nlhdlr, nlhdlrFreeExprDataSoc);
-   SCIPnlhdlrSetInitExit(nlhdlr, nlhdlrInitSoc, nlhdlrExitSoc);
    SCIPnlhdlrSetSepa(nlhdlr, nlhdlrInitSepaSoc, nlhdlrEnfoSoc, NULL, nlhdlrExitSepaSoc);
    SCIPnlhdlrSetSollinearize(nlhdlr, nlhdlrSollinearizeSoc);
 

diff --git a/src/scip/prop_probing.c b/src/scip/prop_probing.c
@@ -1292,20 +1292,6 @@ SCIP_RETCODE SCIPapplyProbingVar(
       {
          proplbs[i] = SCIPvarGetLbLocal(vars[i]);
          propubs[i] = SCIPvarGetUbLocal(vars[i]);
-#if 0
-#ifdef SCIP_DEBUG
-         if( SCIPisGT(scip, proplbs[i], SCIPvarGetLbGlobal(vars[i])) )
-         {
-            SCIPdebugMsg(scip, " -> <%s>[%g,%g] >= %g\n", SCIPvarGetName(vars[i]),
-               SCIPvarGetLbGlobal(vars[i]), SCIPvarGetUbGlobal(vars[i]), proplbs[i]);
-         }
-         if( SCIPisLT(scip, propubs[i], SCIPvarGetUbGlobal(vars[i])) )
-         {
-            SCIPdebugMsg(scip, " -> <%s>[%g,%g] <= %g\n", SCIPvarGetName(vars[i]),
-               SCIPvarGetLbGlobal(vars[i]), SCIPvarGetUbGlobal(vars[i]), propubs[i]);
-         }
-#endif
-#endif
       }
    }
 

diff --git a/src/scip/var.c b/src/scip/var.c
@@ -9047,13 +9047,12 @@ SCIP_RETCODE varProcessAddHoleLocal(
    assert(SCIPsetIsEQ(set, newlb, var->locdom.lb));
    assert(SCIPsetIsEQ(set, newub, var->locdom.ub));
 
-#if 0
-   /* issue bound change event */
-   assert(SCIPvarIsTransformed(var) == (var->eventfilter != NULL));
-   if( var->eventfilter != NULL )
-   {
-      SCIP_CALL( varEventLholeAdded(var, blkmem, set, lp, branchcand, eventqueue, left, right) );
-   }
+#ifdef SCIP_DISABLED_CODE
+   /* issue LHOLEADDED event */
+   SCIP_EVENT event;
+   assert(var->eventfilter != NULL);
+   SCIP_CALL( SCIPeventChgType(&event, SCIP_EVENTTYPE_LHOLEADDED) );
+   SCIP_CALL( SCIPeventProcess(&event, set, NULL, NULL, NULL, var->eventfilter) );
 #endif
 
    /* process parent variables */