chore: review comments

Author: Christopher-Chianelli

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/TupleRecorder.java

@@ -1,8 +1,6 @@
 package ai.timefold.solver.core.impl.bavet.common;
 
-import java.util.ArrayList;
 import java.util.IdentityHashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.function.UnaryOperator;
 
@@ -18,13 +16,9 @@ public record TupleRecorder<Tuple_ extends Tuple>(List<Tuple_> recordedTupleList
     public void recordTuple(Tuple_ tuple) {
         var outTuple = inputTupleToOutputTuple.computeIfAbsent(tuple, mapper);
         if (tuple.getIndictmentSource() != IndictmentSource.DISABLED) {
-            if (outTuple.getIndictmentSource() == IndictmentSource.DISABLED) {
-                outTuple.setIndictmentSource(
-                        new IndictmentSource.AggregateIndictmentSource(new ArrayList<>(), new LinkedHashMap<>()));
-            }
             // Precompute uses an independent node network, so we need to aggregate its supports to not interfere with the
             // outer node network support
-            var aggregateIndictmentSource = (IndictmentSource.AggregateIndictmentSource) outTuple.getIndictmentSource();
+            var aggregateIndictmentSource = IndictmentSource.getPrecomputeAggregation(outTuple);
             tuple.getIndictmentSource()
                     .visitAllSources(source -> aggregateIndictmentSource.sourceList().add(IndictmentSource.of(source)));
         }

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/UniversalTuple.java

@@ -30,14 +30,6 @@ final class UniversalTuple<A, B, C, D>
         this.store = storeSize > 0 ? new Object[storeSize] : EMPTY_STORE;
     }
 
-    int cardinality() {
-        return cardinality;
-    }
-
-    int storeSize() {
-        return store.length;
-    }
-
     @Override
     public void setA(@Nullable A a) {
         this.a = a;

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/indictment/IndictmentSource.java

@@ -68,6 +68,15 @@ static IndictmentSource joining(Tuple left, Tuple right) {
         return new JoinedIndictmentSource(left.getIndictmentSource(), right.getIndictmentSource(), new LinkedHashMap<>());
     }
 
+    static AggregateIndictmentSource getPrecomputeAggregation(Tuple outTuple) {
+        if (outTuple.getIndictmentSource() != DISABLED) {
+            return (AggregateIndictmentSource) outTuple.getIndictmentSource();
+        }
+        var out = new AggregateIndictmentSource(new ArrayList<>(), new LinkedHashMap<>());
+        outTuple.setIndictmentSource(out);
+        return out;
+    }
+
     static IndictmentSource aggregating(Tuple elementTuple, Tuple groupTuple) {
         if (elementTuple.getIndictmentSource() == DISABLED) {
             return DISABLED;

core/src/main/java/ai/timefold/solver/core/impl/score/constraint/ConstraintMatch.java

@@ -2,7 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.List;
+import java.util.SequencedSet;
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.api.score.stream.ConstraintJustification;
@@ -30,7 +30,7 @@ public final class ConstraintMatch<Score_ extends Score<Score_>> implements Comp
 
     private final ConstraintRef constraintRef;
     private final @Nullable ConstraintJustification justification;
-    private final @Nullable List<Object> indictedObjects;
+    private final @Nullable SequencedSet<Object> indictedObjects;
     private final Score_ score;
 
     /**
@@ -39,7 +39,7 @@ public final class ConstraintMatch<Score_ extends Score<Score_>> implements Comp
      * @param score penalty or reward associated with the constraint match
      */
     public ConstraintMatch(ConstraintRef constraintRef, @Nullable ConstraintJustification justification,
-            @Nullable List<Object> indictedObjects, Score_ score) {
+            @Nullable SequencedSet<Object> indictedObjects, Score_ score) {
         this.constraintRef = requireNonNull(constraintRef);
         this.justification = justification;
         this.indictedObjects = indictedObjects;
@@ -67,7 +67,7 @@ public ConstraintRef getConstraintRef() {
         return (Justification_) justification;
     }
 
-    public @Nullable List<Object> getIndictedObjects() {
+    public @Nullable SequencedSet<Object> getIndictedObjects() {
         return indictedObjects;
     }
 

core/src/main/java/ai/timefold/solver/core/impl/score/constraint/ConstraintMatchTotal.java

@@ -4,6 +4,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.SequencedSet;
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.Score;
@@ -68,7 +69,8 @@ public Score_ getScore() {
      * @return never null
      */
     public ConstraintMatch<Score_> addConstraintMatch(List<Object> justifications, Score_ score) {
-        return addConstraintMatch(DefaultConstraintJustification.of(score, justifications), justifications, score);
+        return addConstraintMatch(DefaultConstraintJustification.of(score, justifications),
+                new LinkedHashSet<>(justifications), score);
     }
 
     /**
@@ -78,7 +80,8 @@ public ConstraintMatch<Score_> addConstraintMatch(List<Object> justifications, S
      * @param score never null
      * @return never null
      */
-    public ConstraintMatch<Score_> addConstraintMatch(ConstraintJustification justification, List<Object> indictedObjects,
+    public ConstraintMatch<Score_> addConstraintMatch(ConstraintJustification justification,
+            SequencedSet<Object> indictedObjects,
             Score_ score) {
         var constraintMatch = new ConstraintMatch<>(constraintRef, justification, indictedObjects, score);
         addConstraintMatch(constraintMatch);

core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/inliner/ConstraintMatchSupplier.java

@@ -1,11 +1,10 @@
 package ai.timefold.solver.core.impl.score.stream.common.inliner;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Objects;
+import java.util.SequencedSet;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
@@ -43,15 +42,15 @@
 public interface ConstraintMatchSupplier<Score_ extends Score<Score_>>
         extends BiFunction<Constraint, Score_, ConstraintMatch<Score_>> {
 
-    static @Nullable List<Object> collectIndictments(Constraint constraint, Tuple tuple) {
+    static @Nullable SequencedSet<Object> collectIndictments(Constraint constraint, Tuple tuple) {
         if (tuple.getIndictmentSource() == IndictmentSource.DISABLED) {
             return null;
         }
         var out = new LinkedHashSet<>();
         var abstractConstraint = (AbstractConstraint<?, ?, ?>) constraint;
         var involvedNodeIds = Objects.requireNonNull(abstractConstraint.getInvolvedNodeIds());
         tuple.getIndictmentSource().visitSources(involvedNodeIds, out::add);
-        return new ArrayList<>(out);
+        return out;
     }
 
     /**
@@ -62,7 +61,7 @@ public interface ConstraintMatchSupplier<Score_ extends Score<Score_>>
      */
     static <Score_ extends Score<Score_>> ConstraintMatchSupplier<Score_> empty() {
         return (constraint, impact) -> new ConstraintMatch<>(constraint.getConstraintRef(), null,
-                Collections.emptyList(), impact);
+                Collections.emptySortedSet(), impact);
     }
 
     static <A, Score_ extends Score<Score_>> ConstraintMatchSupplier<Score_> of(

core/src/test/java/ai/timefold/solver/core/impl/score/constraint/ConstraintMatchTest.java

@@ -3,6 +3,7 @@
 import static ai.timefold.solver.core.api.score.SimpleScore.ONE;
 import static ai.timefold.solver.core.api.score.SimpleScore.ZERO;
 
+import java.util.LinkedHashSet;
 import java.util.List;
 
 import ai.timefold.solver.core.api.score.Score;
@@ -28,7 +29,7 @@ private <Score_ extends Score<Score_>> ConstraintMatch<Score_> buildConstraintMa
             Object... facts) {
         return new ConstraintMatch<>(ConstraintRef.of(constraintName),
                 DefaultConstraintJustification.of(score, facts),
-                List.of(facts),
+                new LinkedHashSet<>(List.of(facts)),
                 score);
     }
 

core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/AbstractConstraintStreamTest.java

@@ -4,8 +4,10 @@
 import static org.assertj.core.api.Assertions.fail;
 
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -129,17 +131,17 @@ protected static class AssertableMatch {
         private final int score;
         private final ConstraintRef constraintRef;
         private final List<Object> justificationList;
-        private List<Object> indictmentList;
+        private SequencedSet<Object> indictmentSet;
 
         public AssertableMatch(int score, ConstraintRef constraintRef, Object... justifications) {
             this.justificationList = Arrays.asList(justifications);
             this.constraintRef = constraintRef;
             this.score = score;
-            this.indictmentList = justificationList;
+            this.indictmentSet = new LinkedHashSet<>(justificationList);
         }
 
         public AssertableMatch withIndictedObjects(Object... indictedObjects) {
-            this.indictmentList = Arrays.asList(indictedObjects);
+            this.indictmentSet = new LinkedHashSet<>(Arrays.asList(indictedObjects));
             return this;
         }
 
@@ -173,16 +175,16 @@ public boolean isEqualTo(ConstraintMatch<?> constraintMatch, boolean indictments
                 return true;
             }
             var indictedObjects = constraintMatch.getIndictedObjects();
-            if (indictedObjects.size() != indictmentList.size()) {
+            if (indictedObjects.size() != indictmentSet.size()) {
                 return false;
             }
-            return indictmentList.containsAll(indictedObjects);
+            return indictmentSet.containsAll(indictedObjects);
         }
 
         @Override
         public String toString() {
             return "%s %s=%d (indicting %s)".formatted(constraintRef, justificationList, score,
-                    indictmentList);
+                    indictmentSet);
         }
 
     }