1 files changed, 34 insertions, 6 deletions

diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
index 4e5a6099..2235a95d 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
@@ -6,18 +6,29 @@
 package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
 import tools.refinery.store.query.literal.Reduction;
 import tools.refinery.store.query.term.Parameter;
+import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.List;
 
-public record ModalConstraint(Modality modality, Constraint constraint) implements Constraint {
-        private static final String FORMAT = "%s %s";
+public record ModalConstraint(Modality modality, Concreteness concreteness, Constraint constraint)
+                implements Constraint {
+        public ModalConstraint {
+                if (constraint instanceof AnySymbolView || constraint instanceof ModalConstraint) {
+                        throw new InvalidQueryException("Already concrete constraints cannot be abstracted");
+                }
+        }
+
+        public ModalConstraint(Modality modality, Constraint constraint) {
+                this(modality, Concreteness.PARTIAL, constraint);
+        }
 
         @Override
         public String name() {
-                return FORMAT.formatted(modality, constraint.name());
+                return formatName(constraint.name());
         }
 
         @Override
@@ -36,16 +47,33 @@ public record ModalConstraint(Modality modality, Constraint constraint) implemen
                         return false;
                 }
                 var otherModalConstraint = (ModalConstraint) other;
-                return modality == otherModalConstraint.modality && constraint.equals(helper, otherModalConstraint.constraint);
+                return modality == otherModalConstraint.modality &&
+                                concreteness == otherModalConstraint.concreteness &&
+                                constraint.equals(helper, otherModalConstraint.constraint);
         }
 
         @Override
         public String toReferenceString() {
-                return FORMAT.formatted(modality, constraint.toReferenceString());
+                return formatName(constraint.toReferenceString());
         }
 
         @Override
         public String toString() {
-                return FORMAT.formatted(modality, constraint);
+                return formatName(constraint.toString());
+        }
+
+        private String formatName(String constraintName) {
+                if (concreteness == Concreteness.PARTIAL) {
+                        return "%s %s".formatted(modality, constraintName);
+                }
+                return "%s %s %s".formatted(modality, concreteness, constraintName);
+        }
+
+        public static Constraint of(Modality modality, Concreteness concreteness, Constraint constraint) {
+                if (constraint instanceof AnySymbolView || constraint instanceof ModalConstraint) {
+                        // Symbol views and lifted constraints are already concrete. Thus, they cannot be abstracted at all.
+                        return constraint;
+                }
+                return new ModalConstraint(modality, concreteness, constraint);
         }
 }