Skip to content

Commit b417a92

Browse files
committed
Update IIS method and remove redeclaration
1 parent ffcf001 commit b417a92

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/pyscipopt/scip.pxd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,6 @@ cdef extern from "scip/scip.h":
726726
SCIP_Real SCIPgetLocalTransEstimate(SCIP* scip)
727727

728728
# Solve Methods
729-
SCIP_RETCODE SCIPsolve(SCIP* scip)
730729
SCIP_RETCODE SCIPsolve(SCIP* scip) noexcept nogil
731730
SCIP_RETCODE SCIPsolveConcurrent(SCIP* scip)
732731
SCIP_RETCODE SCIPfreeTransform(SCIP* scip)
@@ -1193,7 +1192,7 @@ cdef extern from "scip/scip.h":
11931192

11941193
SCIP_IISFINDERDATA* SCIPiisfinderGetData(SCIP_IISFINDER* iisfinder)
11951194
SCIP_RETCODE SCIPincludeIISfinderGreedy(SCIP* scip)
1196-
SCIP_RETCODE SCIPiisGreedyMinimize(SCIP_IIS* iis);
1195+
SCIP_RETCODE SCIPiisGreedyMakeIrreducible(SCIP_IIS* iis);
11971196

11981197
#Relaxation plugin
11991198
SCIP_RETCODE SCIPincludeRelax(SCIP* scip,

src/pyscipopt/scip.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8660,7 +8660,7 @@ cdef class Model:
86608660
# Perform the greedy deletion algorithm with singleton batches to obtain an irreducible infeasible subsystem (IIS)
86618661
# """
86628662

8663-
# PY_SCIP_CALL(SCIPiisGreedyMinimize(iisfinder._iisfinder))
8663+
# PY_SCIP_CALL(SCIPiisGreedyMakeIrreducible(iisfinder._iisfinder))
86648664

86658665
def includeRelax(self, Relax relax, name, desc, priority=10000, freq=1):
86668666
"""

0 commit comments

Comments
 (0)