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.

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

Penalty model lp #64

Merged
merged 51 commits into from Dec 4, 2018
Merged

Penalty model lp #64

merged 51 commits into from Dec 4, 2018

Conversation

m3ller
Copy link
Contributor

@m3ller m3ller commented Nov 19, 2018

Please just review; do not merge.

Unit tests, test_generation.py and test_interface.py are still a work in progress. (read: please don't review them as they will change).

PR will add linear programming as a penalty model.

@arcondello arcondello changed the title Penalty model lp WIP: Penalty model lp Nov 19, 2018
@arcondello arcondello self-assigned this Nov 19, 2018
@arcondello arcondello self-requested a review November 19, 2018 21:41
@m3ller
Copy link
Contributor Author

m3ller commented Nov 23, 2018

Note: there are a couple packages in penaltymodel-lp's setup.py that have a lowerbound of 0.0.0. This was merely used as a stub, I will need to change this bound.

@arcondello
Copy link
Member

Also the file penaltymodel_lp/__init__.py should be removed

setup(
name="penaltymodel-lp",
install_requires=install_requires,
entry_points={
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add the packages

setup(
    name="penaltymodel-lp",
    install_requires=install_requires,
    packages=packages,
    entry_points={
        FACTORY_ENTRYPOINT: ['lp = penaltymodel.lp:get_penalty_model']
    }
)

In general this needs to have additional parameters added. I would use

from __future__ import absolute_import
as a template

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

except python_requires should be

python_requires = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. I'll push the change with the packages first to make sure it fixes the CI errors. If that passes, I'll switch over and follow mip's setup.py.

@m3ller
Copy link
Contributor Author

m3ller commented Nov 30, 2018

Closes #10

@m3ller m3ller changed the title WIP: Penalty model lp Penalty model lp Dec 4, 2018
@arcondello arcondello merged commit 98fb363 into dwavesystems:master Dec 4, 2018
@m3ller m3ller deleted the penalty-model-lp branch December 19, 2018 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants