-
-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
Feature "And" constraint #244
Conversation
Codecov Report
@@ Coverage Diff @@
## master #244 +/- ##
==========================================
+ Coverage 96.51% 96.67% +0.16%
==========================================
Files 39 48 +9
Lines 3439 3761 +322
==========================================
+ Hits 3319 3636 +317
- Misses 120 125 +5
Continue to review full report at Codecov.
|
Hi @hakank, this PR is ready for your tests 😄 It implements One example is your alldifferent except 0 from #202 which can be done by using a reified constraint instead of directly having the
I only implement I'll of course test this further in the next couple of days but I think it's ready for your review. Thanks in advance! |
I have now checked all my models (http://hakank.org/julia/constraints/ ), and changed the following to use http://hakank.org/julia/constraints/a_round_of_golf.jl http://hakank.org/julia/constraints/constraints_utils.jl (changed I couldn't see any performance changes in these models. There was, however one model that was much slower with
The original model (steiner.jl) solved n=[3,7,9] in 0.25s, 0.04s, 0.21s respectively. |
Regarding your test case which is slower. I mentioned it in our chat but to have it here as well: |
Benchmark Report for ConstraintSolverJob Properties
ResultsA ratio greater than
Benchmark Group ListHere's a list of all the benchmark groups executed by this job:
Julia versioninfoTarget
Baseline
|
* parse || and have OrSet * is_boolset_supported * implementation of || constraint * fixed active * bugfix pvals and basic unit test cases * added to changelog * added to docs/supported * still_feasible bugfix and test case * some more tests * extra test cases * anti constraint but bug in steiner * changed benchmark for all_different_except_c * moved the test... * clean benchmark all_different_except_0 * calculate less in or and && (break early) * support boolean constraints outside reified and indicator * changelog & supported docs * test for bool outside and finished bridge
First part of #205 but only for the right hand side.
Currently this does only parsing stuff and creating the
AndConstraint
. It also obviously only implements&&
for now and not||
.Todo:
Implement the usual constraint functions
Somehow understand why two or more
&&
seem to create extra variablesBridge to support
>=
and>
&&
constraintstest cases
&&
in one constraint&&
Documentation changes?
Changelog
Check if active in
init_constraint!
I'll most likely create other PRs to support more of #205 in the future. This PR might already be enough for #213 though