chore: address comments

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/exhaustivesearch/DefaultExhaustiveSearchPhase.java

@@ -113,7 +113,6 @@ private void phaseEnded(ExhaustiveSearchPhaseScope<Solution_> phaseScope) {
 
     private void stepStarted(ExhaustiveSearchStepScope<Solution_> stepScope) {
         super.stepStarted(stepScope);
-        // Skip entitySelector.stepStarted(stepScope)
         decider.stepStarted(stepScope);
     }
 

core/src/main/java/ai/timefold/solver/core/impl/exhaustivesearch/DefaultExhaustiveSearchPhaseFactory.java

@@ -162,7 +162,6 @@ protected EntityDescriptor<Solution_> deduceEntityDescriptor(SolutionDescriptor<
             BestSolutionRecaller<Solution_> bestSolutionRecaller, PhaseTermination<Solution_> termination,
             boolean scoreBounderEnabled, boolean isListVariable) {
         var manualEntityMimicRecorder = new ManualEntityMimicRecorder<>(sourceEntitySelector);
-        // TODO mimicSelectorId must be a field?
         var mimicSelectorId = ConfigUtils.addRandomSuffix(sourceEntitySelector.getEntityDescriptor().getEntityClass().getName(),
                 configPolicy.getRandom());
         configPolicy.addEntityMimicRecorder(mimicSelectorId, manualEntityMimicRecorder);

core/src/main/java/ai/timefold/solver/core/impl/exhaustivesearch/decider/AbstractExhaustiveSearchDecider.java

@@ -151,7 +151,7 @@ private void processMoverWithoutBounder(ExhaustiveSearchStepScope<Solution_> ste
             if (assertMoveScoreFromScratch) {
                 phaseScope.assertWorkingScoreFromScratch(score, moveNode.getMove());
             }
-            bestSolutionRecaller.processWorkingSolutionDuringMove(score, stepScope, acceptUninitializedSolutions);
+            bestSolutionRecaller.processWorkingSolutionDuringMove(score, stepScope);
         } else {
             phaseScope.addExpandableNode(moveNode);
         }
@@ -167,7 +167,7 @@ private void processMoverWithBounder(ExhaustiveSearchStepScope<Solution_> stepSc
         if (isSolutionComplete) {
             // There is no point in bounding a fully initialized score
             phaseScope.registerPessimisticBound(score);
-            bestSolutionRecaller.processWorkingSolutionDuringMove(score, stepScope, acceptUninitializedSolutions);
+            bestSolutionRecaller.processWorkingSolutionDuringMove(score, stepScope);
         } else {
             var scoreDirector = phaseScope.<Score_> getScoreDirector();
             var castScoreBounder = this.getScoreBounder();

core/src/main/java/ai/timefold/solver/core/impl/exhaustivesearch/decider/MixedVariableExhaustiveSearchDecider.java

@@ -8,7 +8,7 @@
 import ai.timefold.solver.core.impl.solver.scope.SolverScope;
 
 /**
- * Deciders for mixed models depend on the basic and list variable deciders.
+ * Decider for mixed models depends on the basic and lists variable deciders.
  * The optimization process begins by solving the basic variables before moving on to the list variables.
  * The process optimizes each variable separately and stops when the list variable optimization is complete.
  *

core/src/main/java/ai/timefold/solver/core/impl/solver/recaller/BestSolutionRecaller.java

@@ -97,28 +97,8 @@ public <Score_ extends Score<Score_>> void processWorkingSolutionDuringStep(Abst
         }
     }
 
-    /**
-     * Differs from {@link #processWorkingSolutionDuringMove(InnerScore, AbstractStepScope, boolean)}
-     * as it does not accept partially initialized solutions.
-     */
     public <Score_ extends Score<Score_>> void processWorkingSolutionDuringMove(InnerScore<Score_> moveScore,
             AbstractStepScope<Solution_> stepScope) {
-        processWorkingSolutionDuringMove(moveScore, stepScope, false);
-    }
-
-    /**
-     * The solution for mixed models can generate a partially solved solution,
-     * as the complete solution will only be achieved when all variable types are assigned.
-     * The method allows acceptance of partially initialized solutions
-     * if {@code acceptUnassigned} is set to true.
-     *
-     * @param moveScore the move score
-     * @param stepScope the step scope
-     * @param acceptUnassigned flag to accept partially initialized solutions
-     * @param <Score_> the score type
-     */
-    public <Score_ extends Score<Score_>> void processWorkingSolutionDuringMove(InnerScore<Score_> moveScore,
-            AbstractStepScope<Solution_> stepScope, boolean acceptUnassigned) {
         var phaseScope = stepScope.getPhaseScope();
         var solverScope = phaseScope.getSolverScope();
         var bestScoreImproved = moveScore.compareTo(solverScope.getBestScore()) > 0;
@@ -131,6 +111,11 @@ public <Score_ extends Score<Score_>> void processWorkingSolutionDuringMove(Inne
             phaseScope.setBestSolutionStepIndex(stepScope.getStepIndex());
             var newBestSolution = solverScope.getScoreDirector().cloneWorkingSolution();
             InnerScore<Score_> innerScore;
+            // The solution for mixed models can generate a partially solved solution,
+            // as the complete solution will only be achieved when all variable types are assigned.
+            // The flag allows acceptance of partially initialized solutions for mixed models.
+            var acceptUnassigned = stepScope.getScoreDirector().getWorkingInitScore() < 0
+                    && stepScope.getScoreDirector().getSolutionDescriptor().hasBothBasicAndListVariables();
             if (acceptUnassigned) {
                 innerScore =
                         InnerScore.withUnassignedCount(moveScore.raw(), -stepScope.getScoreDirector().getWorkingInitScore());