fix: adapt to upstream changes

Author: Christopher-Chianelli

src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/domain/ConferenceConstraintProperties.java

@@ -24,14 +24,14 @@ public class ConferenceConstraintProperties extends AbstractPersistable {
 
     public static final String THEME_TRACK_CONFLICT = "Theme track conflict";
     public static final String THEME_TRACK_ROOM_STABILITY = "Theme track room stability";
-    public static final String THEME_TRACK_CONFLICT_SAME_DAY_TALKS = "Same day talks (Theme track)";
+    public static final String THEME_TRACK_CONFLICT_SAME_DAY_TALKS = "Same day talks 'Theme track'";
     public static final String SECTOR_CONFLICT = "Sector conflict";
     public static final String AUDIENCE_TYPE_DIVERSITY = "Audience type diversity";
     public static final String AUDIENCE_TYPE_THEME_TRACK_CONFLICT = "Audience type theme track conflict";
     public static final String AUDIENCE_LEVEL_DIVERSITY = "Audience level diversity";
     public static final String CONTENT_AUDIENCE_LEVEL_FLOW_VIOLATION = "Content audience level flow violation";
     public static final String CONTENT_CONFLICT = "Content conflict";
-    public static final String CONTENT_CONFLICT_SAME_DAY_TALKS = "Same day talks (Content)";
+    public static final String CONTENT_CONFLICT_SAME_DAY_TALKS = "Same day talks 'Content'";
     public static final String LANGUAGE_DIVERSITY = "Language diversity";
     public static final String POPULAR_TALKS = "Popular talks";
 

src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProvider.java

@@ -33,14 +33,14 @@
 import static ai.timefold.solver.core.api.score.stream.ConstraintCollectors.countBi;
 import static ai.timefold.solver.core.api.score.stream.ConstraintCollectors.max;
 import static ai.timefold.solver.core.api.score.stream.ConstraintCollectors.min;
-import static ai.timefold.solver.core.api.score.stream.Joiners.containedIn;
-import static ai.timefold.solver.core.api.score.stream.Joiners.containing;
 import static ai.timefold.solver.core.api.score.stream.Joiners.equal;
 import static ai.timefold.solver.core.api.score.stream.Joiners.filtering;
 import static ai.timefold.solver.core.api.score.stream.Joiners.greaterThan;
-import static ai.timefold.solver.core.api.score.stream.Joiners.intersecting;
 import static ai.timefold.solver.core.api.score.stream.Joiners.lessThan;
 import static ai.timefold.solver.core.api.score.stream.Joiners.overlapping;
+import static ai.timefold.solver.core.impl.score.stream.UnfinishedJoiners.containedIn;
+import static ai.timefold.solver.core.impl.score.stream.UnfinishedJoiners.containing;
+import static ai.timefold.solver.core.impl.score.stream.UnfinishedJoiners.containingAnyOf;
 
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
@@ -149,7 +149,7 @@ Constraint talkPrerequisiteTalks(ConstraintFactory factory) {
     Constraint talkMutuallyExclusiveTalksTags(ConstraintFactory factory) {
         return factory.forEachUniquePair(Talk.class,
                 overlapping(t -> t.getTimeslot().getStartDateTime(), t -> t.getTimeslot().getEndDateTime()),
-                intersecting(Talk::getMutuallyExclusiveTalksTagSet))
+                containingAnyOf(Talk::getMutuallyExclusiveTalksTagSet))
                 .penalize(HardSoftScore.ofHard(1),
                         (talk1, talk2) -> talk2.overlappingMutuallyExclusiveTalksTagCount(talk1)
                                 * talk1.overlappingDurationInMinutes(talk2))
@@ -236,7 +236,7 @@ Constraint themeTrackConflict(ConstraintFactory factory) {
     Constraint themeTrackRoomStability(ConstraintFactory factory) {
         return factory.forEachUniquePair(Talk.class,
                 equal(talk -> talk.getTimeslot().getStartDateTime().toLocalDate()),
-                intersecting(Talk::getThemeTrackTagSet),
+                containingAnyOf(Talk::getThemeTrackTagSet),
                 filtering((talk1, talk2) -> !talk1.getRoom().equals(talk2.getRoom())))
                 .penalize(HardSoftScore.ofSoft(10),
                         (talk1, talk2) -> talk2.overlappingThemeTrackCount(talk1) * talk1.combinedDurationInMinutes(talk2))
@@ -246,7 +246,7 @@ Constraint themeTrackRoomStability(ConstraintFactory factory) {
     Constraint sectorConflict(ConstraintFactory factory) {
         return factory.forEachUniquePair(Talk.class,
                 overlapping(t -> t.getTimeslot().getStartDateTime(), t -> t.getTimeslot().getEndDateTime()),
-                intersecting(Talk::getSectorTagSet))
+                containingAnyOf(Talk::getSectorTagSet))
                 .penalize(HardSoftScore.ofSoft(10),
                         (talk1, talk2) -> talk2.overlappingSectorCount(talk1) * talk1.overlappingDurationInMinutes(talk2))
                 .asConstraint(SECTOR_CONFLICT);
@@ -305,7 +305,7 @@ Constraint contentAudienceLevelFlowViolation(ConstraintFactory factory) {
     Constraint contentConflict(ConstraintFactory factory) {
         return factory.forEachUniquePair(Talk.class,
                 overlapping(t -> t.getTimeslot().getStartDateTime(), t -> t.getTimeslot().getEndDateTime()),
-                intersecting(Talk::getContentTagSet))
+                containingAnyOf(Talk::getContentTagSet))
                 .penalize(HardSoftScore.ofSoft(100),
                         (talk1, talk2) -> talk2.overlappingContentCount(talk1)
                                 * talk1.overlappingDurationInMinutes(talk2))
@@ -321,15 +321,15 @@ Constraint languageDiversity(ConstraintFactory factory) {
     }
 
     Constraint contentConflictSameDay(ConstraintFactory factory) {
-        return factory.forEachUniquePair(Talk.class, intersecting(Talk::getContentTagSet))
+        return factory.forEachUniquePair(Talk.class, containingAnyOf(Talk::getContentTagSet))
                 .filter((talk1, talk2) -> !talk1.getTimeslot().isOnSameDayAs(talk2.getTimeslot()))
                 .penalize(HardSoftScore.ofSoft(10),
                         (talk1, talk2) -> talk2.overlappingContentCount(talk1) * talk1.combinedDurationInMinutes(talk2))
                 .asConstraint(CONTENT_CONFLICT_SAME_DAY_TALKS);
     }
 
     Constraint themeTrackConflictSameDay(ConstraintFactory factory) {
-        return factory.forEachUniquePair(Talk.class, intersecting(Talk::getThemeTrackTagSet))
+        return factory.forEachUniquePair(Talk.class, containingAnyOf(Talk::getThemeTrackTagSet))
                 .filter((talk1, talk2) -> !talk1.getTimeslot().isOnSameDayAs(talk2.getTimeslot()))
                 .penalize(HardSoftScore.ofSoft(10),
                         (talk1, talk2) -> talk2.overlappingThemeTrackCount(talk1) * talk1.combinedDurationInMinutes(talk2))

src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/score/CurriculumCourseConstraintProvider.java

@@ -5,9 +5,9 @@
 import static ai.timefold.solver.core.api.score.HardSoftScore.ofSoft;
 import static ai.timefold.solver.core.api.score.stream.ConstraintCollectors.count;
 import static ai.timefold.solver.core.api.score.stream.ConstraintCollectors.countDistinct;
-import static ai.timefold.solver.core.api.score.stream.Joiners.containedIn;
 import static ai.timefold.solver.core.api.score.stream.Joiners.equal;
 import static ai.timefold.solver.core.api.score.stream.Joiners.filtering;
+import static ai.timefold.solver.core.impl.score.stream.UnfinishedJoiners.containedIn;
 
 import java.util.Objects;
 

src/main/resources/ai/timefold/solver/benchmarks/examples/conferencescheduling/conferenceSchedulingSolverConfig.xml

@@ -2,7 +2,7 @@
 <solver xmlns="https://timefold.ai/xsd/solver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://timefold.ai/xsd/solver https://timefold.ai/xsd/solver/solver.xsd">
   <!-- To slowly prove there are no bugs in this code -->
-  <environmentMode>FAST_ASSERT</environmentMode>
+  <!--<environmentMode>FULL_ASSERT</environmentMode>-->
   <!-- To solve faster by saturating multiple CPU cores -->
   <!--<moveThreadCount>AUTO</moveThreadCount>-->