chore: fetch reachable values by range descriptor

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/entity/decorator/FilteringEntityValueRangeSelector.java

@@ -62,7 +62,8 @@ public void phaseStarted(AbstractPhaseScope<Solution_> phaseScope) {
         super.phaseStarted(phaseScope);
         this.entitiesSize = childEntitySelector.getEntityDescriptor().extractEntities(phaseScope.getWorkingSolution()).size();
         this.reachableValues = phaseScope.getScoreDirector().getValueRangeManager()
-                .getReachableValeMatrix(childEntitySelector.getEntityDescriptor().getGenuineListVariableDescriptor());
+                .getReachableValueMatrix(
+                        childEntitySelector.getEntityDescriptor().getGenuineListVariableDescriptor().getValueRangeDescriptor());
         this.childEntitySelector.phaseStarted(phaseScope);
     }
 

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/value/decorator/FilteringValueRangeSelector.java

@@ -76,7 +76,7 @@ public void phaseStarted(AbstractPhaseScope<Solution_> phaseScope) {
         this.nonReplayingValueSelector.phaseStarted(phaseScope);
         this.replayingValueSelector.phaseStarted(phaseScope);
         this.reachableValues = phaseScope.getScoreDirector().getValueRangeManager()
-                .getReachableValeMatrix(listVariableStateSupply.getSourceVariableDescriptor());
+                .getReachableValueMatrix(listVariableStateSupply.getSourceVariableDescriptor().getValueRangeDescriptor());
         valuesSize = reachableValues.getSize();
     }
 

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

@@ -59,8 +59,9 @@ public final class ValueRangeManager<Solution_> {
     private final Map<ValueRangeDescriptor<Solution_>, CountableValueRange<?>> fromSolutionMap = new IdentityHashMap<>();
     private final Map<Object, Map<ValueRangeDescriptor<Solution_>, CountableValueRange<?>>> fromEntityMap =
             new IdentityHashMap<>();
+    private final Map<ValueRangeDescriptor<Solution_>, ReachableValues> fromReachableValuesMap =
+            new IdentityHashMap<>();
 
-    private @Nullable ReachableValues reachableValues = null;
     private @Nullable Solution_ cachedWorkingSolution = null;
     private @Nullable SolutionInitializationStatistics cachedInitializationStatistics = null;
     private @Nullable ProblemSizeStatistics cachedProblemSizeStatistics = null;
@@ -414,15 +415,15 @@ public long countOnEntity(ValueRangeDescriptor<Solution_> valueRangeDescriptor,
                 .getSize();
     }
 
-    public ReachableValues getReachableValeMatrix(ListVariableDescriptor<Solution_> listVariableDescriptor) {
+    public ReachableValues getReachableValueMatrix(ValueRangeDescriptor<Solution_> valueRangeDescriptor) {
+        var reachableValues = fromReachableValuesMap.get(valueRangeDescriptor);
         if (reachableValues == null) {
             if (cachedWorkingSolution == null) {
                 throw new IllegalStateException(
                         "Impossible state: the matrix %s requested before the working solution is known."
                                 .formatted(ReachableValues.class.getSimpleName()));
             }
-            var entityDescriptor = listVariableDescriptor.getEntityDescriptor();
-            var valueRangeDescriptor = listVariableDescriptor.getValueRangeDescriptor();
+            var entityDescriptor = valueRangeDescriptor.getVariableDescriptor().getEntityDescriptor();
             var entityList = entityDescriptor.extractEntities(cachedWorkingSolution);
             var allValues = getFromSolution(valueRangeDescriptor);
             var valuesSize = allValues.getSize();
@@ -449,6 +450,7 @@ public ReachableValues getReachableValeMatrix(ListVariableDescriptor<Solution_>
                 }
             }
             reachableValues = new ReachableValues(entityMatrix, valueMatrix);
+            fromReachableValuesMap.put(valueRangeDescriptor, reachableValues);
         }
         return reachableValues;
     }
@@ -482,7 +484,7 @@ private static void updateValueMap(Map<Object, Set<Object>> valueMatrix, Countab
     public void reset(@Nullable Solution_ workingSolution) {
         fromSolutionMap.clear();
         fromEntityMap.clear();
-        reachableValues = null;
+        fromReachableValuesMap.clear();
         // We only update the cached solution if it is not null; null means to only reset the maps.
         if (workingSolution != null) {
             cachedWorkingSolution = workingSolution;

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/common/ReachableMatrixTest.java

@@ -32,7 +32,7 @@ void testReachableEntities() {
         var solutionDescriptor = scoreDirector.getSolutionDescriptor();
         var entityDescriptor = solutionDescriptor.findEntityDescriptor(TestdataListEntityProvidingEntity.class);
         var reachableValues = scoreDirector.getValueRangeManager()
-                .getReachableValeMatrix(entityDescriptor.getGenuineListVariableDescriptor());
+                .getReachableValueMatrix(entityDescriptor.getGenuineListVariableDescriptor().getValueRangeDescriptor());
 
         assertThat(reachableValues.extractEntities(v1)).containsExactlyInAnyOrder(a);
         assertThat(reachableValues.extractEntities(v2)).containsExactlyInAnyOrder(a, b);
@@ -60,7 +60,7 @@ void testReachableValues() {
         var solutionDescriptor = scoreDirector.getSolutionDescriptor();
         var entityDescriptor = solutionDescriptor.findEntityDescriptor(TestdataListEntityProvidingEntity.class);
         var reachableValues = scoreDirector.getValueRangeManager()
-                .getReachableValeMatrix(entityDescriptor.getGenuineListVariableDescriptor());
+                .getReachableValueMatrix(entityDescriptor.getGenuineListVariableDescriptor().getValueRangeDescriptor());
 
         assertThat(reachableValues.extractValues(v1)).containsExactlyInAnyOrder(v2, v3);
         assertThat(reachableValues.extractValues(v2)).containsExactlyInAnyOrder(v1, v3);