chore: test strength and difficulty comparators

Author: zepfred

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

@@ -1903,6 +1903,11 @@ void solveMultiEntityMoveConfigMixedModel(MoveSelectorConfig moveSelectionConfig
         assertThat(solution.getOtherEntityList().stream()
                 .filter(e -> e.getBasicValue() == null || e.getSecondBasicValue() == null))
                 .isEmpty();
+        for (var entity : solution.getOtherEntityList()) {
+            // The strength comparator will cause the basic variables to differ during the CH phase,
+            // and LS will find no improvement
+            assertThat(entity.getBasicValue()).isNotSameAs(entity.getSecondBasicValue());
+        }
     }
 
     public static final class MinimizeUnusedEntitiesEasyScoreCalculator

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntityFirstEntity.java

@@ -7,19 +7,22 @@
 import ai.timefold.solver.core.api.domain.variable.PlanningListVariable;
 import ai.timefold.solver.core.testdomain.TestdataObject;
 
-@PlanningEntity
+@PlanningEntity(difficultyComparatorClass = TestdataMixedMultiEntityFirstEntityComparator.class)
 public class TestdataMixedMultiEntityFirstEntity extends TestdataObject {
 
     @PlanningListVariable(valueRangeProviderRefs = "valueRange")
     private List<TestdataMixedMultiEntityFirstValue> valueList;
 
+    private int difficulty;
+
     public TestdataMixedMultiEntityFirstEntity() {
         // Required for cloner
     }
 
-    public TestdataMixedMultiEntityFirstEntity(String code) {
+    public TestdataMixedMultiEntityFirstEntity(String code, int difficulty) {
         super(code);
         valueList = new ArrayList<>();
+        this.difficulty = difficulty;
     }
 
     public List<TestdataMixedMultiEntityFirstValue> getValueList() {
@@ -29,4 +32,12 @@ public List<TestdataMixedMultiEntityFirstValue> getValueList() {
     public void setValueList(List<TestdataMixedMultiEntityFirstValue> valueList) {
         this.valueList = valueList;
     }
+
+    public int getDifficulty() {
+        return difficulty;
+    }
+
+    public void setDifficulty(int difficulty) {
+        this.difficulty = difficulty;
+    }
 }

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntityFirstEntityComparator.java

@@ -0,0 +1,11 @@
+package ai.timefold.solver.core.testdomain.mixed.multientity;
+
+import java.util.Comparator;
+
+public class TestdataMixedMultiEntityFirstEntityComparator implements Comparator<TestdataMixedMultiEntityFirstEntity> {
+    @Override
+    public int compare(TestdataMixedMultiEntityFirstEntity v1, TestdataMixedMultiEntityFirstEntity v2) {
+        // ASC sort
+        return v1.getDifficulty() - v2.getDifficulty();
+    }
+}

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntitySecondEntity.java

@@ -7,7 +7,8 @@
 @PlanningEntity
 public class TestdataMixedMultiEntitySecondEntity extends TestdataObject {
 
-    @PlanningVariable(valueRangeProviderRefs = "otherValueRange")
+    @PlanningVariable(valueRangeProviderRefs = "otherValueRange",
+            strengthComparatorClass = TestdataMixedMultiEntitySecondValueComparator.class)
     private TestdataMixedMultiEntitySecondValue basicValue;
 
     @PlanningVariable(valueRangeProviderRefs = "otherValueRange")

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntitySecondValue.java

@@ -6,11 +6,22 @@
 @PlanningEntity
 public class TestdataMixedMultiEntitySecondValue extends TestdataObject {
 
+    private int strength;
+
     public TestdataMixedMultiEntitySecondValue() {
         // Required for cloner
     }
 
-    public TestdataMixedMultiEntitySecondValue(String code) {
+    public TestdataMixedMultiEntitySecondValue(String code, int strength) {
         super(code);
+        this.strength = strength;
+    }
+
+    public int getStrength() {
+        return strength;
+    }
+
+    public void setStrength(int strength) {
+        this.strength = strength;
     }
 }

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntitySecondValueComparator.java

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

core/src/test/java/ai/timefold/solver/core/testdomain/mixed/multientity/TestdataMixedMultiEntitySolution.java

@@ -27,15 +27,16 @@ public static TestdataMixedMultiEntitySolution generateUninitializedSolution(int
         for (int i = 0; i < valueListSize; i++) {
             valueList.add(new TestdataMixedMultiEntityFirstValue("Generated Value " + i));
         }
+        var strength = otherValueListSize * 10;
         for (int i = 0; i < otherValueListSize; i++) {
-            otherValueList.add(new TestdataMixedMultiEntitySecondValue("Generated Other Value " + i));
+            otherValueList.add(new TestdataMixedMultiEntitySecondValue("Generated Other Value " + i, strength--));
         }
         solution.setValueList(valueList);
         solution.setOtherValueList(otherValueList);
         var entityList = new ArrayList<TestdataMixedMultiEntityFirstEntity>(entityListSize);
         var otherEntityList = new ArrayList<TestdataMixedMultiEntitySecondEntity>(entityListSize);
         for (int i = 0; i < entityListSize; i++) {
-            var entity = new TestdataMixedMultiEntityFirstEntity("Entity " + i);
+            var entity = new TestdataMixedMultiEntityFirstEntity("Entity " + i, i);
             entityList.add(entity);
             var otherEntity = new TestdataMixedMultiEntitySecondEntity("Other Entity " + i);
             otherEntityList.add(otherEntity);