chore: address comments

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/constructionheuristic/placer/QueuedValuePlacer.java

@@ -32,7 +32,7 @@ public Iterator<Placement<Solution_>> iterator() {
         return new QueuedValuePlacingIterator();
     }
 
-    public boolean isListChangeMoveSelector() {
+    public boolean hasListChangeMoveSelector() {
         return moveSelector instanceof ListChangeMoveSelector<Solution_>;
     }
 

core/src/main/java/ai/timefold/solver/core/impl/move/PlacerBasedMoveRepository.java

@@ -86,7 +86,7 @@ public boolean hasListVariable() {
         // However, in certain cases, such as ALLOCATE_TO_VALUE_FROM_QUEUE,
         // a QueuedValuePlacer can be created for a basic planning variable,
         // and in these cases, the move selector does not rely on a list variable.
-        return placer instanceof QueuedValuePlacer<Solution_> queuedValuePlacer && queuedValuePlacer.isListChangeMoveSelector();
+        return placer instanceof QueuedValuePlacer<Solution_> queuedValuePlacer && queuedValuePlacer.hasListChangeMoveSelector();
     }
 
 }

core/src/test/java/ai/timefold/solver/core/impl/solver/DefaultSolverTest.java

@@ -119,8 +119,8 @@
 import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntityFirstEntity;
 import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySecondEntity;
 import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySolution;
-import ai.timefold.solver.core.testdomain.mixed.singleentity.MixedCustomBasicVariableFactory;
-import ai.timefold.solver.core.testdomain.mixed.singleentity.MixedCustomPhase;
+import ai.timefold.solver.core.testdomain.mixed.singleentity.MixedCustomMoveIteratorFactory;
+import ai.timefold.solver.core.testdomain.mixed.singleentity.MixedCustomPhaseCommand;
 import ai.timefold.solver.core.testdomain.mixed.singleentity.TestdataMixedEasyScoreCalculator;
 import ai.timefold.solver.core.testdomain.mixed.singleentity.TestdataMixedEntity;
 import ai.timefold.solver.core.testdomain.mixed.singleentity.TestdataMixedOtherValue;
@@ -1760,7 +1760,7 @@ void solveMixedModelCustomMove() {
                                 .withValueSelectorConfig(new ValueSelectorConfig().withVariableName("valueList"))),
                         new LocalSearchPhaseConfig()
                                 .withMoveSelectorConfig(new MoveIteratorFactoryConfig()
-                                        .withMoveIteratorFactoryClass(MixedCustomBasicVariableFactory.class))
+                                        .withMoveIteratorFactoryClass(MixedCustomMoveIteratorFactory.class))
                                 .withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
                 .withEasyScoreCalculatorClass(TestdataMixedEasyScoreCalculator.class);
 
@@ -1783,7 +1783,7 @@ void solveMixedModelCustomPhase() {
                         new ConstructionHeuristicPhaseConfig().withEntityPlacerConfig(new QueuedValuePlacerConfig()
                                 .withValueSelectorConfig(new ValueSelectorConfig().withVariableName("valueList"))),
                         new CustomPhaseConfig()
-                                .withCustomPhaseCommands(new MixedCustomPhase())
+                                .withCustomPhaseCommands(new MixedCustomPhaseCommand())
                                 .withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
                 .withEasyScoreCalculatorClass(TestdataMixedEasyScoreCalculator.class);
 

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomBasicVariableFactory.java

@@ -0,0 +1,36 @@
+package ai.timefold.solver.core.testdomain.mixed.singleentity;
+
+import java.util.Iterator;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.impl.heuristic.selector.move.factory.MoveIteratorFactory;
+import ai.timefold.solver.core.impl.heuristic.selector.move.generic.ChangeMove;
+
+public class MixedCustomMoveIteratorFactory
+        implements MoveIteratorFactory<TestdataMixedSolution, ChangeMove<TestdataMixedSolution>> {
+    @Override
+    public long getSize(ScoreDirector<TestdataMixedSolution> scoreDirector) {
+        return scoreDirector.getWorkingSolution().getEntityList().size();
+    }
+
+    @Override
+    public Iterator<ChangeMove<TestdataMixedSolution>>
+            createOriginalMoveIterator(ScoreDirector<TestdataMixedSolution> scoreDirector) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Iterator<ChangeMove<TestdataMixedSolution>>
+            createRandomMoveIterator(ScoreDirector<TestdataMixedSolution> scoreDirector, Random workingRandom) {
+        var solutionDescriptor = TestdataMixedSolution.buildSolutionDescriptor();
+        var variableDescriptor =
+                solutionDescriptor.findEntityDescriptor(TestdataMixedEntity.class).getGenuineVariableDescriptor("basicValue");
+        var move1 = new ChangeMove<>(variableDescriptor, scoreDirector.getWorkingSolution().getEntityList().get(0),
+                scoreDirector.getWorkingSolution().getOtherValueList().get(0));
+        var move2 = new ChangeMove<>(variableDescriptor, scoreDirector.getWorkingSolution().getEntityList().get(0),
+                scoreDirector.getWorkingSolution().getOtherValueList().get(1));
+        return Stream.of(move1, move2).iterator();
+    }
+}

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomBasicVariableSwapMove.java

@@ -5,14 +5,14 @@
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
 import ai.timefold.solver.core.api.solver.phase.PhaseCommand;
 
-public class MixedCustomPhase implements PhaseCommand<TestdataMixedSolution> {
+public class MixedCustomPhaseCommand implements PhaseCommand<TestdataMixedSolution> {
 
     @Override
     public void changeWorkingSolution(ScoreDirector<TestdataMixedSolution> scoreDirector, BooleanSupplier isPhaseTerminated) {
-        var moveIteratorFactory = new MixedCustomBasicVariableFactory();
+        var moveIteratorFactory = new MixedCustomMoveIteratorFactory();
         var moveIterator = moveIteratorFactory.createRandomMoveIterator(scoreDirector, null);
         var move = moveIterator.next();
-        move.doMoveOnGenuineVariables(scoreDirector);
+        move.doMoveOnly(scoreDirector);
         scoreDirector.triggerVariableListeners();
     }
 }

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomMoveIteratorFactory.java

@@ -25,7 +25,7 @@ public class TestdataMixedValue extends TestdataObject {
     @IndexShadowVariable(sourceVariableName = "valueList")
     private Integer index;
 
-    @ShadowVariable(variableListenerClass = TestdataMixedValueListener.class, sourceVariableName = "index")
+    @ShadowVariable(variableListenerClass = TestdataMixedVariableListener.class, sourceVariableName = "index")
     private Integer shadowVariableListenerValue;
 
     @CascadingUpdateShadowVariable(targetMethodName = "updateCascadingShadowValue")

…mixed/singleentity/MixedCustomPhase.java …ingleentity/MixedCustomPhaseCommand.javacore/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomPhase.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomPhaseCommand.java core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomPhase.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/mixed/singleentity/MixedCustomPhaseCommand.java

@@ -5,7 +5,7 @@
 
 import org.jspecify.annotations.NonNull;
 
-public class TestdataMixedValueListener implements VariableListener<TestdataMixedSolution, TestdataMixedValue> {
+public class TestdataMixedVariableListener implements VariableListener<TestdataMixedSolution, TestdataMixedValue> {
     @Override
     public void beforeVariableChanged(@NonNull ScoreDirector<TestdataMixedSolution> scoreDirector,
             @NonNull TestdataMixedValue value) {