Skip to content

Commit d1cce17

Browse files
committed
add addVarLocksType
1 parent bd0e6b5 commit d1cce17

3 files changed

Lines changed: 21 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
### Added
55
- Added support for knapsack constraints
66
- Added isFeasLE, isFeasLT, isFeasGE, isFeasGT, and tests
7-
- Added SCIP_LOCKTYPE
7+
- Added SCIP_LOCKTYPE, addVarLocksType
88
### Fixed
99
### Changed
1010
### Removed

src/pyscipopt/scip.pxd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,7 @@ cdef extern from "scip/scip.h":
792792
SCIP_RETCODE SCIPtransformVar(SCIP* scip, SCIP_VAR* var, SCIP_VAR** transvar)
793793
SCIP_RETCODE SCIPgetTransformedVar(SCIP* scip, SCIP_VAR* var, SCIP_VAR** transvar)
794794
SCIP_RETCODE SCIPaddVarLocks(SCIP* scip, SCIP_VAR* var, int nlocksdown, int nlocksup)
795+
SCIP_RETCODE SCIPaddVarLocksType(SCIP* scip, SCIP_VAR* var, SCIP_LOCKTYPE locktype, int nlocksdown, int nlocksup)
795796
SCIP_VAR** SCIPgetVars(SCIP* scip)
796797
SCIP_VAR** SCIPgetOrigVars(SCIP* scip)
797798
const char* SCIPvarGetName(SCIP_VAR* var)

src/pyscipopt/scip.pxi

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3859,7 +3859,7 @@ cdef class Model:
38593859

38603860
return Variable.create(_tvar)
38613861

3862-
def addVarLocks(self, Variable var, nlocksdown, nlocksup):
3862+
def addVarLocks(self, Variable var, int nlocksdown, int nlocksup):
38633863
"""
38643864
Adds given values to lock numbers of variable for rounding.
38653865
@@ -3875,6 +3875,24 @@ cdef class Model:
38753875
"""
38763876
PY_SCIP_CALL(SCIPaddVarLocks(self._scip, var.scip_var, nlocksdown, nlocksup))
38773877

3878+
def addVarLocksType(self, Variable var, int locktype, int nlocksdown, int nlocksup):
3879+
"""
3880+
adds given values to lock numbers of type locktype of variable for rounding
3881+
3882+
Parameters
3883+
----------
3884+
var : Variable
3885+
variable to adjust the locks for
3886+
type : str
3887+
type of the variable locks
3888+
nlocksdown : int
3889+
modification in number of rounding down locks
3890+
nlocksup : int
3891+
modification in number of rounding up locks
3892+
3893+
"""
3894+
PY_SCIP_CALL(SCIPaddVarLocksType(self._scip, var.scip_var, locktype, nlocksdown, nlocksup, ))
3895+
38783896
def fixVar(self, Variable var, val):
38793897
"""
38803898
Fixes the variable var to the value val if possible.

0 commit comments

Comments
 (0)