Skip to content

Commit f64c188

Browse files
committed
Another better name
1 parent 686466c commit f64c188

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
package ai.timefold.solver.core.impl.bavet.common;
22

3+
import ai.timefold.solver.core.impl.bavet.NodeNetwork;
4+
import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
5+
import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
6+
import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
7+
import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
8+
import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
9+
310
import java.util.ArrayList;
411
import java.util.Collections;
512
import java.util.HashMap;
@@ -11,13 +18,6 @@
1118
import java.util.function.Consumer;
1219
import java.util.function.UnaryOperator;
1320

14-
import ai.timefold.solver.core.impl.bavet.NodeNetwork;
15-
import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
16-
import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
17-
import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
18-
import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
19-
import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
20-
2121
public abstract class AbstractNodeBuildHelper<Stream_ extends BavetStream> {
2222

2323
private final Set<Stream_> activeStreamSet;

core/src/main/java/ai/timefold/solver/core/impl/move/streams/dataset/uni/AbstractForEachDataStream.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package ai.timefold.solver.core.impl.move.streams.dataset.uni;
22

3-
import static ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode.LifecycleOperation;
4-
5-
import java.util.Objects;
6-
import java.util.Set;
7-
83
import ai.timefold.solver.core.impl.bavet.common.TupleSource;
94
import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
105
import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
116
import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
127
import ai.timefold.solver.core.impl.move.streams.dataset.DataStreamFactory;
138
import ai.timefold.solver.core.impl.move.streams.dataset.common.AbstractDataStream;
149
import ai.timefold.solver.core.impl.move.streams.dataset.common.DataNodeBuildHelper;
15-
1610
import org.jspecify.annotations.NullMarked;
1711

12+
import java.util.Objects;
13+
import java.util.Set;
14+
15+
import static ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode.LifecycleOperation;
16+
1817
@NullMarked
1918
abstract sealed class AbstractForEachDataStream<Solution_, A>
2019
extends AbstractUniDataStream<Solution_, A>
@@ -40,14 +39,15 @@ public final void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> da
4039
public final void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
4140
TupleLifecycle<UniTuple<A>> tupleLifecycle = buildHelper.getAggregatedTupleLifecycle(childStreamList);
4241
var outputStoreSize = buildHelper.extractTupleStoreSize(this);
43-
var node = getNode(tupleLifecycle, outputStoreSize);
42+
var node = createNodeInstance(tupleLifecycle, outputStoreSize);
4443
if (shouldIncludeNull && node.supports(LifecycleOperation.INSERT)) {
4544
node.insert(null);
4645
}
4746
buildHelper.addNode(node, this, null);
4847
}
4948

50-
protected abstract AbstractForEachUniNode<A> getNode(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize);
49+
protected abstract AbstractForEachUniNode<A> createNodeInstance(TupleLifecycle<UniTuple<A>> tupleLifecycle,
50+
int outputStoreSize);
5151

5252
@Override
5353
public abstract boolean equals(Object o);

core/src/main/java/ai/timefold/solver/core/impl/move/streams/dataset/uni/ForEachFromSolutionDataStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ForEachFromSolutionDataStream(DataStreamFactory<Solution_> dataStreamFact
2727
}
2828

2929
@Override
30-
protected AbstractForEachUniNode<A> getNode(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize) {
30+
protected AbstractForEachUniNode<A> createNodeInstance(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize) {
3131
return new ForEachFromSolutionUniNode<>(valueRangeDescriptor, tupleLifecycle, outputStoreSize);
3232
}
3333

core/src/main/java/ai/timefold/solver/core/impl/move/streams/dataset/uni/ForEachIncludingPinnedDataStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public ForEachIncludingPinnedDataStream(DataStreamFactory<Solution_> dataStreamF
2222
}
2323

2424
@Override
25-
protected AbstractForEachUniNode<A> getNode(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize) {
25+
protected AbstractForEachUniNode<A> createNodeInstance(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize) {
2626
return new ForEachIncludingUnassignedUniNode<>(forEachClass, tupleLifecycle, outputStoreSize);
2727
}
2828

0 commit comments

Comments
 (0)