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

Some updates #2

Merged
merged 5 commits into from
Apr 2, 2020
Merged

Some updates #2

merged 5 commits into from
Apr 2, 2020

Conversation

torressa
Copy link
Collaborator

@torressa torressa commented Apr 1, 2020

Hey man, I've changed around some stuff, have a look.
Maybe I'm wrong in thinking that test_sub_cspy and test_sub_pulp solve the same problem?
Also was thinking to make the subproblems into classes that way we can subdivide the problem specific parts and the common parts.
Also, sorry for slight reformatting.

@torressa
Copy link
Collaborator Author

torressa commented Apr 1, 2020

Not sure about the integration tests either..

- Changed `main` argument types
- Removed hard-coded constraints + parameters
@torressa
Copy link
Collaborator Author

torressa commented Apr 1, 2020

I've restrured the subproblem lp in a new file. See what you think.
I was having trouble understanding what problem was actually being formulated so I removed the hard-coded bits and made it a bit more generic, so you can input the load, duration, etc

@torressa
Copy link
Collaborator Author

torressa commented Apr 1, 2020

The idea would be to do the same for the subproblem using cspy.
The SubProblemcspy class inherits from subproblem base and depending on the inputs, it sets different resource bounds.

@Kuifje02 Kuifje02 merged commit 9cd5a4c into Kuifje02:master Apr 2, 2020
torressa pushed a commit that referenced this pull request Jul 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants