Skip to content
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

Jump to bottom

Feature 70/use min gap as a constraint in penaltymodels #74

Merged
merged 37 commits into from
Jan 16, 2019
Merged

Feature 70/use min gap as a constraint in penaltymodels #74

merged 37 commits into from
Jan 16, 2019

Conversation

m3ller
Copy link
Contributor

@m3ller m3ller commented Jan 7, 2019

Closes #70.

  • Made changes so that min classical gap can now be added as a direct constraint in each penalty model (MIP, MaxGap, LP)
  • Add corresponding unit tests to verify that the min classical gap parameter works

m3ller added 25 commits January 3, 2019 14:00
Adding min classical gap into specification class
934b2aa
Gave min classical gap a default value
200d33f
Add min_classical_gap to lp and core penalty model
dae8d60
Add min_classical_gap to penaltymodel-mip
d1c3684
Change parameter ordering for Specification, lp, and mip; making gap …
89348a0 
…parameter follow bias parameters
Clean up. Remove unused imports
3f4741b
Add min_classical_gap to MaxGap
f4a32a9
Add min_classical_gap to docstrings
667882f
Remove irrelevant TODOs
e7dc4ac
Add min gap test for penaltymodel-lp
de95eb3
Add MIP min_gap test with no auxiliary variables
2b8843c
Split if-statements as there is no dependency between them
71d6fe6
Add test for min gap with auxiliary variables
1ae53e3
Add min_classical_gap argument in MaxGap unit tests. Add a min_gap te…
8bd55bc 
…st with no auxiliary for MaxGap.
Add min_classical_gap to the initial solver model. If the model is in…
28df8fe 
…feasible with this constraint, it becomes unneccessary to search the remaining gap range
Change the configuration to an or_gate
e2bd6a1
Add min gap with aux test for MaxGap
0cfb41c
Add test for negative min gaps in MaxGap unit tests
8e2c851
Lowering min gap for test_multiplication
ef3afb3
Grab initial feasible model
1b8282d
Add MaxGap test to verify that a model is grabbed when min_gap == max…
c0fb60f 
… classical gap.
Add check_bqm_table(..) checks to MaxGap's min_gap tests.
295f861
Add check_generated_ising_model(..) to min_gap unit tests. Change use…
6cc3df4 
…r-specified ground states from non-zero to zero as MaxGap at the moment only handles ground states of zero
Update core version 0.15.4 -> 0.15.5
a8ba1a0 
New Features
-------------------
* Add min_classical_gap as a parameter in Specification. This will support min_classical_gap in the penalty models.
Bump up the version needed from penaltymodel core; this will allow pe…
524e707 
…nalty models to access an updated Specification object that includes min_classical_gap as a parameter
@arcondello arcondello self-requested a review January 8, 2019 16:02
@arcondello arcondello self-assigned this Jan 8, 2019
@arcondello
Copy link
Member

arcondello commented Jan 8, 2019 •
edited
Loading

I think this might technically be backwards compatibility breaking. Because the default min-gap is 2 so models that could previously be constructed can no longer be.

m3ller added 11 commits January 9, 2019 11:28
Update core version 0.15.5 -> 0.16.0
26feeac 
New Features
------------------
* Support a default minimum classical gap of 2 in penaltymodels
Add package info for penaltymodel-lp
889ae4d
Update maxgap version 0.4.2 -> 0.5.0
bc37c52 
New Features
------------------
* Support a default minimum classical gap of 2
Update mip version 0.1.4 -> 0.2.0
f53c05c 
New Features
------------------
* Support a default minimum classical gap of 2
Add penaltymodel-lp as a requirement in penaltymodel_core setup. Bump…
56b106f 
…ed up the version requirements for mip and maxgap; although this version penaltymodel_core could support the older version of mip and maxgap, the optional parameter min_classical_gap in core's specification class will be sit uselessly as it gets passed to the older mip and maxgap. This would be an unexpected behaviour, hence the version bumping.
Bumped up penaltymodel's version in the setup.py of mip, maxgap, and lp
5d59ac6
Bump up upperbound of cache's penaltymodel version
d9dc21e
Bump up lower bound oc cache's penaltymodel version.
066c8b9
Add classical gap in SQL query. Remove unnecessary if-statements
77986ac
Remove unnecessary if-statements
6dbe828
Add test to verify that gap constraint is being used in SQL queries
1490cc0
@m3ller
Copy link
Contributor Author

m3ller commented Jan 10, 2019

Note changes made since last approval:

  • Made code changes to penaltymodel-cache
  • Bumped up version numbers

@m3ller m3ller changed the title Feature 70/use min gap as a constraint in penaltymodels WIP: Feature 70/use min gap as a constraint in penaltymodels Jan 10, 2019
@arcondello arcondello mentioned this pull request Jan 10, 2019
Merged
@m3ller
Copy link
Contributor Author

m3ller commented Jan 14, 2019

This is currently being blocked because there is some confusion between classical_gap and min_classical_gap.

@m3ller m3ller mentioned this pull request Jan 15, 2019
Open
@m3ller m3ller changed the title WIP: Feature 70/use min gap as a constraint in penaltymodels Feature 70/use min gap as a constraint in penaltymodels Jan 15, 2019
@m3ller
Copy link
Contributor Author

m3ller commented Jan 15, 2019

The min_classical_gap and classical_gap issue will be taken care of by the refactoring issue #78

@m3ller m3ller merged commit b34b781 into dwavesystems:master Jan 16, 2019
@m3ller m3ller deleted the feature-70/use-min-gap-as-a-constraint-in-penaltymodels branch January 16, 2019 21:36
@m3ller m3ller mentioned this pull request Feb 8, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arcondello arcondello arcondello approved these changes

Assignees

@arcondello arcondello

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@m3ller @arcondello