chore: temporally disabling the mixed model

Author: zepfred

benchmark/src/main/resources/benchmark.xsd

@@ -674,7 +674,7 @@
           <xs:element minOccurs="0" name="valueSorterManner" type="tns:valueSorterManner"/>
 
 
-          <xs:choice minOccurs="0">
+          <xs:choice maxOccurs="unbounded" minOccurs="0">
 
 
             <xs:element name="queuedEntityPlacer" type="tns:queuedEntityPlacerConfig"/>

core/src/main/java/ai/timefold/solver/core/impl/domain/solution/descriptor/SolutionDescriptor.java

@@ -166,6 +166,11 @@ public static <Solution_> SolutionDescriptor<Solution_> buildSolutionDescriptor(
             solutionDescriptor.constraintWeightSupplier.initialize(solutionDescriptor,
                     descriptorPolicy.getMemberAccessorFactory(), descriptorPolicy.getDomainAccessType());
         }
+        // Temporarily disabling the mixed-model feature
+        if (solutionDescriptor.hasBothBasicAndListVariables()) {
+            throw new IllegalStateException(
+                    "The mixed model is currently unavailable for general use. Please modify the model to utilize either a list variable or only basic variables.");
+        }
         return solutionDescriptor;
     }
 

core/src/test/java/ai/timefold/solver/core/impl/constructionheuristic/DefaultConstructionHeuristicPhaseTest.java

@@ -47,6 +47,7 @@
 import ai.timefold.solver.core.testutil.AbstractMeterTest;
 import ai.timefold.solver.core.testutil.PlannerTestUtils;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.micrometer.core.instrument.Metrics;
@@ -348,6 +349,7 @@ void constructionHeuristicAllocateToValueFromQueue() {
                 .filter(e -> e.getValue() == null)).isEmpty();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void failMixedModelDefaultConfiguration() {
         var solverConfig = PlannerTestUtils

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/SubListChangeMoveSelectorFactoryTest.java

@@ -20,6 +20,7 @@
 import ai.timefold.solver.core.testdomain.list.TestdataListSolution;
 import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySolution;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -43,6 +44,7 @@ void buildMoveSelector() {
         assertThat(selector.isSelectReversingMoveToo()).isTrue();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void buildMoveSelectorMultiEntity() {
         var config = new SubListChangeMoveSelectorConfig();

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/SubListSwapMoveSelectorFactoryTest.java

@@ -16,6 +16,7 @@
 import ai.timefold.solver.core.testdomain.list.TestdataListSolution;
 import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySolution;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -40,6 +41,7 @@ void buildBaseMoveSelector() {
         assertThat(selector.isSelectReversingMoveToo()).isTrue();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void buildMoveSelectorMultiEntity() {
         var config = new SubListSwapMoveSelectorConfig();

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

@@ -146,6 +146,7 @@
 import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -1656,6 +1657,7 @@ private static List<MoveSelectorConfig> generateMovesForMultiEntity() {
         return allMoveSelectionConfigList;
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMixedModel() {
         // Same size for both list and basic variables
@@ -1667,6 +1669,7 @@ void solveMixedModel() {
         executeSolveMixedModel(3, 2, 2);
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMultiEntityMixedModel() {
         // Same size for both list and basic variables
@@ -1749,6 +1752,7 @@ void executeSolveMultiEntityMixedModel(int entitySize, int valueSize, int otherV
         }
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMixedModelCustomMove() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1773,6 +1777,7 @@ void solveMixedModelCustomMove() {
                 .isEmpty();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMixedModelCustomPhase() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1805,6 +1810,7 @@ private static List<Pair<EntitySorterManner, ValueSorterManner>> getSortMannerLi
         return sortMannerList;
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @ParameterizedTest
     @MethodSource("getSortMannerList")
     void solveMixedModelWithSortManner(Pair<EntitySorterManner, ValueSorterManner> sorterManner) {
@@ -1838,6 +1844,7 @@ void solveMixedModelWithSortManner(Pair<EntitySorterManner, ValueSorterManner> s
                 .isEmpty();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solvePinnedMixedModel() {
         // We don't enable the LS because we want to ensure the pinned entity remains uninitialized
@@ -1861,6 +1868,7 @@ void solvePinnedMixedModel() {
         assertThat(solution.getEntityList().get(0).getValueList()).isEmpty();
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveUnassignedMixedModel() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1887,6 +1895,7 @@ void solveUnassignedMixedModel() {
                 .hasSize(2);
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solvePinnedAndUnassignedMixedModel() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1974,6 +1983,7 @@ private static List<MoveSelectorConfig> generateMovesForMixedModel() {
         return allMoveSelectionConfigList;
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @ParameterizedTest
     @MethodSource("generateMovesForMixedModel")
     void solveMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig) {
@@ -2036,6 +2046,7 @@ private static List<MoveSelectorConfig> generateMovesForMultiEntityMixedModel()
         return allMoveSelectionConfigList;
     }
 
+    @Disabled("The mixed model is currently unavailable for general use")
     @ParameterizedTest
     @MethodSource("generateMovesForMultiEntityMixedModel")
     void solveMultiEntityMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig) {