3 files changed, 51 insertions, 5 deletions

diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
index 2be92464..702e570f 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
@@ -13,9 +13,12 @@ import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.reasoning.ReasoningBuilder;
 import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral;
+import tools.refinery.store.reasoning.literal.CountUpperBoundLiteral;
 import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +42,7 @@ class LowerTypeScopePropagator extends TypeScopePropagator {
                 constraint.setLb((lowerBound - getSingleCount()));
         }
 
-        public static class Factory extends TypeScopePropagator.Factory {
+        static class Factory extends TypeScopePropagator.Factory {
                 private final PartialRelation type;
                 private final int lowerBound;
                 private final RelationalQuery allMay;
@@ -77,10 +80,18 @@ class LowerTypeScopePropagator extends TypeScopePropagator {
                                                         output.assign(sub(constant(lowerBound), candidateLowerBound)),
                                                         check(greater(output, constant(0)))
                                         )));
+                        var tooFewObjects = Query.of(type.name() + "#tooFew", builder -> builder
+                                        .clause(UpperCardinality.class, upperBound -> List.of(
+                                                        new CountUpperBoundLiteral(upperBound, type, List.of(Variable.of())),
+                                                        check(UpperCardinalityTerms.less(upperBound,
+                                                                        UpperCardinalityTerms.constant(UpperCardinality.of(lowerBound))))
+                                        )));
 
                         storeBuilder.getAdapter(ReasoningBuilder.class).objective(Objectives.value(requiredObjects));
-                        storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class).ifPresent(dseBuilder ->
-                                        dseBuilder.accept(Criteria.whenNoMatch(requiredObjects)));
+                        storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class).ifPresent(dseBuilder -> {
+                dseBuilder.accept(Criteria.whenNoMatch(requiredObjects));
+                                dseBuilder.exclude(Criteria.whenHasMatch(tooFewObjects));
+            });
                 }
         }
 }
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
index bb50656b..193c132c 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
@@ -59,7 +59,7 @@ abstract class TypeScopePropagator {
                 adapter.markAsChanged();
         }
 
-        public abstract static class Factory {
+        abstract static class Factory {
                 public abstract TypeScopePropagator createPropagator(BoundScopePropagator adapter);
 
                 protected abstract Collection<AnyQuery> getQueries();
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
index 4aba5aac..b2f8d39b 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
@@ -5,14 +5,24 @@
  */
 package tools.refinery.store.reasoning.scope;
 
+import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
+import tools.refinery.store.dse.transition.objectives.Criteria;
+import tools.refinery.store.dse.transition.objectives.Objectives;
+import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.literal.CountCandidateUpperBoundLiteral;
+import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.Collection;
 import java.util.List;
 
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.int_.IntTerms.*;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
 import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
 
@@ -30,12 +40,14 @@ class UpperTypeScopePropagator extends TypeScopePropagator {
                 constraint.setUb((upperBound - getSingleCount()));
         }
 
-        public static class Factory extends TypeScopePropagator.Factory {
+        static class Factory extends TypeScopePropagator.Factory {
+                private final PartialRelation type;
                 private final int upperBound;
                 private final RelationalQuery allMust;
                 private final RelationalQuery multiMust;
 
                 public Factory(PartialRelation type, int upperBound) {
+                        this.type = type;
                         this.upperBound = upperBound;
                         allMust = Query.of(type.name() + "#must", (builder, instance) -> builder.clause(
                                         must(type.call(instance))
@@ -55,5 +67,28 @@ class UpperTypeScopePropagator extends TypeScopePropagator {
                 protected Collection<AnyQuery> getQueries() {
                         return List.of(allMust, multiMust);
                 }
+
+                @Override
+                public void configure(ModelStoreBuilder storeBuilder) {
+                        super.configure(storeBuilder);
+
+                        var excessObjects = Query.of(type.name() + "#excess", Integer.class, (builder, output) -> builder
+                                        .clause(Integer.class, candidateUpperBound -> List.of(
+                                                        new CountCandidateUpperBoundLiteral(candidateUpperBound, type, List.of(Variable.of())),
+                                                        output.assign(sub(candidateUpperBound, constant(upperBound))),
+                                                        check(greater(output, constant(0)))
+                                        )));
+                        var tooManyObjects = Query.of(type.name() + "#tooMany", builder -> builder
+                                        .clause(Integer.class, lowerBound -> List.of(
+                                                        new CountLowerBoundLiteral(lowerBound, type, List.of(Variable.of())),
+                                                        check(greater(lowerBound, constant(upperBound)))
+                                        )));
+
+                        storeBuilder.getAdapter(ReasoningBuilder.class).objective(Objectives.value(excessObjects));
+                        storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class).ifPresent(dseBuilder -> {
+                dseBuilder.accept(Criteria.whenNoMatch(excessObjects));
+                                dseBuilder.exclude(Criteria.whenHasMatch(tooManyObjects));
+            });
+                }
         }
 }