Skip to content

Commit 8a162cc

Browse files
authored
chore: adapt to latest changes in the solver (#31)
1 parent 4c75200 commit 8a162cc

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
2222
import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
2323
import ai.timefold.solver.core.impl.move.director.MoveDirector;
24+
import ai.timefold.solver.core.impl.score.constraint.ConstraintMatchPolicy;
2425
import ai.timefold.solver.core.impl.score.director.InnerScoreDirector;
2526
import ai.timefold.solver.core.impl.score.director.InnerScoreDirectorFactory;
2627
import ai.timefold.solver.core.impl.solver.DefaultSolver;
@@ -102,7 +103,8 @@ public final void setupTrial() {
102103
public final void setupIteration() {
103104
// We only care about incremental performance; therefore calculate the entire solution outside of invocation.
104105
scoreDirector = scoreDirectorFactory.buildScoreDirector(false,
105-
scoreDirectorType == ScoreDirectorType.CONSTRAINT_STREAMS_JUSTIFIED);
106+
scoreDirectorType == ScoreDirectorType.CONSTRAINT_STREAMS_JUSTIFIED ? ConstraintMatchPolicy.ENABLED
107+
: ConstraintMatchPolicy.DISABLED);
106108
scoreDirector.setWorkingSolution(scoreDirector.cloneSolution(originalSolution)); // Use fresh solution again.
107109
scoreDirector.triggerVariableListeners();
108110
scoreDirector.calculateScore();

src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ProblemInitializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import ai.timefold.solver.core.impl.constructionheuristic.DefaultConstructionHeuristicPhaseFactory;
2323
import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor;
2424
import ai.timefold.solver.core.impl.heuristic.HeuristicConfigPolicy;
25+
import ai.timefold.solver.core.impl.score.constraint.ConstraintMatchPolicy;
2526
import ai.timefold.solver.core.impl.score.director.InnerScoreDirectorFactory;
2627
import ai.timefold.solver.core.impl.solver.ClassInstanceCache;
2728
import ai.timefold.solver.core.impl.solver.DefaultSolver;
@@ -60,7 +61,7 @@ public static synchronized <Solution_> Solution_ getSolution(Example example,
6061

6162
private static <Solution_> Solution_ initialize(Example example, Solution_ uninitializedSolution,
6263
InnerScoreDirectorFactory<Solution_, ?> scoreDirectorFactory) {
63-
try (var scoreDirector = scoreDirectorFactory.buildScoreDirector(false, false)) {
64+
try (var scoreDirector = scoreDirectorFactory.buildScoreDirector(false, ConstraintMatchPolicy.DISABLED)) {
6465
scoreDirector.setWorkingSolution(uninitializedSolution);
6566
scoreDirector.triggerVariableListeners();
6667
var score = scoreDirector.calculateScore();

0 commit comments

Comments
 (0)