feat: concrete count in partial models

6 files changed, 76 insertions, 11 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java
new file mode 100644
index 00000000..7ae2d935
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.representation.cardinality;
+
+import tools.refinery.store.representation.AbstractDomain;
+
+import java.util.Optional;
+
+// Singleton pattern, because there is only one domain for truth values.
+@SuppressWarnings("squid:S6548")
+public class CardinalityDomain implements AbstractDomain<CardinalityInterval, Integer> {
+        public static final CardinalityDomain INSTANCE = new CardinalityDomain();
+
+        private CardinalityDomain() {
+        }
+
+        @Override
+        public Class<CardinalityInterval> abstractType() {
+                return CardinalityInterval.class;
+        }
+
+        @Override
+        public Class<Integer> concreteType() {
+                return Integer.class;
+        }
+
+        @Override
+        public CardinalityInterval toAbstract(Integer concreteValue) {
+                return CardinalityIntervals.exactly(concreteValue);
+        }
+
+        @Override
+        public Optional<Integer> toConcrete(CardinalityInterval abstractValue) {
+                return isConcrete(abstractValue) ? Optional.of(abstractValue.lowerBound()) : Optional.empty();
+        }
+
+        @Override
+        public boolean isConcrete(CardinalityInterval abstractValue) {
+                if (!(abstractValue instanceof NonEmptyCardinalityInterval nonEmptyValue) ||
+                                !((nonEmptyValue.upperBound()) instanceof FiniteUpperCardinality finiteUpperCardinality)) {
+                        return false;
+                }
+                return nonEmptyValue.lowerBound() == finiteUpperCardinality.finiteUpperBound();
+        }
+
+        @Override
+        public CardinalityInterval commonRefinement(CardinalityInterval leftValue, CardinalityInterval rightValue) {
+                return leftValue.meet(rightValue);
+        }
+
+        @Override
+        public CardinalityInterval commonAncestor(CardinalityInterval leftValue, CardinalityInterval rightValue) {
+                return leftValue.join(rightValue);
+        }
+
+        @Override
+        public CardinalityInterval unknown() {
+                return CardinalityIntervals.SET;
+        }
+
+        @Override
+        public boolean isError(CardinalityInterval abstractValue) {
+                return abstractValue.isEmpty();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
index ad16a3e8..855fd248 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
@@ -30,7 +30,7 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval between(int lowerBound, int upperBound) {
-                return between(lowerBound, UpperCardinalities.valueOf(upperBound));
+                return between(lowerBound, UpperCardinalities.atMost(upperBound));
         }
 
         public static CardinalityInterval atMost(UpperCardinality upperBound) {
@@ -38,7 +38,7 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval atMost(int upperBound) {
-                return atMost(UpperCardinalities.valueOf(upperBound));
+                return atMost(UpperCardinalities.atMost(upperBound));
         }
 
         public static CardinalityInterval atLeast(int lowerBound) {
@@ -46,6 +46,6 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval exactly(int lowerBound) {
-                return new NonEmptyCardinalityInterval(lowerBound, UpperCardinalities.valueOf(lowerBound));
+                return new NonEmptyCardinalityInterval(lowerBound, UpperCardinalities.atMost(lowerBound));
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
index acd82beb..088e3925 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
@@ -59,7 +59,7 @@ public record FiniteUpperCardinality(int finiteUpperBound) implements UpperCardi
 
         private UpperCardinality lift(@NotNull UpperCardinality other, IntBinaryOperator operator) {
                 if (other instanceof FiniteUpperCardinality finiteUpperCardinality) {
-                        return UpperCardinalities.valueOf(operator.applyAsInt(finiteUpperBound,
+                        return UpperCardinalities.atMost(operator.applyAsInt(finiteUpperBound,
                                         finiteUpperCardinality.finiteUpperBound));
                 }
                 if (other instanceof UnboundedUpperCardinality) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
index 1e18dde0..17d1b292 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
@@ -26,7 +26,7 @@ public final class UpperCardinalities {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
 
-        public static UpperCardinality valueOf(int upperBound) {
+        public static UpperCardinality atMost(int upperBound) {
                 if (upperBound < 0) {
                         return UNBOUNDED;
                 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
index 5600ab4c..3f0db028 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
@@ -27,6 +27,6 @@ public sealed interface UpperCardinality extends Comparable<UpperCardinality> pe
         int compareToInt(int value);
 
         static UpperCardinality of(int upperBound) {
-                return UpperCardinalities.valueOf(upperBound);
+                return UpperCardinalities.atMost(upperBound);
         }
 }
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
index e61f7b36..e403eec2 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
@@ -8,9 +8,6 @@ package tools.refinery.store.representation.cardinality;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
-import tools.refinery.store.representation.cardinality.UnboundedUpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -20,14 +17,14 @@ class UpperCardinalitiesTest {
         @ParameterizedTest
         @ValueSource(ints = {0, 1, 255, 256, 1000, Integer.MAX_VALUE})
         void valueOfBoundedTest(int value) {
-                var upperCardinality = UpperCardinalities.valueOf(value);
+                var upperCardinality = UpperCardinalities.atMost(value);
                 assertThat(upperCardinality, instanceOf(FiniteUpperCardinality.class));
                 assertThat(((FiniteUpperCardinality) upperCardinality).finiteUpperBound(), equalTo(value));
         }
 
         @Test
         void valueOfUnboundedTest() {
-                var upperCardinality = UpperCardinalities.valueOf(-1);
+                var upperCardinality = UpperCardinalities.atMost(-1);
                 assertThat(upperCardinality, instanceOf(UnboundedUpperCardinality.class));
         }
 }