Skip to content

Commit bd0e6b5

Browse files
committed
add locktype
1 parent af37755 commit bd0e6b5

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
### Added
55
- Added support for knapsack constraints
66
- Added isFeasLE, isFeasLT, isFeasGE, isFeasGT, and tests
7+
- Added SCIP_LOCKTYPE
78
### Fixed
89
### Changed
910
### Removed

src/pyscipopt/scip.pxd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,11 @@ cdef extern from "scip/scip.h":
313313
SCIP_BENDERSENFOTYPE SCIP_BENDERSENFOTYPE_PSEUDO
314314
SCIP_BENDERSENFOTYPE SCIP_BENDERSENFOTYPE_CHECK
315315

316+
ctypedef int SCIP_LOCKTYPE
317+
cdef extern from "scip/type_var.h":
318+
SCIP_LOCKTYPE SCIP_LOCKTYPE_MODEL
319+
SCIP_LOCKTYPE SCIP_LOCKTYPE_CONFLICT
320+
316321
ctypedef int SCIP_LPSOLSTAT
317322
cdef extern from "scip/type_lp.h":
318323
SCIP_LPSOLSTAT SCIP_LPSOLSTAT_NOTSOLVED

src/pyscipopt/scip.pxi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ cdef class PY_SCIP_EVENTTYPE:
255255
ROWCHANGED = SCIP_EVENTTYPE_ROWCHANGED
256256
ROWEVENT = SCIP_EVENTTYPE_ROWEVENT
257257

258+
cdef class PY_SCIP_LOCKTYPE:
259+
MODEL = SCIP_LOCKTYPE_MODEL
260+
CONFLICT = SCIP_LOCKTYPE_CONFLICT
258261

259262
cdef class PY_SCIP_LPSOLSTAT:
260263
NOTSOLVED = SCIP_LPSOLSTAT_NOTSOLVED

0 commit comments

Comments
 (0)