minor fix: globalconstraint.py and python_buildins.py #337
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IgnaceBleukx
reviewed
Jun 2, 2023
| else: | ||
| demand_at_t += demand[job] * ((start[job] <= t) & (t < end[job])) | ||
| cons += [capacity >= demand_at_t] | ||
| for t in range(lb, ub+1): |
There was a problem hiding this comment.
This should work but it doesn't... Our tests decomposing Cumulative are now failing.
It exposes another issue related to our implementation of numpy arrays.
I'll open a separate issue for that, but until that is fixed, we should revert this.
IgnaceBleukx
added
the
blocked
This reverts commit fe6cdcf.
|
I revert the numpy formulation that was blocking. I'm opening an issue for it, so it can be fixed later. The rest can be pushed now |
|
Lost track of this one, merging now |
# Conflicts: # cpmpy/expressions/globalconstraints.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In python_buildins.py: minor fixes to comply with Pep 8
In globalconstraint.py: minor fixes to comply with Pep 8, some typos, one refactoring in the cumulative constraint to use numpy array operation instead of for loops