chore: calculate ignoreInconsistentSolution on score director

Author: Christopher-Chianelli

core/src/main/java/ai/timefold/solver/core/impl/score/director/AbstractScoreDirector.java

@@ -74,7 +74,7 @@ public abstract class AbstractScoreDirector<Solution_, Score_ extends Score<Scor
     private final @Nullable LookupManager lookUpManager;
     protected final ConstraintMatchPolicy constraintMatchPolicy;
     private boolean expectShadowVariablesInCorrectState;
-    private boolean ignoreInconsistentSolutions;
+    private final boolean ignoreInconsistentSolutions;
     private final VariableDescriptorCache<Solution_> variableDescriptorCache;
     protected final ShadowVariableSupport<Solution_> shadowVariableSupport;
     private final @Nullable SolutionTracker<Solution_> solutionTracker; // Null when tracking disabled.
@@ -110,7 +110,7 @@ protected AbstractScoreDirector(AbstractScoreDirectorBuilder<Solution_, Score_,
         this.lookUpManager = lookUpEnabled ? new LookupManager(solutionDescriptor.getLookUpStrategyResolver()) : null;
         this.constraintMatchPolicy = builder.constraintMatchPolicy;
         this.expectShadowVariablesInCorrectState = builder.expectShadowVariablesInCorrectState;
-        this.ignoreInconsistentSolutions = builder.ignoreInconsistentSolutions;
+        this.ignoreInconsistentSolutions = !solutionDescriptor.hasAnyShadowVariablesInconsistentMember();
         this.variableDescriptorCache = new VariableDescriptorCache<>(solutionDescriptor);
         this.shadowVariableSupport = ShadowVariableSupport.create(this);
         this.shadowVariableSupport.linkShadowVariables();
@@ -524,7 +524,6 @@ public InnerScoreDirector<Solution_, Score_> createChildThreadScoreDirector(Chil
             var childThreadScoreDirector = scoreDirectorFactory.createScoreDirectorBuilder()
                     .withLookUpEnabled(lookUpEnabled)
                     .withConstraintMatchPolicy(constraintMatchPolicy)
-                    .withIgnoreInconsistentSolutions(ignoreInconsistentSolutions)
                     .buildDerived();
             // ScoreCalculationCountTermination takes into account previous phases
             // but the calculationCount of partitions is maxed, not summed.
@@ -534,7 +533,6 @@ public InnerScoreDirector<Solution_, Score_> createChildThreadScoreDirector(Chil
             var childThreadScoreDirector = scoreDirectorFactory.createScoreDirectorBuilder()
                     .withLookUpEnabled(true)
                     .withConstraintMatchPolicy(constraintMatchPolicy)
-                    .withIgnoreInconsistentSolutions(ignoreInconsistentSolutions)
                     .buildDerived();
             childThreadScoreDirector.setWorkingSolution(cloneWorkingSolution());
             return childThreadScoreDirector;
@@ -807,7 +805,6 @@ private void assertScoreFromScratch(InnerScore<Score_> innerScore, Object comple
         // Most score directors don't need derived status; CS will override this.
         try (var uncorruptedScoreDirector = assertionScoreDirectorFactory.createScoreDirectorBuilder()
                 .withConstraintMatchPolicy(ConstraintMatchPolicy.ENABLED)
-                .withIgnoreInconsistentSolutions(ignoreInconsistentSolutions)
                 .buildDerived()) {
             uncorruptedScoreDirector.setWorkingSolution(workingSolution);
             var uncorruptedInnerScore = uncorruptedScoreDirector.calculateScore();
@@ -1006,7 +1003,6 @@ public abstract static class AbstractScoreDirectorBuilder<Solution_, Score_ exte
         protected ConstraintMatchPolicy constraintMatchPolicy = ConstraintMatchPolicy.DISABLED;
         protected boolean lookUpEnabled = false;
         protected boolean expectShadowVariablesInCorrectState = true;
-        protected boolean ignoreInconsistentSolutions = false;
 
         protected AbstractScoreDirectorBuilder(Factory_ scoreDirectorFactory) {
             this.scoreDirectorFactory = Objects.requireNonNull(scoreDirectorFactory);
@@ -1030,12 +1026,6 @@ public Builder_ withExpectShadowVariablesInCorrectState(boolean expectShadowVari
             return (Builder_) this;
         }
 
-        @SuppressWarnings("unchecked")
-        public Builder_ withIgnoreInconsistentSolutions(boolean ignoreInconsistentSolutions) {
-            this.ignoreInconsistentSolutions = ignoreInconsistentSolutions;
-            return (Builder_) this;
-        }
-
         public abstract AbstractScoreDirector<Solution_, Score_, Factory_> build();
 
         /**

core/src/main/java/ai/timefold/solver/core/impl/solver/DefaultSolutionManager.java

@@ -65,10 +65,8 @@ private <Result_> Result_ callScoreDirector(String feature, Solution_ solution,
             boolean cloneSolution) {
         var isShadowVariableUpdateEnabled = solutionUpdatePolicy.isShadowVariableUpdateEnabled();
         var nonNullSolution = Objects.requireNonNull(solution);
-        var allowsInconsistent = getScoreDirectorFactory().getSolutionDescriptor().hasAnyShadowVariablesInconsistentMember();
         try (var scoreDirector = getScoreDirectorFactory().createScoreDirectorBuilder().withLookUpEnabled(cloneSolution)
                 .withConstraintMatchPolicy(constraintMatchPolicy)
-                .withIgnoreInconsistentSolutions(!allowsInconsistent)
                 .withExpectShadowVariablesInCorrectState(!isShadowVariableUpdateEnabled).build()) {
             nonNullSolution = cloneSolution ? scoreDirector.cloneSolution(nonNullSolution) : nonNullSolution;
             if (isShadowVariableUpdateEnabled) {

core/src/main/java/ai/timefold/solver/core/impl/solver/DefaultSolverFactory.java

@@ -126,7 +126,6 @@ public Solver<Solution_> buildSolver(SolverConfigOverride configOverride) {
         }
         var castScoreDirector = scoreDirectorFactory.createScoreDirectorBuilder()
                 .withLookUpEnabled(true) // Custom phases and problem changes may rely on lookups.
-                .withIgnoreInconsistentSolutions(!solutionDescriptor.hasAnyShadowVariablesInconsistentMember())
                 .withConstraintMatchPolicy(
                         constraintMatchEnabled ? ConstraintMatchPolicy.ENABLED : ConstraintMatchPolicy.DISABLED)
                 .build();