Revert "chore: temporally disabling the mixed model"

This reverts commit 64a1115.

Author: zepfred

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

@@ -166,10 +166,6 @@ public static <Solution_> SolutionDescriptor<Solution_> buildSolutionDescriptor(
             solutionDescriptor.constraintWeightSupplier.initialize(solutionDescriptor,
                     descriptorPolicy.getMemberAccessorFactory(), descriptorPolicy.getDomainAccessType());
         }
-        // Temporally disabling the mixed model
-        if (solutionDescriptor.hasBothBasicAndListVariables()) {
-            throw new IllegalStateException("Combining list variable and basic variables is currently not supported.");
-        }
         return solutionDescriptor;
     }
 

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

@@ -47,7 +47,6 @@
 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;
@@ -349,7 +348,6 @@ 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,7 +20,6 @@
 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;
@@ -44,7 +43,6 @@ 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,7 +16,6 @@
 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;
@@ -41,7 +40,6 @@ 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,7 +146,6 @@
 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;
@@ -1657,19 +1656,6 @@ private static List<MoveSelectorConfig> generateMovesForMultiEntity() {
         return allMoveSelectionConfigList;
     }
 
-    @Test
-    void failMixedModel() {
-        var solverConfig = PlannerTestUtils
-                .buildSolverConfig(TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
-                        TestdataMixedOtherValue.class)
-                .withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES);
-
-        assertThatCode(() -> PlannerTestUtils.solve(solverConfig, new TestdataSolution("s1")))
-                .hasMessageContaining(
-                        "Combining list variable and basic variables is currently not supported");
-    }
-
-    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMixedModel() {
         // Same size for both list and basic variables
@@ -1681,7 +1667,6 @@ 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
@@ -1764,7 +1749,6 @@ 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(
@@ -1789,7 +1773,6 @@ void solveMixedModelCustomMove() {
                 .isEmpty();
     }
 
-    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solveMixedModelCustomPhase() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1822,7 +1805,6 @@ 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) {
@@ -1856,7 +1838,6 @@ 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
@@ -1880,7 +1861,6 @@ 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(
@@ -1907,7 +1887,6 @@ void solveUnassignedMixedModel() {
                 .hasSize(2);
     }
 
-    @Disabled("The mixed model is currently unavailable for general use")
     @Test
     void solvePinnedAndUnassignedMixedModel() {
         var solverConfig = PlannerTestUtils.buildSolverConfig(
@@ -1995,7 +1974,6 @@ private static List<MoveSelectorConfig> generateMovesForMixedModel() {
         return allMoveSelectionConfigList;
     }
 
-    @Disabled("The mixed model is currently unavailable for general use")
     @ParameterizedTest
     @MethodSource("generateMovesForMixedModel")
     void solveMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig) {
@@ -2058,7 +2036,6 @@ private static List<MoveSelectorConfig> generateMovesForMultiEntityMixedModel()
         return allMoveSelectionConfigList;
     }
 
-    @Disabled("The mixed model is currently unavailable for general use")
     @ParameterizedTest
     @MethodSource("generateMovesForMultiEntityMixedModel")
     void solveMultiEntityMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig) {