Skip to content

fix: fetching outer values before calling inner nodes #1965

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

Merged
triceo merged 1 commit into from
Dec 8, 2025
+7 −5
Merged

fix: fetching outer values before calling inner nodes #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...olver/core/impl/heuristic/selector/move/generic/list/RandomSubListChangeMoveIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ class RandomSubListChangeMoveIterator<Solution_> extends UpcomingSelectionIterat

@Override
protected Move<Solution_> createUpcomingSelection() {
if (!subListIterator.hasNext() || !destinationIterator.hasNext()) {
if (!subListIterator.hasNext()) {
return noUpcomingSelection();
}

// The inner node may need the outer iterator to select the next value first
var subList = subListIterator.next();
if (!destinationIterator.hasNext()) {
return noUpcomingSelection();
}
var destination = findUnpinnedDestination(destinationIterator, listVariableDescriptor);
if (destination == null) {
return noUpcomingSelection();
Expand Down
5 changes: 2 additions & 3 deletions ...fold/solver/core/impl/heuristic/selector/move/generic/list/kopt/KOptListMoveIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,14 @@ private Move<Solution_> pickTwoOptMove() {
if (!originIterator.hasNext()) {
return NoChangeMove.getInstance();
}
// The inner node may need the outer iterator to select the next value first
Object firstValue = originIterator.next();
@SuppressWarnings("unchecked")
var valueIterator = (Iterator<Node_>) valueSelector.iterator();
if (!valueIterator.hasNext()) {
return NoChangeMove.getInstance();
}

Object firstValue = originIterator.next();
Object secondValue = valueIterator.next();

var firstElementPosition = listVariableStateSupply.getElementPosition(firstValue)
.ensureAssigned();
var secondElementPosition = listVariableStateSupply.getElementPosition(secondValue)
Expand Down
Loading