4 files changed, 50 insertions, 1 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
index 0f2daca8..df80a33e 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
@@ -119,10 +119,20 @@ public class RelationalRuntimeContext implements IQueryRuntimeContext {
 
         private Iterable<Object[]> enumerate(IInputKey key, TupleMask seedMask, ITuple seed) {
                 var relationViewKey = checkKey(key);
-                Iterable<Object[]> allObjects = relationViewKey.getAll(model);
+                Iterable<Object[]> allObjects = getAllObjects(relationViewKey, seedMask, seed);
                 return filter(allObjects, objectArray -> isMatching(objectArray, seedMask, seed));
         }
 
+        private Iterable<Object[]> getAllObjects(AnySymbolView key, TupleMask seedMask, ITuple seed) {
+                for (int i = 0; i < seedMask.indices.length; i++) {
+                        int slot = seedMask.indices[i];
+                        if (key.canIndexSlot(slot)) {
+                                return key.getAdjacent(model, slot, seed.get(i));
+                        }
+                }
+                return key.getAll(model);
+        }
+
         private static boolean isMatching(Object[] tuple, TupleMask seedMask, ITuple seed) {
                 for (int i = 0; i < seedMask.indices.length; i++) {
                         final Object seedElement = seed.get(i);
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
index fd37604e..f130fa59 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.view;
 
+import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.FunctionalDependency;
 import tools.refinery.store.query.term.Parameter;
@@ -83,6 +84,20 @@ public abstract class AbstractFunctionView<T> extends SymbolView<T> {
         }
 
         @Override
+        public boolean canIndexSlot(int slot) {
+                return slot >= 0 && slot < getSymbol().arity();
+        }
+
+        @Override
+        public Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                if (!(value instanceof Tuple1 tuple1)) {
+                        return Set.of();
+                }
+                return (() -> new CursorAsIterator<>(model.getInterpretation(getSymbol()).getAdjacent(slot, tuple1.get(0)),
+                                this::forwardMap, this::filter));
+        }
+
+        @Override
         public List<Parameter> getParameters() {
                 return parameters;
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
index 90b27ebb..7e9bf6df 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
@@ -28,4 +28,12 @@ public sealed interface AnySymbolView extends Constraint permits SymbolView {
         boolean get(Model model, Object[] tuple);
 
         Iterable<Object[]> getAll(Model model);
+
+        default Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                throw new IllegalArgumentException("Cannot index slot " + slot);
+        }
+
+        default boolean canIndexSlot(int slot) {
+                return false;
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
index 6bc5a708..ed12cd9d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.view;
 
+import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.term.Parameter;
 import tools.refinery.store.representation.Symbol;
@@ -14,6 +15,7 @@ import tools.refinery.store.tuple.Tuple1;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 public abstract class TuplePreservingView<T> extends SymbolView<T> {
         private final List<Parameter> parameters;
@@ -56,6 +58,20 @@ public abstract class TuplePreservingView<T> extends SymbolView<T> {
         }
 
         @Override
+        public boolean canIndexSlot(int slot) {
+                return slot >= 0 && slot < getSymbol().arity();
+        }
+
+        @Override
+        public Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                if (!(value instanceof Tuple1 tuple1)) {
+                        return Set.of();
+                }
+                return (() -> new CursorAsIterator<>(model.getInterpretation(getSymbol()).getAdjacent(slot, tuple1.get(0)),
+                                this::forwardMap, this::filter));
+        }
+
+        @Override
         public List<Parameter> getParameters() {
                 return parameters;
         }