diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f0c49be8..c6367f3ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### Changed ### Removed -## 5.4.0 - 2024.02.24 +## 5.4.1 - 2024.02.24 ### Added - Added option to get Lhs, Rhs of nonlinear constraints - Added cutoffNode and test diff --git a/setup.py b/setup.py index a3d68852c..e484f7ecb 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ print("Assuming that SCIP is installed globally, because SCIPOPTDIR is undefined.\n") else: + # check whether SCIP is installed in the given directory if os.path.exists(os.path.join(scipoptdir, "include")): includedir = os.path.abspath(os.path.join(scipoptdir, "include")) @@ -108,7 +109,7 @@ setup( name="PySCIPOpt", - version="5.4.0", + version="5.4.1", description="Python interface and modeling environment for SCIP", long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/pyscipopt/__init__.py b/src/pyscipopt/__init__.py index eece6c939..713e125ec 100644 --- a/src/pyscipopt/__init__.py +++ b/src/pyscipopt/__init__.py @@ -10,7 +10,9 @@ from pyscipopt.Multidict import multidict from pyscipopt.scip import Model from pyscipopt.scip import Variable +from pyscipopt.scip import MatrixVariable from pyscipopt.scip import Constraint +from pyscipopt.scip import MatrixConstraint from pyscipopt.scip import Benders from pyscipopt.scip import Benderscut from pyscipopt.scip import Branchrule @@ -26,6 +28,9 @@ from pyscipopt.scip import LP from pyscipopt.scip import readStatistics from pyscipopt.scip import Expr +from pyscipopt.scip import MatrixExpr +from pyscipopt.scip import MatrixExprCons +from pyscipopt.scip import ExprCons from pyscipopt.scip import quicksum from pyscipopt.scip import quickprod from pyscipopt.scip import exp diff --git a/src/pyscipopt/_version.py b/src/pyscipopt/_version.py index 271e4c056..2ac7a45eb 100644 --- a/src/pyscipopt/_version.py +++ b/src/pyscipopt/_version.py @@ -1 +1 @@ -__version__ = '5.4.0' +__version__ = '5.4.1' diff --git a/tests/test_matrix_variable.py b/tests/test_matrix_variable.py index c352ae2fb..47a7830c0 100644 --- a/tests/test_matrix_variable.py +++ b/tests/test_matrix_variable.py @@ -2,7 +2,7 @@ import pprint import pytest from pyscipopt import Model, Variable, log, exp, cos, sin, sqrt -from pyscipopt.scip import Expr, MatrixExpr, MatrixVariable, MatrixExprCons, MatrixConstraint, ExprCons +from pyscipopt import Expr, MatrixExpr, MatrixVariable, MatrixExprCons, MatrixConstraint, ExprCons from time import time import numpy as np