Skip to content

Commit f9f92f9

Browse files
authored
refactor: remove constraint collector int overloads (#2190)
Counterparts: TimefoldAI/timefold-quickstarts#1039 TimefoldAI/timefold-solver-benchmarks#119
1 parent d15fe5d commit f9f92f9

77 files changed

Lines changed: 590 additions & 1929 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/src/main/java/ai/timefold/solver/core/api/score/stream/ConstraintCollectors.java

Lines changed: 51 additions & 177 deletions
Large diffs are not rendered by default.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/IntAverageCalculator.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/IntCalculator.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/IntCounter.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/IntDistinctCountCalculator.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/IntSumCalculator.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/ObjectCalculator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ai.timefold.solver.core.impl.score.stream.collector;
22

33
public sealed interface ObjectCalculator<Input_, Output_, Mapped_>
4-
permits ConnectedRangesCalculator, IntDistinctCountCalculator, LongDistinctCountCalculator, ReferenceAverageCalculator,
5-
ReferenceSumCalculator, SequenceCalculator {
4+
permits ConnectedRangesCalculator, LongDistinctCountCalculator, ReferenceAverageCalculator, ReferenceSumCalculator,
5+
SequenceCalculator {
66
Mapped_ insert(Input_ input);
77

88
void retract(Mapped_ mapped);

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/bi/AverageLongBiCollector.java renamed to core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/bi/AverageBiCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import org.jspecify.annotations.NonNull;
99

10-
final class AverageLongBiCollector<A, B> extends LongCalculatorBiCollector<A, B, Double, LongAverageCalculator> {
11-
AverageLongBiCollector(ToLongBiFunction<? super A, ? super B> mapper) {
10+
final class AverageBiCollector<A, B> extends LongCalculatorBiCollector<A, B, Double, LongAverageCalculator> {
11+
AverageBiCollector(ToLongBiFunction<? super A, ? super B> mapper) {
1212
super(mapper);
1313
}
1414

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/bi/AverageIntBiCollector.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/bi/CountLongBiCollector.java renamed to core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/bi/CountBiCollector.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
import org.jspecify.annotations.NonNull;
1111

12-
final class CountLongBiCollector<A, B> implements BiConstraintCollector<A, B, LongCounter, Long> {
13-
private final static CountLongBiCollector<?, ?> INSTANCE = new CountLongBiCollector<>();
12+
final class CountBiCollector<A, B> implements BiConstraintCollector<A, B, LongCounter, Long> {
13+
private static final CountBiCollector<?, ?> INSTANCE = new CountBiCollector<>();
1414

15-
private CountLongBiCollector() {
15+
private CountBiCollector() {
1616
}
1717

1818
@SuppressWarnings("unchecked")
19-
static <A, B> CountLongBiCollector<A, B> getInstance() {
20-
return (CountLongBiCollector<A, B>) INSTANCE;
19+
static <A, B> CountBiCollector<A, B> getInstance() {
20+
return (CountBiCollector<A, B>) INSTANCE;
2121
}
2222

2323
@Override

0 commit comments

Comments
 (0)