Skip to content

New matrix variable functionality #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Joao-Dionisio merged 42 commits into from
Feb 25, 2025
Merged

New matrix variable functionality #957

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
54269ee
Create branch
Opt-Mucca Feb 15, 2025
9f32dbd
start of tests
Joao-Dionisio Feb 15, 2025
3a0dcde
Added extra dimension
Joao-Dionisio Feb 15, 2025
8798627
Update tests
Opt-Mucca Feb 15, 2025
4e9d002
First working test
mmghannam Feb 15, 2025
fa0b103
First working test
mmghannam Feb 15, 2025
bdb415c
Merge branch 'master' of github.com:scipopt/PySCIPOpt into matrix_var…
mmghannam Feb 15, 2025
75991b1
Expr from matrix variables test
mmghannam Feb 15, 2025
54c5eb3
Working version of ExprCons with le
mmghannam Feb 15, 2025
a61418e
Can now add linear matrix constraints
Joao-Dionisio Feb 15, 2025
78d0782
More robust Matrix classes
Joao-Dionisio Feb 15, 2025
dab790d
add todo
Joao-Dionisio Feb 15, 2025
3a7c0fb
Clean up addMatrixCons function
Opt-Mucca Feb 17, 2025
7dcd344
Add MatrixVar methods
Opt-Mucca Feb 17, 2025
ae8e68d
Update TODOs
Opt-Mucca Feb 17, 2025
3bf02e5
Add getter functions to matrixConstraint class@
Opt-Mucca Feb 17, 2025
c2a5ab7
Add checks for missing numpy
Joao-Dionisio Feb 20, 2025
f8c2d38
Add matrix API to readthedocs
Opt-Mucca Feb 20, 2025
4b0baff
Add minor grammar stuff. Add GCG to similar software
Opt-Mucca Feb 20, 2025
f1d3cf6
Remove universal build. Add type asserts
Opt-Mucca Feb 20, 2025
09997b2
Update pipelines to include numpy
mmghannam Feb 21, 2025
dd2f04d
Add numpy as a dependency
mmghannam Feb 21, 2025
cd39202
Remove cimports for now
mmghannam Feb 21, 2025
ca0b287
Support adding MatrixExprCons in addConss
mmghannam Feb 21, 2025
a66cddd
Changed tests a bit
Joao-Dionisio Feb 21, 2025
eb59f6a
Merge branch 'matrix_variables' of https://github.com/scipopt/PySCIPO…
Joao-Dionisio Feb 21, 2025
07fec8e
Support querying solution values using MatrixExpr
mmghannam Feb 21, 2025
fc95a65
Merge remote
mmghannam Feb 21, 2025
8f4328d
Add a test
Joao-Dionisio Feb 21, 2025
19f2eda
Remove SCIP bug from tests. Already reported
Opt-Mucca Feb 24, 2025
931be37
Merge branch 'master' into matrix_variables
Opt-Mucca Feb 24, 2025
266a893
Update CHANGELOG
Opt-Mucca Feb 24, 2025
42cd8d4
Add info for 5.4.0 release
Opt-Mucca Feb 24, 2025
678a93e
Make numpy a dependency (not just at build time)
mmghannam Feb 24, 2025
3d09d6c
Most comments addressed
Joao-Dionisio Feb 25, 2025
8d9077e
Add test for documentation
Joao-Dionisio Feb 25, 2025
f9c1caa
Fix documentation
Joao-Dionisio Feb 25, 2025
d2b1f73
Add solution value accessing to docs
Opt-Mucca Feb 25, 2025
df3a523
Format test file
Opt-Mucca Feb 25, 2025
487957d
Update docs/tutorials/matrix.rst
Opt-Mucca Feb 25, 2025
6210bab
Update docs/tutorials/matrix.rst
Opt-Mucca Feb 25, 2025
7dfc6bc
Merge branch 'master' into matrix_variables
Joao-Dionisio Feb 25, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:scipopt/PySCIPOpt into matrix_var… 
…iables
  • Loading branch information
@mmghannam
mmghannam committed Feb 15, 2025
commit bdb415c0428100a11df848fccd1dc2f76ab15e07

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.