fix: merge fixes

Author: Christopher-Chianelli

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/ShadowVariableSupport.java

@@ -50,7 +50,9 @@ public final class ShadowVariableSupport<Solution_> implements SupplyManager {
 
     public static <Solution_> ShadowVariableSupport<Solution_> create(InnerScoreDirector<Solution_, ?> scoreDirector) {
         return new ShadowVariableSupport<>(scoreDirector,
-                TimefoldSolverEnterpriseService.loadOrDefault(service -> service::buildTopologyGraph,
+                TimefoldSolverEnterpriseService.loadOrDefault(
+                        service -> size -> service.buildTopologyGraph(size,
+                                scoreDirector.ignoreInconsistentSolutions()),
                         () -> DefaultTopologicalOrderGraph::new));
     }
 
@@ -303,7 +305,8 @@ public void resetWorkingSolution() {
                     scoreDirector,
                     shadowVariableGraphCreator);
             shadowVariableSession =
-                    shadowVariableSessionFactory.forSolution(consistencyTracker, scoreDirector.getWorkingSolution());
+                    shadowVariableSessionFactory.forSolution(consistencyTracker, scoreDirector.ignoreInconsistentSolutions(),
+                            scoreDirector.getWorkingSolution());
         }
     }
 
@@ -412,11 +415,12 @@ public boolean updateShadowVariables() {
         if (shadowVariableSession != null) {
             if (!shadowVariableSession.updateVariables()) {
                 updateSuccessful = false;
-                notificationQueuesAreEmpty = true;
                 return false;
             }
         }
         dirty = false;
+        updateSuccessful = true;
+        return true;
     }
 
     public List<Object> getInconsistentEntities() {

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

@@ -344,14 +344,14 @@ protected void afterSetWorkingSolution() {
     }
 
     public void unassignInconsistentEntities() {
-        var inconsistentEntities = variableListenerSupport.getInconsistentEntities();
+        var inconsistentEntities = shadowVariableSupport.getInconsistentEntities();
         if (listVariableStateSupply != null) {
             var listVariableDescriptor = listVariableStateSupply.getSourceVariableDescriptor();
             var listElementClass = listVariableStateSupply.getSourceVariableDescriptor().getElementType();
             for (var inconsistentEntity : inconsistentEntities) {
                 if (listElementClass.isInstance(inconsistentEntity)) {
                     var inverse = Objects.requireNonNull(listVariableStateSupply.getInverseSingleton(inconsistentEntity));
-                    int index = Objects.requireNonNull(listVariableStateSupply.getIndex(inconsistentEntity));
+                    int index = listVariableStateSupply.getIndexOrFail(inconsistentEntity);
 
                     if (listVariableDescriptor.isElementPinned(Objects.requireNonNull(workingSolution), inverse, index)) {
                         throw new IllegalStateException("""
@@ -364,7 +364,7 @@ public void unassignInconsistentEntities() {
                     listVariableDescriptor.removeElement(inverse, index);
                     afterListVariableChanged(listVariableDescriptor, inverse, index, index);
                     afterListVariableElementUnassigned(listVariableDescriptor, inconsistentEntity);
-                    triggerVariableListeners();
+                    updateShadowVariables();
                 }
                 // Unassign any normal @PlanningVariable on the entity too
                 unassignPlainEntity(inconsistentEntity);
@@ -393,7 +393,7 @@ private void unassignPlainEntity(Object inconsistentEntity) {
             genuineVariableDescriptor.setValue(inconsistentEntity, null);
             afterVariableChanged(genuineVariableDescriptor, inconsistentEntity);
         }
-        triggerVariableListeners();
+        updateShadowVariables();
     }
 
     @Override