chore: add CH tests

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/common/decorator/FactorySelectionSorter.java

@@ -24,17 +24,17 @@
 public final class FactorySelectionSorter<Solution_, T> implements SelectionSorter<Solution_, T> {
 
     private final SorterFactory<Solution_, T> selectionSorterFactory;
-    private final Comparator<Comparable> comparator;
+    private final Comparator<Comparable> appliedComparator;
 
     public FactorySelectionSorter(SorterFactory<Solution_, T> selectionSorterFactory,
                                   SelectionSorterOrder selectionSorterOrder) {
         this.selectionSorterFactory = selectionSorterFactory;
         switch (selectionSorterOrder) {
             case ASCENDING:
-                this.comparator = Comparator.naturalOrder();
+                this.appliedComparator = Comparator.naturalOrder();
                 break;
             case DESCENDING:
-                this.comparator = Collections.reverseOrder();
+                this.appliedComparator = Collections.reverseOrder();
                 break;
             default:
                 throw new IllegalStateException("The selectionSorterOrder (" + selectionSorterOrder
@@ -53,7 +53,7 @@ public void sort(ScoreDirector<Solution_> scoreDirector, List<T> selectionList)
      *        of {@link PlanningEntity}, planningValue, {@link Move} or {@link Selector}
      */
     public void sort(Solution_ solution, List<T> selectionList) {
-        SortedMap<Comparable, T> selectionMap = new TreeMap<>(comparator);
+        SortedMap<Comparable, T> selectionMap = new TreeMap<>(appliedComparator);
         for (T selection : selectionList) {
             Comparable difficultyWeight = selectionSorterFactory.createSorter(solution, selection);
             T previous = selectionMap.put(difficultyWeight, selection);
@@ -74,11 +74,11 @@ public boolean equals(Object other) {
             return false;
         FactorySelectionSorter<?, ?> that = (FactorySelectionSorter<?, ?>) other;
         return Objects.equals(selectionSorterFactory, that.selectionSorterFactory)
-                && Objects.equals(comparator, that.comparator);
+                && Objects.equals(appliedComparator, that.appliedComparator);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(selectionSorterFactory, comparator);
+        return Objects.hash(selectionSorterFactory, appliedComparator);
     }
 }

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

@@ -5,14 +5,14 @@
 
 import org.jspecify.annotations.NonNull;
 
-public class OneValuePerEntityEasyScoreCalculator
+public class ListOneValuePerEntityEasyScoreCalculator
         implements EasyScoreCalculator<TestdataListSortableSolution, HardSoftScore> {
 
     @Override
-    public @NonNull HardSoftScore calculateScore(@NonNull TestdataListSortableSolution testdataListSortableSolution) {
+    public @NonNull HardSoftScore calculateScore(@NonNull TestdataListSortableSolution solution) {
         var softScore = 0;
         var hardScore = 0;
-        for (var entity : testdataListSortableSolution.getEntityList()) {
+        for (var entity : solution.getEntityList()) {
             if (entity.getValueList().size() == 1) {
                 softScore -= 10;
             } else {

core/src/test/java/ai/timefold/solver/core/testdomain/list/sort/comparator/OneValuePerEntityEasyScoreCalculator.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/list/sort/comparator/ListOneValuePerEntityEasyScoreCalculator.java

@@ -5,15 +5,15 @@
 
 import org.jspecify.annotations.NonNull;
 
-public class OneValuePerEntityFactoryEasyScoreCalculator
+public class ListOneValuePerEntityFactoryEasyScoreCalculator
         implements EasyScoreCalculator<TestdataListFactorySortableSolution, HardSoftScore> {
 
     @Override
     public @NonNull HardSoftScore
-            calculateScore(@NonNull TestdataListFactorySortableSolution testdataListFactorySortableSolution) {
+            calculateScore(@NonNull TestdataListFactorySortableSolution solution) {
         var softScore = 0;
         var hardScore = 0;
-        for (var entity : testdataListFactorySortableSolution.getEntityList()) {
+        for (var entity : solution.getEntityList()) {
             if (entity.getValueList().size() == 1) {
                 softScore -= 10;
             } else {

core/src/test/java/ai/timefold/solver/core/testdomain/list/sort/factory/OneValuePerEntityFactoryEasyScoreCalculator.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/list/sort/factory/ListOneValuePerEntityFactoryEasyScoreCalculator.java

@@ -5,15 +5,15 @@
 
 import org.jspecify.annotations.NonNull;
 
-public class OneValuePerEntityRangeEasyScoreCalculator
+public class ListOneValuePerEntityRangeEasyScoreCalculator
         implements EasyScoreCalculator<TestdataListSortableEntityProvidingSolution, HardSoftScore> {
 
     @Override
     public @NonNull HardSoftScore
-            calculateScore(@NonNull TestdataListSortableEntityProvidingSolution testdataListSortableEntityProvidingSolution) {
+            calculateScore(@NonNull TestdataListSortableEntityProvidingSolution solution) {
         var softScore = 0;
         var hardScore = 0;
-        for (var entity : testdataListSortableEntityProvidingSolution.getEntityList()) {
+        for (var entity : solution.getEntityList()) {
             if (entity.getValueList().size() == 1) {
                 softScore -= 10;
             } else {

core/src/test/java/ai/timefold/solver/core/testdomain/list/valuerange/sort/comparator/OneValuePerEntityRangeEasyScoreCalculator.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/list/valuerange/sort/comparator/ListOneValuePerEntityRangeEasyScoreCalculator.java

@@ -5,16 +5,16 @@
 
 import org.jspecify.annotations.NonNull;
 
-public class OneValuePerEntityRangeFactoryEasyScoreCalculator
+public class ListOneValuePerEntityRangeFactoryEasyScoreCalculator
         implements EasyScoreCalculator<TestdataListFactorySortableEntityProvidingSolution, HardSoftScore> {
 
     @Override
     public @NonNull HardSoftScore
             calculateScore(
-                    @NonNull TestdataListFactorySortableEntityProvidingSolution testdataListFactorySortableEntityProvidingSolution) {
+                    @NonNull TestdataListFactorySortableEntityProvidingSolution solution) {
         var softScore = 0;
         var hardScore = 0;
-        for (var entity : testdataListFactorySortableEntityProvidingSolution.getEntityList()) {
+        for (var entity : solution.getEntityList()) {
             if (entity.getValueList().size() == 1) {
                 softScore -= 10;
             } else {

core/src/test/java/ai/timefold/solver/core/testdomain/list/valuerange/sort/factory/OneValuePerEntityRangeFactoryEasyScoreCalculator.java renamed to core/src/test/java/ai/timefold/solver/core/testdomain/list/valuerange/sort/factory/ListOneValuePerEntityRangeFactoryEasyScoreCalculator.java

@@ -0,0 +1,27 @@
+package ai.timefold.solver.core.testdomain.sort.comparator;
+
+import java.util.Objects;
+
+import ai.timefold.solver.core.api.score.buildin.hardsoft.HardSoftScore;
+import ai.timefold.solver.core.api.score.calculator.EasyScoreCalculator;
+
+import org.jspecify.annotations.NonNull;
+
+public class OneValuePerEntityEasyScoreCalculator
+        implements EasyScoreCalculator<TestdataSortableSolution, HardSoftScore> {
+
+    @Override
+    public @NonNull HardSoftScore calculateScore(@NonNull TestdataSortableSolution solution) {
+        var distinct = (int) solution.getEntityList().stream()
+                .map(TestdataSortableEntity::getValue)
+                .filter(Objects::nonNull)
+                .distinct()
+                .count();
+        var assigned = solution.getEntityList().stream()
+                .map(TestdataSortableEntity::getValue)
+                .filter(Objects::nonNull)
+                .count();
+        var repeated = (int) (assigned - distinct);
+        return HardSoftScore.of(-repeated, -distinct);
+    }
+}

core/src/test/java/ai/timefold/solver/core/testdomain/sort/comparator/OneValuePerEntityEasyScoreCalculator.java

@@ -0,0 +1,11 @@
+package ai.timefold.solver.core.testdomain.sort.comparator;
+
+import java.util.Comparator;
+
+public class SortableEntityComparator implements Comparator<TestdataSortableEntity> {
+
+    @Override
+    public int compare(TestdataSortableEntity e1, TestdataSortableEntity e2) {
+        return e1.getDifficulty() - e2.getDifficulty();
+    }
+}

core/src/test/java/ai/timefold/solver/core/testdomain/sort/comparator/SortableEntityComparator.java

@@ -0,0 +1,11 @@
+package ai.timefold.solver.core.testdomain.sort.comparator;
+
+import java.util.Comparator;
+
+public class SortableValueComparator implements Comparator<TestdataSortableValue> {
+
+    @Override
+    public int compare(TestdataSortableValue v1, TestdataSortableValue v2) {
+        return v1.getStrength() - v2.getStrength();
+    }
+}

core/src/test/java/ai/timefold/solver/core/testdomain/sort/comparator/SortableValueComparator.java

@@ -0,0 +1,37 @@
+package ai.timefold.solver.core.testdomain.sort.comparator;
+
+import ai.timefold.solver.core.api.domain.entity.PlanningEntity;
+import ai.timefold.solver.core.api.domain.variable.PlanningVariable;
+import ai.timefold.solver.core.testdomain.TestdataObject;
+
+@PlanningEntity(difficultyComparatorClass = SortableEntityComparator.class)
+public class TestdataSortableEntity extends TestdataObject {
+
+    @PlanningVariable(valueRangeProviderRefs = "valueRange", strengthComparatorClass = SortableValueComparator.class)
+    private TestdataSortableValue value;
+    private int difficulty;
+
+    public TestdataSortableEntity() {
+    }
+
+    public TestdataSortableEntity(String code, int difficulty) {
+        super(code);
+        this.difficulty = difficulty;
+    }
+
+    public TestdataSortableValue getValue() {
+        return value;
+    }
+
+    public void setValue(TestdataSortableValue value) {
+        this.value = value;
+    }
+
+    public int getDifficulty() {
+        return difficulty;
+    }
+
+    public void setDifficulty(int difficulty) {
+        this.difficulty = difficulty;
+    }
+}