Expose Matrix types

Author: mmghannam

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

setup.py

@@ -108,7 +108,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",

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

src/pyscipopt/_version.py

@@ -1 +1 @@
-__version__ = '5.4.0'
+__version__ = '5.4.1'

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
@@ -90,6 +90,9 @@ def test_expr_from_matrix_vars():
     mvar = m.addMatrixVar(shape=(2, 2), vtype="B", name="A")
     mvar2 = m.addMatrixVar(shape=(2, 2), vtype="B", name="B")
 
+    assert isinstance(mvar, MatrixVariable)
+    assert isinstance(mvar2, MatrixVariable)
+
     mvar_double = 2 * mvar
     assert isinstance(mvar_double, MatrixExpr)
     for expr in np.nditer(mvar_double, flags=["refs_ok"]):