Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased
### Added
- Added option to get Lhs, Rhs of nonlinear constraints
- Added cutoffNode and test
- Added getMajorVersion, getMinorVersion, and getTechVersion
### Fixed
Expand Down
20 changes: 10 additions & 10 deletions src/pyscipopt/scip.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
if rc == SCIP_OKAY:
pass
elif rc == SCIP_ERROR:
raise Exception('SCIP: unspecified error!')

Check failure on line 275 in src/pyscipopt/scip.pxi

View workflow job for this annotation

GitHub Actions / test-coverage (3.11)

SCIP: unspecified error!
elif rc == SCIP_NOMEMORY:
raise MemoryError('SCIP: insufficient memory error!')
elif rc == SCIP_READERROR:
Expand Down Expand Up @@ -4362,7 +4362,7 @@
if len(v) == 1: # linear
var = <Variable>v[0]
PY_SCIP_CALL(SCIPaddLinearVarNonlinear(self._scip, scip_cons, var.scip_var, c))
else: # quadratic
else: # nonlinear
assert len(v) == 2, 'term length must be 1 or 2 but it is %s' % len(v)

varexprs = <SCIP_EXPR**> malloc(2 * sizeof(SCIP_EXPR*))
Expand Down Expand Up @@ -4726,7 +4726,7 @@
enforce=True, check=True, propagate=True, local=False,
modifiable=False, dynamic=False, removable=False,
stickingatnode=False):
"""Adds multiple linear or quadratic constraints.
"""Adds multiple constraints.

Each of the constraints is added to the model using Model.addCons().

Expand Down Expand Up @@ -5696,7 +5696,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
constraint to change the right-hand side from
rhs : float or None
new right-hand side (set to None for +infinity)

Expand All @@ -5720,7 +5720,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
constraint to change the left-hand side from
lhs : float or None
new left-hand side (set to None for -infinity)

Expand All @@ -5744,7 +5744,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
constraint to get the right-hand side from

Returns
-------
Expand All @@ -5754,7 +5754,7 @@
constype = bytes(SCIPconshdlrGetName(SCIPconsGetHdlr(cons.scip_cons))).decode('UTF-8')
if constype == 'linear':
return SCIPgetRhsLinear(self._scip, cons.scip_cons)
elif constype == 'quadratic':
elif constype == 'nonlinear':
return SCIPgetRhsNonlinear(cons.scip_cons)
else:
raise Warning("method cannot be called for constraints of type " + constype)
Expand All @@ -5766,7 +5766,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
linear or nonlinear constraint

Returns
-------
Expand All @@ -5776,7 +5776,7 @@
constype = bytes(SCIPconshdlrGetName(SCIPconsGetHdlr(cons.scip_cons))).decode('UTF-8')
if constype == 'linear':
return SCIPgetLhsLinear(self._scip, cons.scip_cons)
elif constype == 'quadratic':
elif constype == 'nonlinear':
return SCIPgetLhsNonlinear(cons.scip_cons)
else:
raise Warning("method cannot be called for constraints of type " + constype)
Expand Down Expand Up @@ -5842,7 +5842,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
linear constraint
sol : Solution or None, optional
solution to compute activity of, None to use current node's solution (Default value = None)

Expand Down Expand Up @@ -5879,7 +5879,7 @@
Parameters
----------
cons : Constraint
linear or quadratic constraint
linear constraint
sol : Solution or None, optional
solution to compute slack of, None to use current node's solution (Default value = None)
side : str or None, optional
Expand Down
11 changes: 11 additions & 0 deletions tests/test_nonlinear.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,14 @@ def test_addExprNonLinear():
assert m.getNSols() > 0
assert m.isEQ(m.getVal(y), 2)
assert m.isEQ(m.getVal(z), 27)

def test_nonlinear_lhs_rhs():
from helpers.utils import random_nlp_1

m = random_nlp_1()
c = m.getConss()

m.hideOutput()
m.optimize()
assert m.isInfinity(-m.getLhs(c[0]))
assert m.isEQ(m.getRhs(c[0]), 5)
Loading