Skip to content

Commit ef1cee5

Browse files
Christopher-Chianellitriceo
authored andcommitted
chore: migrate to SequencedSet
# Conflicts: # src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/domain/Speaker.java # src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/domain/Talk.java # src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java # src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java
1 parent 353d6e7 commit ef1cee5

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ private void createTalkList(ConferenceSolution solution, int talkListSize) {
412412
if (random.nextDouble() < 0.20) {
413413
sectorTagSet.add(sectorTagOptions.get(random.nextInt(sectorTagOptions.size())));
414414
}
415-
var audienceType = audienceTypeOptions.get(random.nextInt(audienceTypeOptions.size()));
416-
talk.setAudienceTypeSet(new LinkedHashSet<>(Collections.singleton(audienceType)));
415+
talk.setAudienceTypeSet(new LinkedHashSet<>(
416+
Collections.singleton(audienceTypeOptions.get(random.nextInt(audienceTypeOptions.size())))));
417417
talk.setAudienceLevel(1 + random.nextInt(3));
418418
var contentTagSet = new LinkedHashSet<String>();
419419
for (var contentTagOption : contentTagOptions) {

src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package ai.timefold.solver.benchmarks.examples.conferencescheduling.score;
22

3-
import static java.util.Collections.singleton;
43
import static java.util.Collections.singletonList;
54

65
import java.time.LocalDateTime;
76
import java.util.Arrays;
8-
import java.util.Collections;
97
import java.util.LinkedHashSet;
108
import java.util.SequencedSet;
9+
import java.util.Set;
1110

1211
import ai.timefold.solver.benchmarks.examples.common.score.AbstractConstraintProviderTest;
1312
import ai.timefold.solver.benchmarks.examples.common.score.ConstraintProviderTest;
@@ -47,8 +46,12 @@ class ConferenceSchedulingConstraintProviderTest
4746
.withEndDateTime(START.plusDays(1).plusHours(1))
4847
.withTagSet(singleton("c"));
4948

50-
private static <T> SequencedSet<T> singleton(T item) {
51-
return new LinkedHashSet<>(Collections.singleton(item));
49+
private static <T> SequencedSet<T> emptySet() {
50+
return new LinkedHashSet<>();
51+
}
52+
53+
private static <T> SequencedSet<T> singleton(T element) {
54+
return new LinkedHashSet<>(Set.of(element));
5255
}
5356

5457
// ************************************************************************

0 commit comments

Comments
 (0)