1 files changed, 40 insertions, 29 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/action/InsertAction.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/action/InsertAction.java
index 7adab93b..2335abad 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/action/InsertAction.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/action/InsertAction.java
@@ -3,6 +3,7 @@ package tools.refinery.store.dse.internal.action;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.tuple.Tuple;
+import tools.refinery.store.tuple.Tuple0;
 
 import java.util.Arrays;
 
@@ -10,21 +11,42 @@ public class InsertAction<T> implements AtomicAction {
 
         private final Interpretation<T> interpretation;
         private final T value;
+        private final int arity;
+        private final ActionVariable[] variables;
 
-        private final ActionSymbol[] symbols;
-
-        public InsertAction(Interpretation<T> interpretation, T value, ActionSymbol... symbols) {
+        public InsertAction(Interpretation<T> interpretation, T value, ActionVariable... variables) {
                 this.interpretation = interpretation;
                 this.value = value;
-                this.symbols = symbols;
-
+                this.variables = variables;
+                this.arity = interpretation.getSymbol().arity();
+                if (variables.length != arity) {
+                        throw new IllegalArgumentException("Expected " + arity + " variables, but got " + variables.length);
+                }
         }
 
         @Override
         public void fire(Tuple activation) {
-                var tuple = Tuple.of(Arrays.stream(symbols).map(symbol -> symbol.getValue(activation).get(0))
-                                .mapToInt(Integer::intValue).toArray());
+                Tuple tuple;
+                if (arity == 0) {
+                        tuple = Tuple0.INSTANCE;
+                }
+                else if (arity == 1) {
+                        tuple = variables[0].getValue();
+                }
+                else if (arity == 2) {
+                        tuple = Tuple.of(variables[0].getValue().get(0), variables[1].getValue().get(0));
+                }
+                else if (arity == 3) {
+                        tuple = Tuple.of(variables[0].getValue().get(0), variables[1].getValue().get(0), variables[2].getValue().get(0));
+                }
+                else {
+                        tuple = Tuple.of(Arrays.stream(variables).map(variable -> variable.getValue().get(0))
+                                        .mapToInt(Integer::intValue).toArray());
+                }
+                interpretation.put(tuple, value);
+        }
 
+        public void put(Tuple tuple) {
                 interpretation.put(tuple, value);
         }
 
@@ -33,46 +55,35 @@ public class InsertAction<T> implements AtomicAction {
                 return this;
         }
 
-        public ActionSymbol[] getSymbols() {
-                return symbols;
+        public ActionVariable[] getVariables() {
+                return variables;
         }
 
         @Override
-        public boolean equals(Object obj) {
-                if (obj == this) {
-                        return true;
-                }
-                if (!(obj instanceof InsertAction<?> other)) {
+        public boolean equalsWithSubstitution(AtomicAction other) {
+                if (other == null || getClass() != other.getClass()) {
                         return false;
                 }
-                if (symbols.length != other.symbols.length) {
+                var otherAction = (InsertAction<?>) other;
+                if (variables.length != otherAction.variables.length) {
                         return false;
                 }
-                if (!interpretation.equals(other.interpretation)) {
+                if (!interpretation.equals(otherAction.interpretation)) {
                         return false;
                 }
                 if (value == null) {
-                        if (other.value != null) {
+                        if (otherAction.value != null) {
                                 return false;
                         }
                 }
-        else if (!value.equals(other.value)) {
+        else if (!value.equals(otherAction.value)) {
                         return false;
                 }
-                for (var i = 0; i < symbols.length; i++) {
-                        if (!symbols[i].equals(other.symbols[i])) {
+                for (var i = 0; i < variables.length; i++) {
+                        if (!variables[i].equalsWithSubstitution(otherAction.variables[i])) {
                                 return false;
                         }
                 }
                 return true;
         }
-
-        @Override
-        public int hashCode() {
-                int result = 17;
-                result = 31 * result + Arrays.hashCode(symbols);
-                result = 31 * result + interpretation.hashCode();
-                result = 31 * result + value.hashCode();
-                return result;
-        }
 }