Skip to content

Commit d2ea238

Browse files
zepfredzepfred
committed
Revert "chore: mixed model as preview feature"
This reverts commit 185e79c.
1 parent 54c23be commit d2ea238

5 files changed

Lines changed: 7 additions & 20 deletions

File tree

‎benchmark/src/main/resources/benchmark.xsd‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2612,9 +2612,6 @@
26122612
<xs:enumeration value="PLANNING_SOLUTION_DIFF"/>
26132613

26142614

2615-
<xs:enumeration value="MIXED_MODEL"/>
2616-
2617-
26182615
<xs:enumeration value="MOVE_STREAMS"/>
26192616

26202617

‎core/src/main/java/ai/timefold/solver/core/config/solver/PreviewFeature.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public enum PreviewFeature {
2222
DECLARATIVE_SHADOW_VARIABLES,
2323
DIVERSIFIED_LATE_ACCEPTANCE,
2424
PLANNING_SOLUTION_DIFF,
25-
MIXED_MODEL,
2625
/**
2726
* Unlike other preview features, Move Streams are an active research project.
2827
* It is intended to simplify the creation of custom moves, eventually replacing move selectors.

‎core/src/main/java/ai/timefold/solver/core/impl/solver/DefaultSolverFactory.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ public <Score_ extends Score<Score_>> ScoreDirectorFactory<Solution_, Score_> ge
142142
.withSolutionDescriptor(solutionDescriptor)
143143
.withClassInstanceCache(ClassInstanceCache.create())
144144
.build();
145-
if (solutionDescriptor.hasBothBasicAndListVariables()) {
146-
configPolicy.ensurePreviewFeature(PreviewFeature.MIXED_MODEL);
147-
}
148145
var basicPlumbingTermination = new BasicPlumbingTermination<Solution_>(isDaemon);
149146
var termination = buildTermination(basicPlumbingTermination, configPolicy, configOverride);
150147
var phaseList = buildPhaseList(configPolicy, bestSolutionRecaller, termination);

‎core/src/main/resources/solver.xsd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,8 +1593,6 @@
15931593

15941594
<xs:enumeration value="PLANNING_SOLUTION_DIFF"/>
15951595

1596-
<xs:enumeration value="MIXED_MODEL"/>
1597-
15981596
<xs:enumeration value="MOVE_STREAMS"/>
15991597

16001598
</xs:restriction>

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static ai.timefold.solver.core.config.heuristic.selector.entity.EntitySorterManner.DECREASING_DIFFICULTY;
44
import static ai.timefold.solver.core.config.heuristic.selector.entity.EntitySorterManner.DECREASING_DIFFICULTY_IF_AVAILABLE;
55
import static ai.timefold.solver.core.config.solver.PreviewFeature.DECLARATIVE_SHADOW_VARIABLES;
6-
import static ai.timefold.solver.core.config.solver.PreviewFeature.MIXED_MODEL;
76
import static org.assertj.core.api.Assertions.assertThat;
87
import static org.assertj.core.api.Assertions.assertThatCode;
98
import static org.assertj.core.api.Assertions.fail;
@@ -1649,7 +1648,7 @@ void solveMixedModel() {
16491648
var solverConfig = PlannerTestUtils.buildSolverConfig(
16501649
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
16511650
TestdataMixedOtherValue.class)
1652-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1651+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
16531652
.withPhases(new ConstructionHeuristicPhaseConfig(),
16541653
new LocalSearchPhaseConfig().withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
16551654
.withEasyScoreCalculatorClass(TestdataMixedEasyScoreCalculator.class);
@@ -1691,7 +1690,7 @@ void solveMixedModelCustomMove() {
16911690
var solverConfig = PlannerTestUtils.buildSolverConfig(
16921691
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
16931692
TestdataMixedOtherValue.class)
1694-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1693+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
16951694
.withPhases(new ConstructionHeuristicPhaseConfig(),
16961695
new LocalSearchPhaseConfig()
16971696
.withMoveSelectorConfig(new MoveIteratorFactoryConfig()
@@ -1713,7 +1712,7 @@ void solveMixedModelCustomPhase() {
17131712
var solverConfig = PlannerTestUtils.buildSolverConfig(
17141713
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
17151714
TestdataMixedOtherValue.class)
1716-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1715+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
17171716
.withPhases(new ConstructionHeuristicPhaseConfig(),
17181717
new CustomPhaseConfig()
17191718
.withCustomPhaseCommands(new MixedCustomPhase())
@@ -1744,7 +1743,7 @@ void solveMixedModelWithSortManner(Pair<EntitySorterManner, ValueSorterManner> s
17441743
var solverConfig = PlannerTestUtils.buildSolverConfig(
17451744
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
17461745
TestdataMixedOtherValue.class)
1747-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1746+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
17481747
.withPhases(new ConstructionHeuristicPhaseConfig(),
17491748
new LocalSearchPhaseConfig()
17501749
.withMoveSelectorConfig(
@@ -1775,7 +1774,7 @@ void solvePinnedMixedModel() {
17751774
var solverConfig = PlannerTestUtils.buildSolverConfig(
17761775
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
17771776
TestdataMixedOtherValue.class)
1778-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1777+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
17791778
.withPhases(new ConstructionHeuristicPhaseConfig())
17801779
.withEasyScoreCalculatorClass(TestdataMixedEasyScoreCalculator.class);
17811780

@@ -1794,7 +1793,6 @@ void solvePinnedMixedModel() {
17941793
void solveUnassignedMixedModel() {
17951794
var solverConfig = PlannerTestUtils.buildSolverConfig(
17961795
TestdataUnassignedMixedSolution.class, TestdataUnassignedMixedEntity.class)
1797-
.withPreviewFeature(MIXED_MODEL)
17981796
.withPhases(new ConstructionHeuristicPhaseConfig(),
17991797
new LocalSearchPhaseConfig().withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
18001798
.withEasyScoreCalculatorClass(TestdataUnassignedMixedEasyScoreCalculator.class);
@@ -1821,7 +1819,6 @@ void solveUnassignedMixedModel() {
18211819
void solvePinnedAndUnassignedMixedModel() {
18221820
var solverConfig = PlannerTestUtils.buildSolverConfig(
18231821
TestdataUnassignedMixedSolution.class, TestdataUnassignedMixedEntity.class)
1824-
.withPreviewFeature(MIXED_MODEL)
18251822
.withPhases(new ConstructionHeuristicPhaseConfig(),
18261823
new LocalSearchPhaseConfig().withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
18271824
.withEasyScoreCalculatorClass(TestdataUnassignedMixedEasyScoreCalculator.class);
@@ -1884,7 +1881,7 @@ void solveCustomConfigMixedModel() {
18841881
var solverConfig = PlannerTestUtils.buildSolverConfig(
18851882
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
18861883
TestdataMixedOtherValue.class)
1887-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1884+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
18881885
.withPhases(new ConstructionHeuristicPhaseConfig()
18891886
.withEntityPlacerConfigList(valuePlacerConfig, entityPlacerConfig),
18901887
new LocalSearchPhaseConfig().withTerminationConfig(new TerminationConfig().withStepCountLimit(16)))
@@ -1946,7 +1943,7 @@ void solveMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig) {
19461943
var solverConfig = PlannerTestUtils.buildSolverConfig(
19471944
TestdataMixedSolution.class, TestdataMixedEntity.class, TestdataMixedValue.class,
19481945
TestdataMixedOtherValue.class)
1949-
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES, MIXED_MODEL)
1946+
.withPreviewFeature(DECLARATIVE_SHADOW_VARIABLES)
19501947
.withPhases(new ConstructionHeuristicPhaseConfig(), localSearchConfig)
19511948
.withEasyScoreCalculatorClass(TestdataMixedEasyScoreCalculator.class);
19521949

@@ -2019,7 +2016,6 @@ void solveMultiEntityMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig
20192016
var solverConfig = PlannerTestUtils.buildSolverConfig(
20202017
TestdataMixedMultiEntitySolution.class, TestdataMixedMultiEntityFirstEntity.class,
20212018
TestdataMixedMultiEntitySecondEntity.class)
2022-
.withPreviewFeature(MIXED_MODEL)
20232019
.withPhases(constructionHeuristicConfig, localSearchConfig)
20242020
.withEasyScoreCalculatorClass(TestdataMixedEntityEasyScoreCalculator.class);
20252021

0 commit comments

Comments
 (0)