Enhancement/Sum constraints on NumberNode#471
Draft
fastbodin wants to merge 29 commits intodwavesystems:mainfrom
Draft
Enhancement/Sum constraints on NumberNode#471fastbodin wants to merge 29 commits intodwavesystems:mainfrom
fastbodin wants to merge 29 commits intodwavesystems:mainfrom
Conversation
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
2 times, most recently
from
bebd145 to
15f7b67
Compare
Contributor
Author
|
Feature is fully implemented. |
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
e3b0255 to
1c177b4
Compare
Contributor
Author
|
Closes #216. |
arcondello
reviewed
Feb 4, 2026
dwave/optimization/include/dwave-optimization/nodes/numbers.hpp
Outdated
Show resolved
Hide resolved
wbernoudy
reviewed
Feb 4, 2026
dwave/optimization/include/dwave-optimization/nodes/numbers.hpp
Outdated
Show resolved
Hide resolved
dwave/optimization/include/dwave-optimization/nodes/numbers.hpp
Outdated
Show resolved
Hide resolved
Contributor
Author
|
First round of comments addressed. |
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
4b2205c to
c6a93d5
Compare
wbernoudy
reviewed
Feb 5, 2026
wbernoudy
reviewed
Feb 5, 2026
Member
|
I do see "hyperslice" used in a lot of comments. Would prefer that is changed to just "slice" as well, or at least a small comment maybe in the header |
wbernoudy
reviewed
Feb 5, 2026
wbernoudy
reviewed
Feb 5, 2026
wbernoudy
reviewed
Feb 5, 2026
wbernoudy
reviewed
Feb 5, 2026
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
c6a93d5 to
72c6d96
Compare
Contributor
Author
|
Second round of comments addressed. |
arcondello
approved these changes
Feb 6, 2026
Member
arcondello
left a comment
arcondello
left a comment
There was a problem hiding this comment.
Looks great! Just two aesthetic comments
dwave/optimization/include/dwave-optimization/nodes/numbers.hpp
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Third round of comments addressed. |
wbernoudy
approved these changes
Feb 6, 2026
wbernoudy
reviewed
Feb 11, 2026
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
a92e2bd to
116d03b
Compare
wbernoudy
reviewed
Feb 12, 2026
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
f2b1cc4 to
3b10b41
Compare
Contributor
Author
|
Previously, users could not define a bound for the sum of the values over an entire |
Data is stored at C++ level with the class `AxisBoundInfo` as private attribute to `NumberNode`. Added relevant C++ tests.
For each bound axis and each hyperslice along said axis, we store the running sum of the values within the hyperslice. This state dependant data is stored via `NumberNodeStateData`. If `NumberNode` is initialized with values, we check that all axis-wise bounds are satisfied.
Defined method to initialize_state() given exactly one axis-wise bound. Fill state with lower bounds and increment until state satisfies axis-wise bounds or determines infeasible. Added appropriate C++ IntegerNode and BinaryNode tests.
Made BoundAxisInfo and BoundAxisOperators members of NumberNode. Updated all C++ tests. Optimized BufferIterator use in initialize_state().
When constructing a state that satisfies exactly one axis-wise bound.
Needed for Cython interface. Changed relevant C++ code. Used aliases in C++ NumberNode tests.
Also made BoundAxisOperaters an `enum` as opposed to `enum class` because we found a Cython workaround.
Resolved conflict in rebase.
Previously accepted list of tuples and list of lists. Now simply list of tuples for consistency.
Specific to axis-wise bounds.
`BoundAxisInfo` -> `AxisBound` and `BoundAxisOperator` -> `Operator`. `Operator` is now a nested enum classs of `AxisBound`.
Added indicator variable that all bound axis operators are `==` to reduce redundancy in `NumberNode::exchange()` method.
Made axis, operators, and bounds private members. Added axis(), num_bounds(), and num_operators() methods. Updated C++ code/tests, Python, and Cython to reflect this.
Added a `const` to `State& state`. Fixed typos.
Previously, users could not define a bound for the sum of the values over an entire `NumberNode` array. This lead to the undesired behaviour that users could not define a bound on the sum of the values in a `NumberNode` vector.
Users may now define a bound on the sum of the values in the entire `NumberNode` array.
See prior commit message.
Reflect version bump.
497 removed unset() and set() method. Removed them from sum constraint C++ tests.
fastbodin
force-pushed
the
enhancement/axis_wise_bounds_numbernode
branch
from
b27eecc to
2ab16fc
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Do not merge. Draft PR.
Only C++ has been implemented.Simply checking CircleCi.