Skip to content

Require binary variables in logical constraints #1005

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
merged 22 commits into from
Jun 5, 2025
Merged

Require binary variables in logical constraints #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d172724
Fix 1004
Joao-Dionisio May 28, 2025
baf6465
refactor variable conversion
Joao-Dionisio May 28, 2025
fe30f1a
Update tests/test_cons.py
Joao-Dionisio May 28, 2025
928f2e5
Put function inside class
Joao-Dionisio May 28, 2025
b4e9065
Call wrapper class in a few more places
Joao-Dionisio May 28, 2025
65e0232
Single variable
Joao-Dionisio May 28, 2025
aaec54a
change name to VarArray
Joao-Dionisio May 28, 2025
8d00fb8
Apply suggestions from code review
Joao-Dionisio May 28, 2025
bcc2f88
Messed around with pointers, found bug in translatesubsol
Joao-Dionisio May 28, 2025
4e9688e
Fix double free
Joao-Dionisio May 28, 2025
df32050
Apply suggestions from code review
Joao-Dionisio May 28, 2025
954c731
Fix most suggestions
Joao-Dionisio May 28, 2025
659e9b6
_VarArray in everything
Joao-Dionisio May 28, 2025
12a5b45
fix double free
Joao-Dionisio May 28, 2025
6ce8dc1
Update src/pyscipopt/scip.pxi
Joao-Dionisio May 29, 2025
94032c4
Fix leak
Joao-Dionisio May 29, 2025
bc443a4
typo
Joao-Dionisio May 29, 2025
bee82bb
Clean tests a bit
Joao-Dionisio May 29, 2025
5b94027
Apply suggestions from code review
Joao-Dionisio Jun 5, 2025
afe83c3
Merge branch 'master' into fix-1004
Joao-Dionisio Jun 5, 2025
c559c37
Some more fixes
Joao-Dionisio Jun 5, 2025
f6206f6
Remaining comments
Joao-Dionisio Jun 5, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Added isPositive(), isNegative(), isFeasLE(), isFeasLT(), isFeasGE(), isFeasGT(), isHugeValue(), and tests
- Added SCIP_LOCKTYPE, addVarLocksType(), getNLocksDown(), getNLocksUp(), getNLocksDownType(), getNLocksUpType(), and tests
### Fixed
- Raised an error when an expression is used when a variable is required
### Changed
### Removed

Expand Down
Loading