fix: use different SolverScope in the RuinRecreateMove nested phase

TimefoldAI · Jan 17, 2025 · d769425 · d769425
1 parent c42acc7
commit d769425
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 9 deletions.
diff --git a/...n/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/RuinRecreateMove.java b/...n/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/RuinRecreateMove.java
@@ -46,15 +46,20 @@ protected void doMoveOnGenuineVariables(ScoreDirector<Solution_> scoreDirector)
         }
         recordingScoreDirector.triggerVariableListeners();
 
-        var constructionHeuristicPhase = constructionHeuristicPhaseBuilder
-                .ensureThreadSafe(recordingScoreDirector.getBacking())
-                .withElementsToRecreate(ruinedEntityList)
-                .build();
-        constructionHeuristicPhase.setSolver(solverScope.getSolver());
-        constructionHeuristicPhase.solvingStarted(solverScope);
-        constructionHeuristicPhase.solve(solverScope);
-        constructionHeuristicPhase.solvingEnded(solverScope);
-        recordingScoreDirector.triggerVariableListeners();
+        var constructionHeuristicPhase =
+                (RuinRecreateConstructionHeuristicPhase<Solution_>) constructionHeuristicPhaseBuilder
+                        .ensureThreadSafe(recordingScoreDirector.getBacking())
+                        .withElementsToRecreate(ruinedEntityList)
+                        .build();
+
+        var nestedSolverScope = new SolverScope<Solution_>();
+        nestedSolverScope.setSolver(solverScope.getSolver());
+        nestedSolverScope.setScoreDirector(recordingScoreDirector.getBacking());
+        constructionHeuristicPhase.setSolver(nestedSolverScope.getSolver());
+        constructionHeuristicPhase.solvingStarted(nestedSolverScope);
+        constructionHeuristicPhase.solve(nestedSolverScope);
+        constructionHeuristicPhase.solvingEnded(nestedSolverScope);
+        scoreDirector.triggerVariableListeners();
 
         for (var i = 0; i < ruinedEntityList.size(); i++) {
             recordedNewValues[i] = genuineVariableDescriptor.getValue(ruinedEntityList.get(i));

diff --git a/core/src/test/java/ai/timefold/solver/core/impl/move/director/MoveDirectorTest.java b/core/src/test/java/ai/timefold/solver/core/impl/move/director/MoveDirectorTest.java
@@ -5,6 +5,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -16,10 +17,12 @@
 import ai.timefold.solver.core.impl.domain.solution.descriptor.DefaultPlanningListVariableMetaModel;
 import ai.timefold.solver.core.impl.domain.solution.descriptor.DefaultPlanningVariableMetaModel;
 import ai.timefold.solver.core.impl.domain.variable.ListVariableStateSupply;
+import ai.timefold.solver.core.impl.domain.variable.descriptor.GenuineVariableDescriptor;
 import ai.timefold.solver.core.impl.domain.variable.descriptor.ListVariableDescriptor;
 import ai.timefold.solver.core.impl.domain.variable.supply.SupplyManager;
 import ai.timefold.solver.core.impl.heuristic.selector.move.generic.RuinRecreateConstructionHeuristicPhase;
 import ai.timefold.solver.core.impl.heuristic.selector.move.generic.RuinRecreateConstructionHeuristicPhaseBuilder;
+import ai.timefold.solver.core.impl.heuristic.selector.move.generic.RuinRecreateMove;
 import ai.timefold.solver.core.impl.heuristic.selector.move.generic.list.ruin.ListRuinRecreateMove;
 import ai.timefold.solver.core.impl.score.director.InnerScoreDirector;
 import ai.timefold.solver.core.impl.solver.scope.SolverScope;
@@ -285,4 +288,43 @@ void undoNestedPhaseMove() {
         }
     }
 
+    @Test
+    void testSolverScopeNestedPhase() {
+        var innerScoreDirector = mock(InnerScoreDirector.class);
+        var moveDirector = new MoveDirector<TestdataSolution>(innerScoreDirector);
+        var genuineVariableDescriptor = mock(GenuineVariableDescriptor.class);
+        var supplyManager = mock(SupplyManager.class);
+        var ruinRecreateConstructionHeuristicPhaseBuilder = mock(RuinRecreateConstructionHeuristicPhaseBuilder.class);
+        var constructionHeuristicPhase = mock(RuinRecreateConstructionHeuristicPhase.class);
+        var mainSolverScope = mock(SolverScope.class);
+
+        var v1 = new TestdataValue("v1");
+        var v2 = new TestdataValue("v2");
+        var e1 = new TestdataEntity("e1", v1);
+        var e2 = new TestdataEntity("e2", v2);
+        var s1 = new TestdataSolution();
+        s1.setEntityList(List.of(e1, e2));
+        s1.setValueList(List.of(v1, v2));
+        when(innerScoreDirector.getWorkingSolution()).thenReturn(s1);
+        when(innerScoreDirector.isDerived()).thenReturn(false);
+        when(innerScoreDirector.getSupplyManager()).thenReturn(supplyManager);
+        when(ruinRecreateConstructionHeuristicPhaseBuilder.withElementsToRecreate(any()))
+                .thenReturn(ruinRecreateConstructionHeuristicPhaseBuilder);
+        when(ruinRecreateConstructionHeuristicPhaseBuilder.ensureThreadSafe(any()))
+                .thenReturn(ruinRecreateConstructionHeuristicPhaseBuilder);
+        when(ruinRecreateConstructionHeuristicPhaseBuilder.build())
+                .thenReturn(constructionHeuristicPhase);
+        try (var ephemeralMoveDirector = moveDirector.ephemeral()) {
+            var scoreDirector = ephemeralMoveDirector.getScoreDirector();
+
+            var move = new RuinRecreateMove<TestdataSolution>(genuineVariableDescriptor,
+                    ruinRecreateConstructionHeuristicPhaseBuilder, mainSolverScope, List.of(v1), Set.of(e1));
+            move.doMoveOnly(scoreDirector);
+            // Not using the main solver scope
+            verify(constructionHeuristicPhase, times(0)).solve(mainSolverScope);
+            // Uses a new instance of SolverScope
+            verify(constructionHeuristicPhase, times(1)).solve(any());
+        }
+    }
+
 }