diff --git a/CHANGELOG.md b/CHANGELOG.md index b2beeb90e..63844baf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added tests for `getObjVal()` and `getVal()` - Added `addConsLinear()` to add linear constraints from variables and coefficients without building an expression - Added `SCIP_BOUNDTYPE` and `SCIP_BOUNDCHGTYPE` enums +- Added missing SCIP constants: `SCIP_EVENTTYPE.TYPECHANGED`/`IMPLTYPECHANGED`, `SCIP_PROPTIMING.NONE`/`ALWAYS`, `SCIP_PRESOLTIMING.FINAL`/`ALWAYS`/`MAX`, `SCIP_HEURTIMING.NONE`/`AFTERNODE`/`AFTERPLUNGE`, `SCIP_RESULT.DELAYNODE`, `SCIP_ROWORIGINTYPE.CONSHDLR` ### Fixed - Fixed `MatrixVariable.varMayRound()` rounding direction - Fixed `lotsizing_lazy` example: lock the handler's variables in `conslock` so presolve cannot aggregate them away (#1252) @@ -17,6 +18,7 @@ - Fixed `getDualsolKnapsack()` and `getDualfarkasKnapsack()` returning 0 for original constraints, and the handler check in `getVarsAnd()` that could never fail ### Changed - Replaced SCIP constant classes with `IntEnum` and `IntFlag`, including enum return values and type annotations (#1286). +- Speed up enum-returning getters and plugin callbacks with precomputed lookup tables - Replaced `format()` with f-strings in examples - Refactor general expression conversion into per-class `to_scip_expr` recursion - Made expression fields read-only to prevent accidental runtime modification diff --git a/src/pyscipopt/benders.pxi b/src/pyscipopt/benders.pxi index 2d0d77c23..f2d445449 100644 --- a/src/pyscipopt/benders.pxi +++ b/src/pyscipopt/benders.pxi @@ -135,7 +135,7 @@ cdef SCIP_RETCODE PyBendersPresubsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_ solution = None else: solution = Solution.create(scip, sol) - enfotype = PY_SCIP_BENDERSENFOTYPE(type) + enfotype = _ENUMS[PY_SCIP_BENDERSENFOTYPE][type] result_dict = PyBenders.benderspresubsolve(solution, enfotype, checkint) infeasible[0] = result_dict.get("infeasible", False) auxviol[0] = result_dict.get("auxviol", False) @@ -179,7 +179,7 @@ cdef SCIP_RETCODE PyBendersPostsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_SO solution = None else: solution = Solution.create(scip, sol) - enfotype = PY_SCIP_BENDERSENFOTYPE(type) + enfotype = _ENUMS[PY_SCIP_BENDERSENFOTYPE][type] mergecandidates = [] for i in range(nmergecands): mergecandidates.append(mergecands[i]) diff --git a/src/pyscipopt/benderscut.pxi b/src/pyscipopt/benderscut.pxi index b880faf04..d44cb7094 100644 --- a/src/pyscipopt/benderscut.pxi +++ b/src/pyscipopt/benderscut.pxi @@ -69,7 +69,7 @@ cdef SCIP_RETCODE PyBenderscutExec (SCIP* scip, SCIP_BENDERS* benders, SCIP_BEND solution = None else: solution = Solution.create(scip, sol) - enfotype = PY_SCIP_BENDERSENFOTYPE(type) + enfotype = _ENUMS[PY_SCIP_BENDERSENFOTYPE][type] result_dict = PyBenderscut.benderscutexec(solution, probnumber, enfotype) result[0] = result_dict.get("result", result[0]) return SCIP_OKAY diff --git a/src/pyscipopt/conshdlr.pxi b/src/pyscipopt/conshdlr.pxi index 245db97ce..48e78f6bb 100644 --- a/src/pyscipopt/conshdlr.pxi +++ b/src/pyscipopt/conshdlr.pxi @@ -327,7 +327,7 @@ cdef SCIP_RETCODE PyConsProp (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS** c constraints = [] for i in range(nconss): constraints.append(getPyCons(conss[i])) - result_dict = PyConshdlr.consprop(constraints, nusefulconss, nmarkedconss, PY_SCIP_PROPTIMING(proptiming)) + result_dict = PyConshdlr.consprop(constraints, nusefulconss, nmarkedconss, _ENUMS[PY_SCIP_PROPTIMING][proptiming]) result[0] = result_dict.get("result", result[0]) return SCIP_OKAY @@ -353,8 +353,8 @@ cdef SCIP_RETCODE PyConsPresol (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS** result_dict["nupgdconss"] = nupgdconss[0] result_dict["nchgcoefs"] = nchgcoefs[0] result_dict["nchgsides"] = nchgsides[0] - result_dict["result"] = PY_SCIP_RESULT(result[0]) - PyConshdlr.conspresol(constraints, nrounds, PY_SCIP_PRESOLTIMING(presoltiming), + result_dict["result"] = _ENUMS[PY_SCIP_RESULT][result[0]] + PyConshdlr.conspresol(constraints, nrounds, _ENUMS[PY_SCIP_PRESOLTIMING][presoltiming], nnewfixedvars, nnewaggrvars, nnewchgvartypes, nnewchgbds, nnewholes, nnewdelconss, nnewaddconss, nnewupgdconss, nnewchgcoefs, nnewchgsides, result_dict) result[0] = result_dict["result"] @@ -379,10 +379,10 @@ cdef SCIP_RETCODE PyConsResprop (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS* cdef SCIP_RETCODE PyConsLock (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS* cons, SCIP_LOCKTYPE locktype, int nlockspos, int nlocksneg) noexcept with gil: PyConshdlr = getPyConshdlr(conshdlr) if cons == NULL: - PyConshdlr.conslock(None, PY_SCIP_LOCKTYPE(locktype), nlockspos, nlocksneg) + PyConshdlr.conslock(None, _ENUMS[PY_SCIP_LOCKTYPE][locktype], nlockspos, nlocksneg) else: PyCons = getPyCons(cons) - PyConshdlr.conslock(PyCons, PY_SCIP_LOCKTYPE(locktype), nlockspos, nlocksneg) + PyConshdlr.conslock(PyCons, _ENUMS[PY_SCIP_LOCKTYPE][locktype], nlockspos, nlocksneg) return SCIP_OKAY cdef SCIP_RETCODE PyConsActive (SCIP* scip, SCIP_CONSHDLR* conshdlr, SCIP_CONS* cons) noexcept with gil: diff --git a/src/pyscipopt/lp.pxi b/src/pyscipopt/lp.pxi index 6ff4723fd..b4da92373 100644 --- a/src/pyscipopt/lp.pxi +++ b/src/pyscipopt/lp.pxi @@ -550,8 +550,8 @@ cdef class LP: PY_SCIP_CALL(SCIPlpiGetBase(self.lpi, c_cstat, c_rstat)) - cstat = [PY_SCIP_BASESTAT(c_cstat[i]) for i in range(ncols)] - rstat = [PY_SCIP_BASESTAT(c_rstat[i]) for i in range(nrows)] + cstat = [_ENUMS[PY_SCIP_BASESTAT][c_cstat[i]] for i in range(ncols)] + rstat = [_ENUMS[PY_SCIP_BASESTAT][c_rstat[i]] for i in range(nrows)] free(c_rstat) free(c_cstat) diff --git a/src/pyscipopt/presol.pxi b/src/pyscipopt/presol.pxi index 1c608ffe6..cb92a80e5 100644 --- a/src/pyscipopt/presol.pxi +++ b/src/pyscipopt/presol.pxi @@ -76,7 +76,7 @@ cdef SCIP_RETCODE PyPresolExec (SCIP* scip, SCIP_PRESOL* presol, int nrounds, SC cdef SCIP_PRESOLDATA* presoldata presoldata = SCIPpresolGetData(presol) PyPresol = presoldata - result_dict = PyPresol.presolexec(nrounds, PY_SCIP_PRESOLTIMING(presoltiming)) + result_dict = PyPresol.presolexec(nrounds, _ENUMS[PY_SCIP_PRESOLTIMING][presoltiming]) result[0] = result_dict.get("result", result[0]) nfixedvars[0] += result_dict.get("nnewfixedvars", 0) naggrvars[0] += result_dict.get("nnewaggrvars", 0) diff --git a/src/pyscipopt/propagator.pxi b/src/pyscipopt/propagator.pxi index e09aa24ab..d4967ea5f 100644 --- a/src/pyscipopt/propagator.pxi +++ b/src/pyscipopt/propagator.pxi @@ -117,8 +117,8 @@ cdef SCIP_RETCODE PyPropPresol (SCIP* scip, SCIP_PROP* prop, int nrounds, SCIP_P result_dict["nupgdconss"] = nupgdconss[0] result_dict["nchgcoefs"] = nchgcoefs[0] result_dict["nchgsides"] = nchgsides[0] - result_dict["result"] = PY_SCIP_RESULT(result[0]) - PyProp.proppresol(nrounds, PY_SCIP_PRESOLTIMING(presoltiming), + result_dict["result"] = _ENUMS[PY_SCIP_RESULT][result[0]] + PyProp.proppresol(nrounds, _ENUMS[PY_SCIP_PRESOLTIMING][presoltiming], nnewfixedvars, nnewaggrvars, nnewchgvartypes, nnewchgbds, nnewholes, nnewdelconss, nnewaddconss, nnewupgdconss, nnewchgcoefs, nnewchgsides, result_dict) result[0] = result_dict["result"] @@ -138,7 +138,7 @@ cdef SCIP_RETCODE PyPropExec (SCIP* scip, SCIP_PROP* prop, SCIP_PROPTIMING propt cdef SCIP_PROPDATA* propdata propdata = SCIPpropGetData(prop) PyProp = propdata - returnvalues = PyProp.propexec(PY_SCIP_PROPTIMING(proptiming)) + returnvalues = PyProp.propexec(_ENUMS[PY_SCIP_PROPTIMING][proptiming]) result_dict = returnvalues result[0] = result_dict.get("result", result[0]) return SCIP_OKAY @@ -154,7 +154,7 @@ cdef SCIP_RETCODE PyPropResProp (SCIP* scip, SCIP_PROP* prop, SCIP_VAR* infervar #TODO: parse bdchgidx? PyProp = propdata - returnvalues = PyProp.propresprop(confvar, inferinfo, PY_SCIP_BOUNDTYPE(boundtype), relaxedbd) + returnvalues = PyProp.propresprop(confvar, inferinfo, _ENUMS[PY_SCIP_BOUNDTYPE][boundtype], relaxedbd) result_dict = returnvalues result[0] = result_dict.get("result", result[0]) return SCIP_OKAY diff --git a/src/pyscipopt/scip.pxd b/src/pyscipopt/scip.pxd index d298abc12..ccd73cdf3 100644 --- a/src/pyscipopt/scip.pxd +++ b/src/pyscipopt/scip.pxd @@ -76,6 +76,7 @@ cdef extern from "scip/scip.h": SCIP_RESULT SCIP_FOUNDSOL SCIP_RESULT SCIP_SUSPENDED SCIP_RESULT SCIP_SUCCESS + SCIP_RESULT SCIP_DELAYNODE ctypedef int SCIP_STATUS cdef extern from "scip/type_stat.h": @@ -165,6 +166,8 @@ cdef extern from "scip/scip.h": SCIP_PROPTIMING SCIP_PROPTIMING_DURINGLPLOOP SCIP_PROPTIMING SCIP_PROPTIMING_AFTERLPLOOP SCIP_PROPTIMING SCIP_PROPTIMING_AFTERLPNODE + SCIP_PROPTIMING SCIP_PROPTIMING_NONE + SCIP_PROPTIMING SCIP_PROPTIMING_ALWAYS ctypedef unsigned long SCIP_PRESOLTIMING cdef extern from "scip/type_timing.h": @@ -172,6 +175,9 @@ cdef extern from "scip/scip.h": SCIP_PRESOLTIMING SCIP_PRESOLTIMING_FAST SCIP_PRESOLTIMING SCIP_PRESOLTIMING_MEDIUM SCIP_PRESOLTIMING SCIP_PRESOLTIMING_EXHAUSTIVE + SCIP_PRESOLTIMING SCIP_PRESOLTIMING_FINAL + SCIP_PRESOLTIMING SCIP_PRESOLTIMING_ALWAYS + SCIP_PRESOLTIMING SCIP_PRESOLTIMING_MAX ctypedef unsigned long SCIP_HEURTIMING cdef extern from "scip/type_timing.h": @@ -186,6 +192,9 @@ cdef extern from "scip/scip.h": SCIP_HEURTIMING SCIP_HEURTIMING_BEFOREPRESOL SCIP_HEURTIMING SCIP_HEURTIMING_DURINGPRESOLLOOP SCIP_HEURTIMING SCIP_HEURTIMING_AFTERPROPLOOP + SCIP_HEURTIMING SCIP_HEURTIMING_NONE + SCIP_HEURTIMING SCIP_HEURTIMING_AFTERNODE + SCIP_HEURTIMING SCIP_HEURTIMING_AFTERPLUNGE ctypedef int SCIP_EXPR cdef extern from "scip/type_expr.h": @@ -257,6 +266,8 @@ cdef extern from "scip/scip.h": SCIP_EVENTTYPE SCIP_EVENTTYPE_VARFIXED SCIP_EVENTTYPE SCIP_EVENTTYPE_VARUNLOCKED SCIP_EVENTTYPE SCIP_EVENTTYPE_OBJCHANGED + SCIP_EVENTTYPE SCIP_EVENTTYPE_TYPECHANGED + SCIP_EVENTTYPE SCIP_EVENTTYPE_IMPLTYPECHANGED SCIP_EVENTTYPE SCIP_EVENTTYPE_GLBCHANGED SCIP_EVENTTYPE SCIP_EVENTTYPE_GUBCHANGED SCIP_EVENTTYPE SCIP_EVENTTYPE_LBTIGHTENED @@ -360,6 +371,7 @@ cdef extern from "scip/scip.h": ctypedef int SCIP_ROWORIGINTYPE cdef extern from "scip/type_lp.h": SCIP_ROWORIGINTYPE SCIP_ROWORIGINTYPE_UNSPEC + SCIP_ROWORIGINTYPE SCIP_ROWORIGINTYPE_CONSHDLR SCIP_ROWORIGINTYPE SCIP_ROWORIGINTYPE_CONS SCIP_ROWORIGINTYPE SCIP_ROWORIGINTYPE_SEPA SCIP_ROWORIGINTYPE SCIP_ROWORIGINTYPE_REOPT diff --git a/src/pyscipopt/scip.pxi b/src/pyscipopt/scip.pxi index 78837353c..f4ef4e1e8 100644 --- a/src/pyscipopt/scip.pxi +++ b/src/pyscipopt/scip.pxi @@ -102,6 +102,7 @@ class PY_SCIP_RESULT(_ScipEnum): FOUNDSOL = SCIP_FOUNDSOL SUSPENDED = SCIP_SUSPENDED SUCCESS = SCIP_SUCCESS + DELAYNODE = SCIP_DELAYNODE class PY_SCIP_PARAMSETTING(_ScipEnum): DEFAULT = SCIP_PARAMSETTING_DEFAULT @@ -206,12 +207,17 @@ class PY_SCIP_PROPTIMING(_ScipFlag): DURINGLPLOOP = SCIP_PROPTIMING_DURINGLPLOOP AFTERLPLOOP = SCIP_PROPTIMING_AFTERLPLOOP AFTERLPNODE = SCIP_PROPTIMING_AFTERLPNODE + NONE = SCIP_PROPTIMING_NONE + ALWAYS = SCIP_PROPTIMING_ALWAYS class PY_SCIP_PRESOLTIMING(_ScipFlag): NONE = SCIP_PRESOLTIMING_NONE FAST = SCIP_PRESOLTIMING_FAST MEDIUM = SCIP_PRESOLTIMING_MEDIUM EXHAUSTIVE = SCIP_PRESOLTIMING_EXHAUSTIVE + FINAL = SCIP_PRESOLTIMING_FINAL + ALWAYS = SCIP_PRESOLTIMING_ALWAYS + MAX = SCIP_PRESOLTIMING_MAX class PY_SCIP_HEURTIMING(_ScipFlag): BEFORENODE = SCIP_HEURTIMING_BEFORENODE @@ -225,6 +231,9 @@ class PY_SCIP_HEURTIMING(_ScipFlag): BEFOREPRESOL = SCIP_HEURTIMING_BEFOREPRESOL DURINGPRESOLLOOP = SCIP_HEURTIMING_DURINGPRESOLLOOP AFTERPROPLOOP = SCIP_HEURTIMING_AFTERPROPLOOP + NONE = SCIP_HEURTIMING_NONE + AFTERNODE = SCIP_HEURTIMING_AFTERNODE + AFTERPLUNGE = SCIP_HEURTIMING_AFTERPLUNGE class PY_SCIP_EVENTTYPE(_ScipFlag): DISABLED = SCIP_EVENTTYPE_DISABLED @@ -233,6 +242,8 @@ class PY_SCIP_EVENTTYPE(_ScipFlag): VARFIXED = SCIP_EVENTTYPE_VARFIXED VARUNLOCKED = SCIP_EVENTTYPE_VARUNLOCKED OBJCHANGED = SCIP_EVENTTYPE_OBJCHANGED + TYPECHANGED = SCIP_EVENTTYPE_TYPECHANGED + IMPLTYPECHANGED = SCIP_EVENTTYPE_IMPLTYPECHANGED GLBCHANGED = SCIP_EVENTTYPE_GLBCHANGED GUBCHANGED = SCIP_EVENTTYPE_GUBCHANGED LBTIGHTENED = SCIP_EVENTTYPE_LBTIGHTENED @@ -327,10 +338,11 @@ class PY_SCIP_BENDERSENFOTYPE(_ScipEnum): CHECK = SCIP_BENDERSENFOTYPE_CHECK class PY_SCIP_ROWORIGINTYPE(_ScipEnum): - UNSPEC = SCIP_ROWORIGINTYPE_UNSPEC - CONS = SCIP_ROWORIGINTYPE_CONS - SEPA = SCIP_ROWORIGINTYPE_SEPA - REOPT = SCIP_ROWORIGINTYPE_REOPT + UNSPEC = SCIP_ROWORIGINTYPE_UNSPEC + CONSHDLR = SCIP_ROWORIGINTYPE_CONSHDLR + CONS = SCIP_ROWORIGINTYPE_CONS + SEPA = SCIP_ROWORIGINTYPE_SEPA + REOPT = SCIP_ROWORIGINTYPE_REOPT class PY_SCIP_SOLORIGIN(_ScipEnum): ORIGINAL = SCIP_SOLORIGIN_ORIGINAL @@ -342,6 +354,12 @@ class PY_SCIP_SOLORIGIN(_ScipEnum): PARTIAL = SCIP_SOLORIGIN_PARTIAL UNKNOWN = SCIP_SOLORIGIN_UNKNOWN +cdef dict _ENUMS = { + cls: {m.value: m for m in cls.__members__.values()} + for cls in _ScipEnum.__subclasses__() + _ScipFlag.__subclasses__() +} +cdef dict _STAGE_NAMES = {v: m.name for v, m in _ENUMS[PY_SCIP_STAGE].items()} + def PY_SCIP_CALL(SCIP_RETCODE rc): if rc == SCIP_OKAY: pass @@ -417,7 +435,7 @@ cdef class Event: PY_SCIP_EVENTTYPE """ - return PY_SCIP_EVENTTYPE(SCIPeventGetType(self.event)) + return _ENUMS[PY_SCIP_EVENTTYPE][SCIPeventGetType(self.event)] def getName(self): """ @@ -872,7 +890,7 @@ cdef class Row: PY_SCIP_ROWORIGINTYPE """ - return PY_SCIP_ROWORIGINTYPE(SCIProwGetOrigintype(self.scip_row)) + return _ENUMS[PY_SCIP_ROWORIGINTYPE][SCIProwGetOrigintype(self.scip_row)] def getConsOriginConshdlrtype(self): """ @@ -1160,7 +1178,7 @@ cdef class Solution: ------- PY_SCIP_SOLORIGIN """ - return PY_SCIP_SOLORIGIN(SCIPsolGetOrigin(self.sol)) + return _ENUMS[PY_SCIP_SOLORIGIN][SCIPsolGetOrigin(self.sol)] def retransform(self): """ retransforms solution to original problem space """ @@ -1242,7 +1260,7 @@ cdef class BoundChange: BRANCHING, CONSINFER or PROPINFER """ - return PY_SCIP_BOUNDCHGTYPE(SCIPboundchgGetBoundchgtype(self.scip_boundchg)) + return _ENUMS[PY_SCIP_BOUNDCHGTYPE][SCIPboundchgGetBoundchgtype(self.scip_boundchg)] def getBoundtype(self): """ @@ -1254,7 +1272,7 @@ cdef class BoundChange: LOWER or UPPER """ - return PY_SCIP_BOUNDTYPE(SCIPboundchgGetBoundtype(self.scip_boundchg)) + return _ENUMS[PY_SCIP_BOUNDTYPE][SCIPboundchgGetBoundtype(self.scip_boundchg)] def isRedundant(self): """ @@ -1376,7 +1394,7 @@ cdef class Node: PY_SCIP_NODETYPE """ - return PY_SCIP_NODETYPE(SCIPnodeGetType(self.scip_node)) + return _ENUMS[PY_SCIP_NODETYPE][SCIPnodeGetType(self.scip_node)] def getLowerbound(self): """ @@ -1498,7 +1516,7 @@ cdef class Node: py_variables = [Variable.create(branchvars[i]) for i in range(nbranchvars)] py_branchbounds = [branchbounds[i] for i in range(nbranchvars)] - py_boundtypes = [PY_SCIP_BOUNDTYPE(boundtypes[i]) for i in range(nbranchvars)] + py_boundtypes = [_ENUMS[PY_SCIP_BOUNDTYPE][boundtypes[i]] for i in range(nbranchvars)] free(boundtypes) free(branchbounds) free(branchvars) @@ -1651,7 +1669,7 @@ cdef class Variable(Expr): ------- PY_SCIP_IMPLINTTYPE """ - return PY_SCIP_IMPLINTTYPE(SCIPvarGetImplType(self.scip_var)) + return _ENUMS[PY_SCIP_IMPLINTTYPE][SCIPvarGetImplType(self.scip_var)] def getStatus(self): """ @@ -3154,7 +3172,7 @@ cdef class Model: def freeTransform(self): """Frees all solution process data including presolving and transformed problem, only original problem is kept.""" - if self.getStage() not in [SCIP_STAGE_INIT, + if SCIPgetStage(self._scip) not in [SCIP_STAGE_INIT, SCIP_STAGE_PROBLEM, SCIP_STAGE_TRANSFORMED, SCIP_STAGE_PRESOLVING, @@ -5367,7 +5385,7 @@ cdef class Model: def relax(self): """Relaxes the integrality restrictions of the model.""" - if self.getStage() != SCIP_STAGE_PROBLEM: + if SCIPgetStage(self._scip) != SCIP_STAGE_PROBLEM: raise Warning("method can only be called in stage PROBLEM") for var in self.getVars(): @@ -5544,7 +5562,7 @@ cdef class Model: SCIP_LPSOLSTAT """ - return PY_SCIP_LPSOLSTAT(SCIPgetLPSolstat(self._scip)) + return _ENUMS[PY_SCIP_LPSOLSTAT][SCIPgetLPSolstat(self._scip)] def constructLP(self): """ @@ -7284,7 +7302,7 @@ cdef class Model: coef : float """ - assert self.getStage() == 1, "addExprNonlinear cannot be called in stage %i." % self.getStage() + assert SCIPgetStage(self._scip) == 1, "addExprNonlinear cannot be called in stage %i." % SCIPgetStage(self._scip) assert cons.isNonlinear(), "addExprNonlinear can only be called with nonlinear constraints." cdef Constraint temp_cons @@ -8818,7 +8836,7 @@ cdef class Model: cdef SCIP_Real activity cdef SCIP_SOL* scip_sol - if not self.getStage() >= SCIP_STAGE_SOLVING: + if not SCIPgetStage(self._scip) >= SCIP_STAGE_SOLVING: raise Warning("method cannot be called before problem is solved") if isinstance(sol, Solution): @@ -8857,7 +8875,7 @@ cdef class Model: cdef SCIP_SOL* scip_sol - if not self.getStage() >= SCIP_STAGE_SOLVING: + if not SCIPgetStage(self._scip) >= SCIP_STAGE_SOLVING: raise Warning("method cannot be called before problem is solved") if isinstance(sol, Solution): @@ -9491,7 +9509,7 @@ cdef class Model: def presolve(self): """Presolve the problem.""" - if self.getStage() not in [SCIP_STAGE_PROBLEM, SCIP_STAGE_TRANSFORMED,\ + if SCIPgetStage(self._scip) not in [SCIP_STAGE_PROBLEM, SCIP_STAGE_TRANSFORMED,\ SCIP_STAGE_PRESOLVING, SCIP_STAGE_PRESOLVED, \ SCIP_STAGE_SOLVED]: raise Warning("method cannot be called in stage %i." % self.getStage()) @@ -11737,7 +11755,7 @@ cdef class Model: self._ensureFreshBestSol() if SCIPgetNSols(self._scip) == 0: - if self.getStage() != SCIP_STAGE_SOLVING: + if SCIPgetStage(self._scip) != SCIP_STAGE_SOLVING: raise Warning("Without a solution, method can only be called in stage SOLVING.") else: assert self._bestSol.sol != NULL @@ -11747,7 +11765,7 @@ cdef class Model: else: min_stage_requirement = SCIP_STAGE_TRANSFORMING - if not self.getStage() >= min_stage_requirement: + if not SCIPgetStage(self._scip) >= min_stage_requirement: raise Warning("method cannot be called in stage %i." % self.getStage) return self.getSolObjVal(self._bestSol, original) @@ -11927,7 +11945,7 @@ cdef class Model: SCIP_STAGE """ - return PY_SCIP_STAGE(SCIPgetStage(self._scip)) + return _ENUMS[PY_SCIP_STAGE][SCIPgetStage(self._scip)] def getStageName(self): """ @@ -11938,7 +11956,7 @@ cdef class Model: str """ - return self.getStage().name + return _STAGE_NAMES[SCIPgetStage(self._scip)] def getStatus(self): """ @@ -12699,7 +12717,7 @@ cdef class Model: raise ValueError("freeReoptSolve requires reoptimization to be enabled. " "Call enableReoptimization() before solving.") - if self.getStage() not in [SCIP_STAGE_INIT, + if SCIPgetStage(self._scip) not in [SCIP_STAGE_INIT, SCIP_STAGE_PROBLEM, SCIP_STAGE_TRANSFORMED, SCIP_STAGE_PRESOLVING, @@ -13021,7 +13039,7 @@ cdef class Model: """ cdef SCIP_RESULT result PY_SCIP_CALL(SCIPbranchLPExact(self._scip, &result)) - return PY_SCIP_RESULT(result) + return _ENUMS[PY_SCIP_RESULT][result] def addRowExact(self, RowExact rowexact): """ diff --git a/src/pyscipopt/scip.pyi b/src/pyscipopt/scip.pyi index 8b3d38b35..d3b46e794 100644 --- a/src/pyscipopt/scip.pyi +++ b/src/pyscipopt/scip.pyi @@ -1958,6 +1958,7 @@ class PY_SCIP_EVENTTYPE(IntFlag): GUBCHANGED = ... HOLECHANGED = ... IMPLADDED = ... + IMPLTYPECHANGED = ... LBCHANGED = ... LBRELAXED = ... LBTIGHTENED = ... @@ -1988,6 +1989,7 @@ class PY_SCIP_EVENTTYPE(IntFlag): SOLEVENT = ... SOLFOUND = ... SYNC = ... + TYPECHANGED = ... UBCHANGED = ... UBRELAXED = ... UBTIGHTENED = ... @@ -2002,6 +2004,8 @@ class PY_SCIP_HEURTIMING(IntFlag): AFTERLPLOOP = ... AFTERLPNODE = ... AFTERLPPLUNGE = ... + AFTERNODE = ... + AFTERPLUNGE = ... AFTERPROPLOOP = ... AFTERPSEUDONODE = ... AFTERPSEUDOPLUNGE = ... @@ -2010,6 +2014,7 @@ class PY_SCIP_HEURTIMING(IntFlag): DURINGLPLOOP = ... DURINGPRESOLLOOP = ... DURINGPRICINGLOOP = ... + NONE = ... class PY_SCIP_IMPLINTTYPE(IntEnum): NONE = ... @@ -2092,16 +2097,21 @@ class PY_SCIP_PARAMSETTING(IntEnum): OFF = ... class PY_SCIP_PRESOLTIMING(IntFlag): + ALWAYS = ... EXHAUSTIVE = ... FAST = ... + FINAL = ... + MAX = ... MEDIUM = ... NONE = ... class PY_SCIP_PROPTIMING(IntFlag): AFTERLPLOOP = ... AFTERLPNODE = ... + ALWAYS = ... BEFORELP = ... DURINGLPLOOP = ... + NONE = ... class PY_SCIP_RESULT(IntEnum): BRANCHED = ... @@ -2109,6 +2119,7 @@ class PY_SCIP_RESULT(IntEnum): CONSCHANGED = ... CUTOFF = ... DELAYED = ... + DELAYNODE = ... DIDNOTFIND = ... DIDNOTRUN = ... FEASIBLE = ... @@ -2124,6 +2135,7 @@ class PY_SCIP_RESULT(IntEnum): class PY_SCIP_ROWORIGINTYPE(IntEnum): CONS = ... + CONSHDLR = ... REOPT = ... SEPA = ... UNSPEC = ... diff --git a/tests/test_event.py b/tests/test_event.py index c5380754c..65008d7a5 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -28,6 +28,8 @@ SCIP_EVENTTYPE.LHOLECHANGED, SCIP_EVENTTYPE.LHOLEREMOVED, SCIP_EVENTTYPE.OBJCHANGED, + SCIP_EVENTTYPE.TYPECHANGED, + SCIP_EVENTTYPE.IMPLTYPECHANGED, SCIP_EVENTTYPE.UBCHANGED, SCIP_EVENTTYPE.UBRELAXED, SCIP_EVENTTYPE.UBTIGHTENED,