Skip to content

Commit 7d0fdfd

Browse files
zepfredzepfred
committed
chore: add more tests and minor refactoring
1 parent 98f149a commit 7d0fdfd

25 files changed

Lines changed: 434 additions & 313 deletions

‎core/src/test/java/ai/timefold/solver/core/impl/constructionheuristic/placer/entity/QueuedMultiplePlacerFactoryTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
import ai.timefold.solver.core.impl.score.trend.InitializingScoreTrend;
2727
import ai.timefold.solver.core.impl.solver.scope.SolverScope;
2828
import ai.timefold.solver.core.impl.util.MutableInt;
29-
import ai.timefold.solver.core.testdomain.mixed.singleentity.TestdataListMultiVarSolution;
30-
import ai.timefold.solver.core.testdomain.mixed.singleentity.unassignedvar.TestdataUnassignedListMultiVarSolution;
29+
import ai.timefold.solver.core.testdomain.mixed.singleentity.TestdataMixedSolution;
30+
import ai.timefold.solver.core.testdomain.mixed.singleentity.unassignedvar.TestdataUnassignedMixedSolution;
3131

3232
import org.junit.jupiter.api.Test;
3333

3434
class QueuedMultiplePlacerFactoryTest {
3535

3636
@Test
3737
void testPlacersForConstructionHeuristic() {
38-
var solutionDescriptor = TestdataListMultiVarSolution.buildSolutionDescriptor();
39-
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataListMultiVarSolution>()
38+
var solutionDescriptor = TestdataMixedSolution.buildSolutionDescriptor();
39+
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataMixedSolution>()
4040
.withEnvironmentMode(PHASE_ASSERT)
4141
.withInitializingScoreTrend(new InitializingScoreTrend(new InitializingScoreTrendLevel[] { ANY }))
4242
.withSolutionDescriptor(solutionDescriptor)
@@ -59,9 +59,9 @@ void testPlacersForConstructionHeuristic() {
5959
var entityPlacerConfig = new QueuedEntityPlacerConfig();
6060
var placerConfig = new QueuedMultiplePlacerConfig()
6161
.withPlacerConfigList(List.of(valuePlacerConfig, entityPlacerConfig));
62-
var placer = EntityPlacerFactory.<TestdataListMultiVarSolution> create(placerConfig).buildEntityPlacer(configPolicy);
62+
var placer = EntityPlacerFactory.<TestdataMixedSolution> create(placerConfig).buildEntityPlacer(configPolicy);
6363

64-
var problem = TestdataListMultiVarSolution.generateUninitializedSolution(2, 2, 2);
64+
var problem = TestdataMixedSolution.generateUninitializedSolution(2, 2, 2);
6565
var solverScope = mock(SolverScope.class);
6666
var scoreDirector = mock(InnerScoreDirector.class);
6767
var random = new Random(0L);
@@ -145,8 +145,8 @@ void testPlacersForConstructionHeuristic() {
145145

146146
@Test
147147
void testPinnedPlacersForConstructionHeuristic() {
148-
var solutionDescriptor = TestdataListMultiVarSolution.buildSolutionDescriptor();
149-
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataListMultiVarSolution>()
148+
var solutionDescriptor = TestdataMixedSolution.buildSolutionDescriptor();
149+
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataMixedSolution>()
150150
.withEnvironmentMode(PHASE_ASSERT)
151151
.withInitializingScoreTrend(new InitializingScoreTrend(new InitializingScoreTrendLevel[] { ANY }))
152152
.withSolutionDescriptor(solutionDescriptor)
@@ -169,9 +169,9 @@ void testPinnedPlacersForConstructionHeuristic() {
169169
var entityPlacerConfig = new QueuedEntityPlacerConfig();
170170
var placerConfig = new QueuedMultiplePlacerConfig()
171171
.withPlacerConfigList(List.of(valuePlacerConfig, entityPlacerConfig));
172-
var placer = EntityPlacerFactory.<TestdataListMultiVarSolution> create(placerConfig).buildEntityPlacer(configPolicy);
172+
var placer = EntityPlacerFactory.<TestdataMixedSolution> create(placerConfig).buildEntityPlacer(configPolicy);
173173

174-
var problem = TestdataListMultiVarSolution.generateUninitializedSolution(2, 2, 2);
174+
var problem = TestdataMixedSolution.generateUninitializedSolution(2, 2, 2);
175175
// Pin the first entity
176176
problem.getEntityList().get(0).setPinned(true);
177177
problem.getEntityList().get(0).setPinnedIndex(2);
@@ -223,8 +223,8 @@ void testPinnedPlacersForConstructionHeuristic() {
223223

224224
@Test
225225
void testUnassignedPlacersForConstructionHeuristic() {
226-
var solutionDescriptor = TestdataUnassignedListMultiVarSolution.buildSolutionDescriptor();
227-
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataUnassignedListMultiVarSolution>()
226+
var solutionDescriptor = TestdataUnassignedMixedSolution.buildSolutionDescriptor();
227+
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataUnassignedMixedSolution>()
228228
.withEnvironmentMode(PHASE_ASSERT)
229229
.withInitializingScoreTrend(new InitializingScoreTrend(new InitializingScoreTrendLevel[] { ANY }))
230230
.withSolutionDescriptor(solutionDescriptor)
@@ -247,10 +247,10 @@ void testUnassignedPlacersForConstructionHeuristic() {
247247
var entityPlacerConfig = new QueuedEntityPlacerConfig();
248248
var placerConfig = new QueuedMultiplePlacerConfig()
249249
.withPlacerConfigList(List.of(valuePlacerConfig, entityPlacerConfig));
250-
var placer = EntityPlacerFactory.<TestdataUnassignedListMultiVarSolution> create(placerConfig)
250+
var placer = EntityPlacerFactory.<TestdataUnassignedMixedSolution> create(placerConfig)
251251
.buildEntityPlacer(configPolicy);
252252

253-
var problem = TestdataUnassignedListMultiVarSolution.generateUninitializedSolution(2, 2, 2);
253+
var problem = TestdataUnassignedMixedSolution.generateUninitializedSolution(2, 2, 2);
254254
var solverScope = mock(SolverScope.class);
255255
var scoreDirector = mock(InnerScoreDirector.class);
256256
var random = new Random(0L);
@@ -384,8 +384,8 @@ void testUnassignedPlacersForConstructionHeuristic() {
384384

385385
@Test
386386
void testPinnedUnassignedPlacersForConstructionHeuristic() {
387-
var solutionDescriptor = TestdataUnassignedListMultiVarSolution.buildSolutionDescriptor();
388-
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataUnassignedListMultiVarSolution>()
387+
var solutionDescriptor = TestdataUnassignedMixedSolution.buildSolutionDescriptor();
388+
var configPolicy = new HeuristicConfigPolicy.Builder<TestdataUnassignedMixedSolution>()
389389
.withEnvironmentMode(PHASE_ASSERT)
390390
.withInitializingScoreTrend(new InitializingScoreTrend(new InitializingScoreTrendLevel[] { ANY }))
391391
.withSolutionDescriptor(solutionDescriptor)
@@ -408,10 +408,10 @@ void testPinnedUnassignedPlacersForConstructionHeuristic() {
408408
var entityPlacerConfig = new QueuedEntityPlacerConfig();
409409
var placerConfig = new QueuedMultiplePlacerConfig()
410410
.withPlacerConfigList(List.of(valuePlacerConfig, entityPlacerConfig));
411-
var placer = EntityPlacerFactory.<TestdataUnassignedListMultiVarSolution> create(placerConfig)
411+
var placer = EntityPlacerFactory.<TestdataUnassignedMixedSolution> create(placerConfig)
412412
.buildEntityPlacer(configPolicy);
413413

414-
var problem = TestdataUnassignedListMultiVarSolution.generateUninitializedSolution(2, 2, 2);
414+
var problem = TestdataUnassignedMixedSolution.generateUninitializedSolution(2, 2, 2);
415415
// Pin the first entity
416416
problem.getEntityList().get(0).setPinned(true);
417417
problem.getEntityList().get(0).setPinnedIndex(2);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import ai.timefold.solver.core.testdomain.TestdataEntity;
1919
import ai.timefold.solver.core.testdomain.TestdataSolution;
2020
import ai.timefold.solver.core.testdomain.list.TestdataListSolution;
21-
import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataListMultiEntitySolution;
21+
import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySolution;
2222

2323
import org.junit.jupiter.api.Test;
2424
import org.junit.jupiter.params.ParameterizedTest;
@@ -46,11 +46,11 @@ void buildMoveSelector() {
4646
@Test
4747
void buildMoveSelectorMultiEntity() {
4848
var config = new SubListChangeMoveSelectorConfig();
49-
var moveSelectorFactory = new SubListChangeMoveSelectorFactory<TestdataListMultiEntitySolution>(config);
49+
var moveSelectorFactory = new SubListChangeMoveSelectorFactory<TestdataMixedMultiEntitySolution>(config);
5050

51-
var heuristicConfigPolicy = buildHeuristicConfigPolicy(TestdataListMultiEntitySolution.buildSolutionDescriptor());
51+
var heuristicConfigPolicy = buildHeuristicConfigPolicy(TestdataMixedMultiEntitySolution.buildSolutionDescriptor());
5252

53-
var selector = (RandomSubListChangeMoveSelector<TestdataListMultiEntitySolution>) moveSelectorFactory
53+
var selector = (RandomSubListChangeMoveSelector<TestdataMixedMultiEntitySolution>) moveSelectorFactory
5454
.buildMoveSelector(heuristicConfigPolicy, SelectionCacheType.JUST_IN_TIME, SelectionOrder.RANDOM,
5555
false);
5656

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import ai.timefold.solver.core.impl.heuristic.selector.list.RandomSubListSelector;
1515
import ai.timefold.solver.core.testdomain.TestdataSolution;
1616
import ai.timefold.solver.core.testdomain.list.TestdataListSolution;
17-
import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataListMultiEntitySolution;
17+
import ai.timefold.solver.core.testdomain.mixed.multientity.TestdataMixedMultiEntitySolution;
1818

1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.params.ParameterizedTest;
@@ -43,12 +43,12 @@ void buildBaseMoveSelector() {
4343
@Test
4444
void buildMoveSelectorMultiEntity() {
4545
var config = new SubListSwapMoveSelectorConfig();
46-
var factory = new SubListSwapMoveSelectorFactory<TestdataListMultiEntitySolution>(config);
46+
var factory = new SubListSwapMoveSelectorFactory<TestdataMixedMultiEntitySolution>(config);
4747

48-
var heuristicConfigPolicy = buildHeuristicConfigPolicy(TestdataListMultiEntitySolution.buildSolutionDescriptor());
48+
var heuristicConfigPolicy = buildHeuristicConfigPolicy(TestdataMixedMultiEntitySolution.buildSolutionDescriptor());
4949

5050
var selector =
51-
(RandomSubListSwapMoveSelector<TestdataListMultiEntitySolution>) factory.buildBaseMoveSelector(
51+
(RandomSubListSwapMoveSelector<TestdataMixedMultiEntitySolution>) factory.buildBaseMoveSelector(
5252
heuristicConfigPolicy,
5353
SelectionCacheType.JUST_IN_TIME, true);
5454

0 commit comments

Comments
 (0)