Skip to content

chore: adapt to Move refactor upstream #29

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
merged 1 commit into from
Oct 25, 2024
Merged

chore: adapt to Move refactor upstream #29

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
11 changes: 9 additions & 2 deletions ...main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import ai.timefold.solver.core.impl.localsearch.decider.LocalSearchDecider;
import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
import ai.timefold.solver.core.impl.move.director.MoveDirector;
import ai.timefold.solver.core.impl.score.director.InnerScoreDirector;
import ai.timefold.solver.core.impl.score.director.InnerScoreDirectorFactory;
import ai.timefold.solver.core.impl.solver.DefaultSolver;
Expand All @@ -35,6 +36,7 @@ abstract class AbstractProblem<Solution_> implements Problem {
private final InnerScoreDirectorFactory<Solution_, ?> scoreDirectorFactory;
private final Solution_ originalSolution;

private MoveDirector<Solution_> moveDirector;
private InnerScoreDirector<Solution_, ?> scoreDirector;
private MoveSelector<Solution_> moveSelector;
private Iterator<Move<Solution_>> moveIterator;
Expand Down Expand Up @@ -104,6 +106,7 @@ public final void setupIteration() {
scoreDirector.setWorkingSolution(scoreDirector.cloneSolution(originalSolution)); // Use fresh solution again.
scoreDirector.triggerVariableListeners();
scoreDirector.calculateScore();
moveDirector = new MoveDirector<>(scoreDirector);
// Prepare the lifecycle.
var solverScope = new SolverScope<Solution_>();
solverScope.setScoreDirector(scoreDirector);
Expand Down Expand Up @@ -146,10 +149,14 @@ public final void setupInvocation() {
*/
@Override
public final Object runInvocation() {
var scoreDirector = (InnerScoreDirector<Solution_, ?>) moveDirector.getScoreDirector();
if (willUndo) {
move = move.doMove(scoreDirector); // Do the move and prepare undo.
try (var ephemeralMoveDirector = moveDirector.ephemeral()) {
move.doMoveOnly(ephemeralMoveDirector.getScoreDirector());
}
} else {
move.doMoveOnly(scoreDirector); // Do the move without any undo.
}
move.doMoveOnly(scoreDirector); // Run either the original move, or the undo.
return scoreDirector.calculateScore();
}

Expand Down
Loading