Skip to content

Commit effba23

Browse files
h-g-sCopilot
andcommitted
update CutType C enum in ffi.cdef to match cbcbox 2.908
Removed CT_LaGomory (which no longer exists in cbcbox >= 2.908) and renumbered the subsequent entries (CT_RedSplit..CT_KnapsackCover) to match the current Cbc_C_Interface.h. The Python CutType enum in constants.py already used the new numbering, so the ffi.cdef was the only stale reference. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent d6096f4 commit effba23

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

mip/cbc.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -368,19 +368,18 @@
368368
CT_Probing = 0, /*! Cuts generated evaluating the impact of fixing bounds for integer variables */
369369
CT_Gomory = 1, /*! Gomory cuts obtained from the tableau, implemented by John Forrest */
370370
CT_GMI = 2, /*! Gomory cuts obtained from the tableau, implementation from Giacomo Nannicini focusing on safer cuts */
371-
CT_LaGomory = 3, /*! Additional gomory cuts, simplification of 'A Relax-and-Cut Framework for Gomory's Mixed-Integer Cuts' by Matteo Fischetti & Domenico Salvagnin */
372-
CT_RedSplit = 4, /*! Reduce and split cuts, implemented by Francois Margot */
373-
CT_RedSplitG = 5, /*! Reduce and split cuts, implemented by Giacomo Nannicini */
374-
CT_FlowCover = 6, /*! Flow cover cuts */
375-
CT_MIR = 7, /*! Mixed-integer rounding cuts */
376-
CT_TwoMIR = 8, /*! Two-phase Mixed-integer rounding cuts */
377-
CT_LaTwoMIR = 9, /*! Lagrangean relaxation for two-phase Mixed-integer rounding cuts, as in CT_LaGomory */
378-
CT_LiftAndProject = 10, /*! Lift and project cuts */
379-
CT_ResidualCapacity = 11, /*! Residual capacity cuts */
380-
CT_ZeroHalf = 12, /*! Zero-half cuts */
381-
CT_Clique = 13, /*! Clique cuts */
382-
CT_OddWheel = 14, /*! Lifted odd-hole inequalities */
383-
CT_KnapsackCover = 15, /*! Knapsack cover cuts */
371+
CT_RedSplit = 3, /*! Reduce and split cuts, implemented by Francois Margot */
372+
CT_RedSplitG = 4, /*! Reduce and split cuts, implemented by Giacomo Nannicini */
373+
CT_FlowCover = 5, /*! Flow cover cuts */
374+
CT_MIR = 6, /*! Mixed-integer rounding cuts */
375+
CT_TwoMIR = 7, /*! Two-phase Mixed-integer rounding cuts */
376+
CT_LaTwoMIR = 8, /*! Lagrangean relaxation for two-phase Mixed-integer rounding cuts */
377+
CT_LiftAndProject = 9, /*! Lift and project cuts */
378+
CT_ResidualCapacity = 10, /*! Residual capacity cuts */
379+
CT_ZeroHalf = 11, /*! Zero-half cuts */
380+
CT_Clique = 12, /*! Clique cuts */
381+
CT_OddWheel = 13, /*! Lifted odd-hole inequalities */
382+
CT_KnapsackCover = 14, /*! Knapsack cover cuts */
384383
};
385384
386385
void Cbc_generateCuts( Cbc_Model *cbcModel, enum CutType ct, void *oc, int depth, int pass );

0 commit comments

Comments
 (0)