fix: avoid reusing configuration on move factories (#1814)

(cherry picked from commit dbb9b53)

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/SwapMoveSelectorFactory.java

@@ -30,7 +30,9 @@ public class SwapMoveSelectorFactory<Solution_>
     private static final Logger LOGGER = LoggerFactory.getLogger(SwapMoveSelectorFactory.class);
 
     public SwapMoveSelectorFactory(SwapMoveSelectorConfig moveSelectorConfig) {
-        super(moveSelectorConfig);
+        // We copy the configuration,
+        // as the settings may be updated during the autoconfiguration of the entity value range
+        super(Objects.requireNonNull(moveSelectorConfig).copyConfig());
     }
 
     @Override

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveSelectorFactory.java

@@ -29,7 +29,9 @@ public class ListChangeMoveSelectorFactory<Solution_>
         extends AbstractMoveSelectorFactory<Solution_, ListChangeMoveSelectorConfig> {
 
     public ListChangeMoveSelectorFactory(ListChangeMoveSelectorConfig moveSelectorConfig) {
-        super(moveSelectorConfig);
+        // We copy the configuration,
+        // as the settings may be updated during the autoconfiguration of the entity value range
+        super(Objects.requireNonNull(moveSelectorConfig).copyConfig());
     }
 
     @Override

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListSwapMoveSelectorFactory.java

@@ -25,7 +25,9 @@ public class ListSwapMoveSelectorFactory<Solution_>
         extends AbstractMoveSelectorFactory<Solution_, ListSwapMoveSelectorConfig> {
 
     public ListSwapMoveSelectorFactory(ListSwapMoveSelectorConfig moveSelectorConfig) {
-        super(moveSelectorConfig);
+        // We copy the configuration,
+        // as the settings may be updated during the autoconfiguration of the entity value range
+        super(Objects.requireNonNull(moveSelectorConfig).copyConfig());
     }
 
     @Override

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

@@ -2184,21 +2184,66 @@ void solveMultiEntityMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig
         }
     }
 
+    private static List<MoveSelectorConfig> generateMovesForBasicVar() {
+        var allMoveSelectionConfigList = new ArrayList<MoveSelectorConfig>();
+        // Shared entity selector config
+        var entitySelectorConfig = new EntitySelectorConfig()
+                .withEntityClass(TestdataAllowsUnassignedEntityProvidingEntity.class);
+        // Change - basic
+        allMoveSelectionConfigList.add(new ChangeMoveSelectorConfig().withEntitySelectorConfig(entitySelectorConfig));
+        // Swap - basic
+        allMoveSelectionConfigList.add(new SwapMoveSelectorConfig().withEntitySelectorConfig(entitySelectorConfig));
+        // Pillar change - basic
+        var pillarChangeMoveSelectorConfig = new PillarChangeMoveSelectorConfig();
+        var pillarChangeValueSelectorConfig = new ValueSelectorConfig().withVariableName("value");
+        pillarChangeMoveSelectorConfig
+                .withPillarSelectorConfig(new PillarSelectorConfig().withEntitySelectorConfig(entitySelectorConfig))
+                .withValueSelectorConfig(pillarChangeValueSelectorConfig);
+        allMoveSelectionConfigList.add(pillarChangeMoveSelectorConfig);
+        // Pilar swap - basic
+        allMoveSelectionConfigList.add(new PillarSwapMoveSelectorConfig().withPillarSelectorConfig(
+                new PillarSelectorConfig().withEntitySelectorConfig(entitySelectorConfig)));
+        // R&R - basic
+        allMoveSelectionConfigList.add(new RuinRecreateMoveSelectorConfig().withEntitySelectorConfig(entitySelectorConfig));
+        // Union of all moves
+        allMoveSelectionConfigList.add(new UnionMoveSelectorConfig(List.copyOf(allMoveSelectionConfigList)));
+        return allMoveSelectionConfigList;
+    }
+
     @ParameterizedTest
-    @MethodSource("generateMovesForSingleVar")
-    void solveBasicVarEntityRangeModel(MoveSelectorConfig moveSelectionConfig) {
+    @MethodSource("generateMovesForBasicVar")
+    void solveBasicVarEntityRangeModelSingleLocalSearch(MoveSelectorConfig moveSelectionConfig) {
+        solveBasicVarEntityRangeModel(moveSelectionConfig, false);
+    }
+
+    @ParameterizedTest
+    @MethodSource("generateMovesForBasicVar")
+    void solveBasicVarEntityRangeModelMultipleLocalSearch(MoveSelectorConfig moveSelectionConfig) {
+        solveBasicVarEntityRangeModel(moveSelectionConfig, true);
+    }
+
+    private void solveBasicVarEntityRangeModel(MoveSelectorConfig moveSelectionConfig, boolean multipleLocalSearch) {
         // Local search
         var localSearchConfig = new LocalSearchPhaseConfig()
                 .withMoveSelectorConfig(moveSelectionConfig)
                 .withTerminationConfig(new TerminationConfig().withMoveCountLimit(1000L));
 
+        // Local search 2
+        var localSearchConfig2 = new LocalSearchPhaseConfig()
+                .withMoveSelectorConfig(moveSelectionConfig)
+                .withTerminationConfig(new TerminationConfig().withMoveCountLimit(1000L));
+
         var solverConfig = PlannerTestUtils
                 .buildSolverConfig(TestdataAllowsUnassignedEntityProvidingSolution.class,
                         TestdataAllowsUnassignedEntityProvidingEntity.class)
                 .withEasyScoreCalculatorClass(TestdataAllowsUnassignedEntityProvidingScoreCalculator.class)
                 .withEnvironmentMode(EnvironmentMode.TRACKED_FULL_ASSERT)
                 .withPhases(new ConstructionHeuristicPhaseConfig(), localSearchConfig);
 
+        if (multipleLocalSearch) {
+            solverConfig.withPhases(new ConstructionHeuristicPhaseConfig(), localSearchConfig, localSearchConfig2);
+        }
+
         var value1 = new TestdataValue("v1");
         var value2 = new TestdataValue("v2");
         var value3 = new TestdataValue("v3");
@@ -2225,16 +2270,21 @@ void solveBasicVarEntityRangeModel(MoveSelectorConfig moveSelectionConfig) {
     private static List<MoveSelectorConfig> generateMovesForListVarEntityRangeModel() {
         // Local Search
         var allMoveSelectionConfigList = new ArrayList<MoveSelectorConfig>();
+        // Shared value selector config
+        var valueSelectorConfig = new ValueSelectorConfig()
+                .withVariableName("valueList");
         // Change - list
-        allMoveSelectionConfigList.add(new ListChangeMoveSelectorConfig());
+        allMoveSelectionConfigList.add(new ListChangeMoveSelectorConfig().withValueSelectorConfig(valueSelectorConfig));
         // Swap - list
-        allMoveSelectionConfigList.add(new ListSwapMoveSelectorConfig());
+        allMoveSelectionConfigList.add(new ListSwapMoveSelectorConfig().withValueSelectorConfig(valueSelectorConfig));
         // Sublist change - list
-        allMoveSelectionConfigList.add(new SubListChangeMoveSelectorConfig());
+        allMoveSelectionConfigList.add(new SubListChangeMoveSelectorConfig()
+                .withSubListSelectorConfig(new SubListSelectorConfig().withValueSelectorConfig(valueSelectorConfig)));
         // Sublist swap - list
-        allMoveSelectionConfigList.add(new SubListSwapMoveSelectorConfig());
+        allMoveSelectionConfigList.add(new SubListSwapMoveSelectorConfig()
+                .withSubListSelectorConfig(new SubListSelectorConfig().withValueSelectorConfig(valueSelectorConfig)));
         // KOpt - list
-        allMoveSelectionConfigList.add(new KOptListMoveSelectorConfig());
+        allMoveSelectionConfigList.add(new KOptListMoveSelectorConfig().withValueSelectorConfig(valueSelectorConfig));
         // R&R - list
         allMoveSelectionConfigList.add(new ListRuinRecreateMoveSelectorConfig());
         // Union of all moves
@@ -2244,19 +2294,38 @@ private static List<MoveSelectorConfig> generateMovesForListVarEntityRangeModel(
 
     @ParameterizedTest
     @MethodSource("generateMovesForListVarEntityRangeModel")
-    void solveListVarEntityRangeModel(MoveSelectorConfig moveSelectionConfig) {
+    void solveListVarEntityRangeModelSingleLocalSearch(MoveSelectorConfig moveSelectionConfig) {
+        solveListVarEntityRangeModel(moveSelectionConfig, false);
+    }
+
+    @ParameterizedTest
+    @MethodSource("generateMovesForListVarEntityRangeModel")
+    void solveListVarEntityRangeModelMultipleLocalSearch(MoveSelectorConfig moveSelectionConfig) {
+        solveListVarEntityRangeModel(moveSelectionConfig, true);
+    }
+
+    private void solveListVarEntityRangeModel(MoveSelectorConfig moveSelectionConfig, boolean multipleLocalSearch) {
         // Local search
         var localSearchConfig = new LocalSearchPhaseConfig()
                 .withMoveSelectorConfig(moveSelectionConfig)
                 .withTerminationConfig(new TerminationConfig().withMoveCountLimit(1000L));
 
+        // Local search 2
+        var localSearchConfig2 = new LocalSearchPhaseConfig()
+                .withMoveSelectorConfig(moveSelectionConfig)
+                .withTerminationConfig(new TerminationConfig().withMoveCountLimit(1000L));
+
         var solverConfig = PlannerTestUtils
                 .buildSolverConfig(TestdataListUnassignedEntityProvidingSolution.class,
                         TestdataListUnassignedEntityProvidingEntity.class)
                 .withEnvironmentMode(EnvironmentMode.TRACKED_FULL_ASSERT)
                 .withEasyScoreCalculatorClass(TestdataListUnassignedEntityProvidingScoreCalculator.class)
                 .withPhases(new ConstructionHeuristicPhaseConfig(), localSearchConfig);
 
+        if (multipleLocalSearch) {
+            solverConfig.withPhases(new ConstructionHeuristicPhaseConfig(), localSearchConfig, localSearchConfig2);
+        }
+
         var value1 = new TestdataValue("v1");
         var value2 = new TestdataValue("v2");
         var value3 = new TestdataValue("v3");