Initial move impl (does not work yet)

Author: triceo

core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java

@@ -1,9 +1,5 @@
 package ai.timefold.solver.core.impl.move.director;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
-
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.domain.entity.descriptor.EntityDescriptor;
 import ai.timefold.solver.core.impl.domain.solution.descriptor.DefaultPlanningListVariableMetaModel;
@@ -22,10 +18,13 @@
 import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningVariableMetaModel;
 import ai.timefold.solver.core.preview.api.move.Move;
 import ai.timefold.solver.core.preview.api.move.Rebaser;
-
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiFunction;
+
 @NullMarked
 public sealed class MoveDirector<Solution_, Score_ extends Score<Score_>>
         implements InnerMutableSolutionView<Solution_>, Rebaser
@@ -185,6 +184,11 @@ public final <Entity_, Value_> Value_ getValue(PlanningVariableMetaModel<Solutio
         return extractVariableDescriptor(variableMetaModel).getValue(entity);
     }
 
+    @Override
+    public <Entity_, Value_> int countValues(PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ entity) {
+        return extractVariableDescriptor(variableMetaModel).getValue(entity).size();
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public final <Entity_, Value_> Value_ getValueAtIndex(

core/src/main/java/ai/timefold/solver/core/impl/move/streams/DefaultMoveStreamFactory.java

@@ -35,7 +35,7 @@ public DefaultMoveStreamFactory(SolutionDescriptor<Solution_> solutionDescriptor
 
     public DefaultMoveStreamSession<Solution_> createSession(SessionContext<Solution_> context) {
         var session = datasetSessionFactory.buildSession(context);
-        return new DefaultMoveStreamSession<>(session, context.workingSolution());
+        return new DefaultMoveStreamSession<>(session, context.solutionView());
     }
 
     @Override

core/src/main/java/ai/timefold/solver/core/impl/move/streams/DefaultMoveStreamSession.java

@@ -1,26 +1,26 @@
 package ai.timefold.solver.core.impl.move.streams;
 
-import java.util.Objects;
-
 import ai.timefold.solver.core.impl.move.streams.dataset.BiDataset;
 import ai.timefold.solver.core.impl.move.streams.dataset.BiDatasetInstance;
 import ai.timefold.solver.core.impl.move.streams.dataset.DatasetSession;
 import ai.timefold.solver.core.impl.move.streams.dataset.UniDataset;
 import ai.timefold.solver.core.impl.move.streams.dataset.UniDatasetInstance;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.MoveStreamSession;
-
+import ai.timefold.solver.core.preview.api.move.SolutionView;
 import org.jspecify.annotations.NullMarked;
 
+import java.util.Objects;
+
 @NullMarked
 public final class DefaultMoveStreamSession<Solution_>
         implements MoveStreamSession<Solution_>, AutoCloseable {
 
     private final DatasetSession<Solution_> datasetSession;
-    private final Solution_ workingSolution;
+    private final SolutionView<Solution_> solutionView;
 
-    public DefaultMoveStreamSession(DatasetSession<Solution_> datasetSession, Solution_ workingSolution) {
+    public DefaultMoveStreamSession(DatasetSession<Solution_> datasetSession, SolutionView<Solution_> solutionView) {
         this.datasetSession = Objects.requireNonNull(datasetSession);
-        this.workingSolution = Objects.requireNonNull(workingSolution);
+        this.solutionView = Objects.requireNonNull(solutionView);
     }
 
     public <A> UniDatasetInstance<Solution_, A> getDatasetInstance(UniDataset<Solution_, A> dataset) {
@@ -47,8 +47,8 @@ public void settle() {
         datasetSession.settle();
     }
 
-    public Solution_ getWorkingSolution() {
-        return workingSolution;
+    public SolutionView<Solution_> getSolutionView() {
+        return solutionView;
     }
 
     @Override

core/src/main/java/ai/timefold/solver/core/impl/move/streams/FromBiUniMoveProducer.java

@@ -1,22 +1,22 @@
 package ai.timefold.solver.core.impl.move.streams;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.Supplier;
-
 import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.move.streams.dataset.AbstractDataStream;
 import ai.timefold.solver.core.impl.move.streams.dataset.BiDataset;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.BiMoveConstructor;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.MoveStreamSession;
 import ai.timefold.solver.core.preview.api.move.Move;
-
+import ai.timefold.solver.core.preview.api.move.SolutionView;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Supplier;
+
 @NullMarked
 public final class FromBiUniMoveProducer<Solution_, A, B> implements InnerMoveProducer<Solution_> {
 
@@ -42,7 +42,7 @@ public void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> activeDa
     private final class InnerMoveIterator implements Iterator<Move<Solution_>> {
 
         private final IteratorSupplier<A, B> iteratorSupplier;
-        private final Solution_ solution;
+        private final SolutionView<Solution_> solutionView;
 
         // Fields required for iteration.
         private @Nullable Move<Solution_> nextMove;
@@ -51,13 +51,13 @@ private final class InnerMoveIterator implements Iterator<Move<Solution_>> {
         public InnerMoveIterator(DefaultMoveStreamSession<Solution_> moveStreamSession) {
             var aInstance = moveStreamSession.getDatasetInstance(aDataset);
             this.iteratorSupplier = aInstance::iterator;
-            this.solution = moveStreamSession.getWorkingSolution();
+            this.solutionView = moveStreamSession.getSolutionView();
         }
 
         public InnerMoveIterator(DefaultMoveStreamSession<Solution_> moveStreamSession, Random random) {
             var aInstance = moveStreamSession.getDatasetInstance(aDataset);
             this.iteratorSupplier = () -> aInstance.iterator(random);
-            this.solution = moveStreamSession.getWorkingSolution();
+            this.solutionView = moveStreamSession.getSolutionView();
         }
 
         @Override
@@ -78,7 +78,7 @@ public boolean hasNext() {
             }
 
             var tuple = iterator.next();
-            nextMove = moveConstructor.apply(solution, tuple.factA, tuple.factB);
+            nextMove = moveConstructor.apply(solutionView, tuple.factA, tuple.factB);
             return true;
         }
 

core/src/main/java/ai/timefold/solver/core/impl/move/streams/FromUniBiMoveProducer.java

@@ -1,23 +1,23 @@
 package ai.timefold.solver.core.impl.move.streams;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Random;
-import java.util.Set;
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
-
 import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.move.streams.dataset.AbstractDataStream;
 import ai.timefold.solver.core.impl.move.streams.dataset.UniDataset;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.BiMoveConstructor;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.MoveStreamSession;
 import ai.timefold.solver.core.preview.api.move.Move;
-
+import ai.timefold.solver.core.preview.api.move.SolutionView;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+
 @NullMarked
 public final class FromUniBiMoveProducer<Solution_, A, B> implements InnerMoveProducer<Solution_> {
 
@@ -49,7 +49,7 @@ private final class BiMoveIterator implements Iterator<Move<Solution_>> {
 
         private final IteratorSupplier<A> aIteratorSupplier;
         private final IteratorSupplier<B> bIteratorSupplier;
-        private final Solution_ solution;
+        private final SolutionView<Solution_> solutionView;
 
         // Fields required for iteration.
         private @Nullable Move<Solution_> nextMove;
@@ -62,15 +62,15 @@ public BiMoveIterator(DefaultMoveStreamSession<Solution_> moveStreamSession) {
             this.aIteratorSupplier = aInstance::iterator;
             var bInstance = moveStreamSession.getDatasetInstance(bDataset);
             this.bIteratorSupplier = bInstance::iterator;
-            this.solution = moveStreamSession.getWorkingSolution();
+            this.solutionView = moveStreamSession.getSolutionView();
         }
 
         public BiMoveIterator(DefaultMoveStreamSession<Solution_> moveStreamSession, Random random) {
             var aInstance = moveStreamSession.getDatasetInstance(aDataset);
             this.aIteratorSupplier = () -> aInstance.iterator(random);
             var bInstance = moveStreamSession.getDatasetInstance(bDataset);
             this.bIteratorSupplier = () -> bInstance.iterator(random);
-            this.solution = moveStreamSession.getWorkingSolution();
+            this.solutionView = moveStreamSession.getSolutionView();
         }
 
         @Override
@@ -101,7 +101,7 @@ public boolean hasNext() {
                     // Check if this pair passes the filter...
                     if (filter.test(currentA, currentB)) {
                         // ... and create the next move.
-                        nextMove = moveConstructor.apply(solution, currentA, currentB);
+                        nextMove = moveConstructor.apply(solutionView, currentA, currentB);
                         return true;
                     }
                 }

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

@@ -1,8 +1,10 @@
 package ai.timefold.solver.core.impl.move.streams.dataset;
 
 import ai.timefold.solver.core.impl.move.streams.maybeapi.BiDataFilter;
+import ai.timefold.solver.core.impl.move.streams.maybeapi.BiDataMapper;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.BiDataStream;
 
+import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.UniDataStream;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -24,6 +26,21 @@ public final BiDataStream<Solution_, A, B> filter(BiDataFilter<Solution_, A, B>
         return shareAndAddChild(new FilterBiDataStream<>(dataStreamFactory, this, filter));
     }
 
+    @Override
+    public <ResultA_> UniDataStream<Solution_, ResultA_> map(BiDataMapper<Solution_, A, B, ResultA_> mapping) {
+        return null;
+    }
+
+    @Override
+    public <ResultA_, ResultB_> BiDataStream<Solution_, ResultA_, ResultB_> map(BiDataMapper<Solution_, A, B, ResultA_> mappingA, BiDataMapper<Solution_, A, B, ResultB_> mappingB) {
+        return null;
+    }
+
+    @Override
+    public BiDataStream<Solution_, A, B> distinct() {
+        return null;
+    }
+
     public BiDataset<Solution_, A, B> createDataset() {
         var stream = shareAndAddChild(new TerminalBiDataStream<>(dataStreamFactory, this));
         return stream.getDataset();

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

@@ -4,6 +4,7 @@
 import ai.timefold.solver.core.impl.move.streams.dataset.joiner.BiDataJoinerComber;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.BiDataJoiner;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.UniDataFilter;
+import ai.timefold.solver.core.impl.move.streams.maybeapi.UniDataMapper;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.BiDataStream;
 import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.UniDataStream;
 
@@ -86,6 +87,21 @@ private <B> UniDataStream<Solution_, A> ifExistsOrNot(boolean shouldExist, UniDa
                 joinerComber.mergedJoiner(), joinerComber.mergedFiltering()), childStreamList::add);
     }
 
+    @Override
+    public <ResultA_> UniDataStream<Solution_, ResultA_> map(UniDataMapper<Solution_, A, ResultA_> mapping) {
+        return null;
+    }
+
+    @Override
+    public <ResultA_, ResultB_> BiDataStream<Solution_, ResultA_, ResultB_> map(UniDataMapper<Solution_, A, ResultA_> mappingA, UniDataMapper<Solution_, A, ResultB_> mappingB) {
+        return null;
+    }
+
+    @Override
+    public UniDataStream<Solution_, A> distinct() {
+        return null;
+    }
+
     public UniDataset<Solution_, A> createDataset() {
         var stream = shareAndAddChild(new TerminalUniDataStream<>(dataStreamFactory, this));
         return stream.getDataset();

core/src/main/java/ai/timefold/solver/core/impl/move/streams/maybeapi/BiDataMapper.java

@@ -0,0 +1,29 @@
+package ai.timefold.solver.core.impl.move.streams.maybeapi;
+
+import ai.timefold.solver.core.api.function.TriFunction;
+import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.BiDataStream;
+import ai.timefold.solver.core.preview.api.move.SolutionView;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.util.function.BiFunction;
+
+/**
+ * A mapping function that can be applied to {@link BiDataStream} to transform data,
+ * optionally using {@link SolutionView} to query for solution state.
+ *
+ * @param <Solution_> the type of the solution
+ * @param <A> the type of the first parameter
+ * @param <B> the type of the second parameter
+ */
+@NullMarked
+public interface BiDataMapper<Solution_, A, B, Result_> extends TriFunction<SolutionView<Solution_>, A, B, Result_> {
+
+    @Override
+    Result_ apply(SolutionView<Solution_> solutionSolutionView, @Nullable A a, @Nullable B b);
+
+    default BiFunction<A, B, Result_> toBiFunction(SolutionView<Solution_> solutionView) {
+        return (a, b) -> apply(solutionView, a, b);
+    }
+
+}

core/src/main/java/ai/timefold/solver/core/impl/move/streams/maybeapi/UniDataMapper.java

@@ -0,0 +1,28 @@
+package ai.timefold.solver.core.impl.move.streams.maybeapi;
+
+import ai.timefold.solver.core.impl.move.streams.maybeapi.stream.UniDataStream;
+import ai.timefold.solver.core.preview.api.move.SolutionView;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * A mapping function that can be applied to {@link UniDataStream} to transform data,
+ * optionally using {@link SolutionView} to query for solution state.
+ *
+ * @param <Solution_> the type of the solution
+ * @param <A> the type of the first parameter
+ */
+@NullMarked
+public interface UniDataMapper<Solution_, A, Result_> extends BiFunction<SolutionView<Solution_>, A, Result_> {
+
+    @Override
+    Result_ apply(SolutionView<Solution_> solutionSolutionView, @Nullable A a);
+
+    default Function<A, Result_> toFunction(SolutionView<Solution_> solutionView) {
+        return a -> apply(solutionView, a);
+    }
+
+}

core/src/main/java/ai/timefold/solver/core/impl/move/streams/maybeapi/generic/move/ListUnassignMove.java

@@ -1,18 +1,17 @@
 package ai.timefold.solver.core.impl.move.streams.maybeapi.generic.move;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
 import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningListVariableMetaModel;
 import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
 import ai.timefold.solver.core.preview.api.move.Move;
 import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
 import ai.timefold.solver.core.preview.api.move.Rebaser;
-
 import org.jspecify.annotations.NonNull;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 public final class ListUnassignMove<Solution_, Entity_, Value_> extends AbstractMove<Solution_> {
 
     private final PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel;