Skip to content

add support for constraint handlers #109

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
rschwarz merged 35 commits into from
Aug 29, 2019
Merged

add support for constraint handlers #109

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
55e1f34
WIP: add conshdlr.jl with sketches
rschwarz Mar 24, 2019
790629c
WIP: add more interface methods and call them from the C callbacks
rschwarz May 17, 2019
4c4006c
fix missing type for parameter in signature
rschwarz Jul 4, 2019
4a07574
various fixes regarding Julia/C interface (and typos)
rschwarz Jul 4, 2019
c3b4335
add add_constraint for user's constraint handlers
rschwarz Jul 4, 2019
9ef250f
add minimal test with dummy constraint handler
rschwarz Jul 4, 2019
060ff85
move DummyConsHdlr into separate module (for Julia 1.0)
rschwarz Jul 5, 2019
f9a93a1
pass conshdlr parameters as keyword args
rschwarz Aug 4, 2019
5bcdfe5
register constraint handlers with ManagedSCIP
rschwarz Aug 5, 2019
f89343e
also register constraint data (for constraint handlers)
rschwarz Aug 5, 2019
432acff
add keyword args for non-simple SCIPcreateCons
rschwarz Aug 5, 2019
5059cf3
fix signature of enfo callbacks in @cfunction
rschwarz Aug 9, 2019
1f1ffeb
improve docstrings
rschwarz Aug 9, 2019
2815364
add more tests (never satisfied conshdlr)
rschwarz Aug 9, 2019
29ccbfc
pass all arguments from SCIP callbacks to Julia user functions
rschwarz Aug 9, 2019
c0848c3
fix argument type of locktype in conslock
rschwarz Aug 9, 2019
5e60627
implement consfree and consdelete
rschwarz Aug 9, 2019
11bafb9
add tests with naive all-different conshdlr
rschwarz Aug 9, 2019
e69515b
add convenience functions for constraint handlers
rschwarz Aug 9, 2019
88e3f2e
allow problem modification during solving stage (for callbacks)
rschwarz Aug 9, 2019
c4a99b9
add test with NoGoodCounter (adding constraints to enforce)
rschwarz Aug 9, 2019
587ef09
Replace array with tuple to avoid allocation.
rschwarz Aug 9, 2019
fd16ae5
add some comments and docstrings
rschwarz Aug 12, 2019
aa97504
add more comments and docstrings
rschwarz Aug 13, 2019
e1fbc07
Fix formatting of docstrings.
rschwarz Aug 13, 2019
e9e3619
Add comment about constraint (handler) maps.
rschwarz Aug 13, 2019
7f9ab4c
Add MOI wrappers for include_conshdlr, add_constraint.
rschwarz Aug 13, 2019
880b710
travis: drop Julia nightly
rschwarz Aug 14, 2019
3687471
convert SCIP_Bool to Bool in callbacks
rschwarz Aug 16, 2019
765f2dc
give more detail when checking SCIP stage
rschwarz Aug 22, 2019
335f162
relax assert_solved
rschwarz Aug 22, 2019
5ebc2c2
fix conversion from Cstring to String for MOI.VariableName
rschwarz Aug 23, 2019
f86c15c
create name for conshdlr, if not given
rschwarz Aug 23, 2019
69b67f8
Merge branch 'master' into rs/conshdlr
rschwarz Aug 26, 2019
b575101
update NEWS, README
rschwarz Aug 29, 2019
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
2 changes: 1 addition & 1 deletion src/MOI_wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ end

"Go back from solved stage to problem modification stage, invalidating results."
function allow_modification(o::Optimizer)
if SCIPgetStage(o) != SCIP_STAGE_PROBLEM
if !(SCIPgetStage(o) in (SCIP_STAGE_PROBLEM, SCIP_STAGE_SOLVING))
@SC SCIPfreeTransform(o)
end
return nothing
Expand Down
6 changes: 6 additions & 0 deletions src/SCIP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ include("managed_scip.jl")
# constraints from nonlinear expressions
include("nonlinear.jl")

# constraint handlers
include("conshdlr.jl")

# implementation of MOI
include("MOI_wrapper.jl")

# convenience functions
include("convenience.jl")

# warn about rewrite
include("compat.jl")

Expand Down
Loading