diff options
Diffstat (limited to 'subprojects/store-reasoning-scope/src/main/java/tools/refinery/store')
5 files changed, 25 insertions, 20 deletions
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java index ecca6117..3a9efa58 100644 --- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java +++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java | |||
@@ -13,12 +13,17 @@ import org.eclipse.collections.api.factory.primitive.IntObjectMaps; | |||
13 | import org.eclipse.collections.api.factory.primitive.IntSets; | 13 | import org.eclipse.collections.api.factory.primitive.IntSets; |
14 | import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; | 14 | import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; |
15 | import org.eclipse.collections.api.set.primitive.MutableIntSet; | 15 | import org.eclipse.collections.api.set.primitive.MutableIntSet; |
16 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; | ||
17 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; | ||
18 | import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; | ||
19 | import tools.refinery.logic.term.uppercardinality.UnboundedUpperCardinality; | ||
20 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; | ||
21 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; | ||
16 | import tools.refinery.store.dse.propagation.BoundPropagator; | 22 | import tools.refinery.store.dse.propagation.BoundPropagator; |
17 | import tools.refinery.store.dse.propagation.PropagationResult; | 23 | import tools.refinery.store.dse.propagation.PropagationResult; |
18 | import tools.refinery.store.model.Interpretation; | 24 | import tools.refinery.store.model.Interpretation; |
19 | import tools.refinery.store.model.Model; | 25 | import tools.refinery.store.model.Model; |
20 | import tools.refinery.store.query.ModelQueryAdapter; | 26 | import tools.refinery.store.query.ModelQueryAdapter; |
21 | import tools.refinery.store.representation.cardinality.*; | ||
22 | import tools.refinery.store.tuple.Tuple; | 27 | import tools.refinery.store.tuple.Tuple; |
23 | 28 | ||
24 | class BoundScopePropagator implements BoundPropagator { | 29 | class BoundScopePropagator implements BoundPropagator { |
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 702e570f..0700c696 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 | |||
@@ -5,26 +5,26 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.scope; | 6 | package tools.refinery.store.reasoning.scope; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.AnyQuery; | ||
9 | import tools.refinery.logic.dnf.Query; | ||
10 | import tools.refinery.logic.dnf.RelationalQuery; | ||
11 | import tools.refinery.logic.term.Variable; | ||
12 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; | ||
13 | import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; | ||
8 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; | 14 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; |
9 | import tools.refinery.store.dse.transition.objectives.Criteria; | 15 | import tools.refinery.store.dse.transition.objectives.Criteria; |
10 | import tools.refinery.store.dse.transition.objectives.Objectives; | 16 | import tools.refinery.store.dse.transition.objectives.Objectives; |
11 | import tools.refinery.store.model.ModelStoreBuilder; | 17 | import tools.refinery.store.model.ModelStoreBuilder; |
12 | import tools.refinery.store.query.dnf.AnyQuery; | ||
13 | import tools.refinery.store.query.dnf.Query; | ||
14 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
15 | import tools.refinery.store.query.term.Variable; | ||
16 | import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms; | ||
17 | import tools.refinery.store.reasoning.ReasoningBuilder; | 18 | import tools.refinery.store.reasoning.ReasoningBuilder; |
18 | import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral; | 19 | import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral; |
19 | import tools.refinery.store.reasoning.literal.CountUpperBoundLiteral; | 20 | import tools.refinery.store.reasoning.literal.CountUpperBoundLiteral; |
20 | import tools.refinery.store.reasoning.representation.PartialRelation; | 21 | import tools.refinery.store.reasoning.representation.PartialRelation; |
21 | import tools.refinery.store.representation.cardinality.UpperCardinality; | ||
22 | 22 | ||
23 | import java.util.Collection; | 23 | import java.util.Collection; |
24 | import java.util.List; | 24 | import java.util.List; |
25 | 25 | ||
26 | import static tools.refinery.store.query.literal.Literals.check; | 26 | import static tools.refinery.logic.literal.Literals.check; |
27 | import static tools.refinery.store.query.term.int_.IntTerms.*; | 27 | import static tools.refinery.logic.term.int_.IntTerms.*; |
28 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; | 28 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; |
29 | import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW; | 29 | import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW; |
30 | 30 | ||
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java index 25b1966c..94e6bbd7 100644 --- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java +++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java | |||
@@ -13,8 +13,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
13 | import tools.refinery.store.reasoning.translator.TranslationException; | 13 | import tools.refinery.store.reasoning.translator.TranslationException; |
14 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; | 14 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; |
15 | import tools.refinery.store.representation.Symbol; | 15 | import tools.refinery.store.representation.Symbol; |
16 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 16 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
17 | import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; | 17 | import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; |
18 | 18 | ||
19 | import java.util.*; | 19 | import java.util.*; |
20 | 20 | ||
@@ -48,7 +48,7 @@ public class ScopePropagator implements ModelStoreConfiguration { | |||
48 | } | 48 | } |
49 | var newValue = scopes.compute(type, (ignoredKey, oldValue) -> | 49 | var newValue = scopes.compute(type, (ignoredKey, oldValue) -> |
50 | oldValue == null ? interval : oldValue.meet(interval)); | 50 | oldValue == null ? interval : oldValue.meet(interval)); |
51 | if (newValue.isEmpty()) { | 51 | if (newValue.isError()) { |
52 | throw new TranslationException(type, "Unsatisfiable scope for type %s".formatted(type)); | 52 | throw new TranslationException(type, "Unsatisfiable scope for type %s".formatted(type)); |
53 | } | 53 | } |
54 | return this; | 54 | return this; |
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 193c132c..d117b0e2 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 | |||
@@ -8,8 +8,8 @@ package tools.refinery.store.reasoning.scope; | |||
8 | import com.google.ortools.linearsolver.MPConstraint; | 8 | import com.google.ortools.linearsolver.MPConstraint; |
9 | import tools.refinery.store.model.ModelStoreBuilder; | 9 | import tools.refinery.store.model.ModelStoreBuilder; |
10 | import tools.refinery.store.query.ModelQueryBuilder; | 10 | import tools.refinery.store.query.ModelQueryBuilder; |
11 | import tools.refinery.store.query.dnf.AnyQuery; | 11 | import tools.refinery.logic.dnf.AnyQuery; |
12 | import tools.refinery.store.query.dnf.RelationalQuery; | 12 | import tools.refinery.logic.dnf.RelationalQuery; |
13 | import tools.refinery.store.query.resultset.ResultSet; | 13 | import tools.refinery.store.query.resultset.ResultSet; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
15 | 15 | ||
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 b2f8d39b..ad56b9bd 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,14 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.scope; | 6 | package tools.refinery.store.reasoning.scope; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.AnyQuery; | ||
9 | import tools.refinery.logic.dnf.Query; | ||
10 | import tools.refinery.logic.dnf.RelationalQuery; | ||
11 | import tools.refinery.logic.term.Variable; | ||
8 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; | 12 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; |
9 | import tools.refinery.store.dse.transition.objectives.Criteria; | 13 | import tools.refinery.store.dse.transition.objectives.Criteria; |
10 | import tools.refinery.store.dse.transition.objectives.Objectives; | 14 | import tools.refinery.store.dse.transition.objectives.Objectives; |
11 | import tools.refinery.store.model.ModelStoreBuilder; | 15 | import tools.refinery.store.model.ModelStoreBuilder; |
12 | import tools.refinery.store.query.dnf.AnyQuery; | ||
13 | import tools.refinery.store.query.dnf.Query; | ||
14 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
15 | import tools.refinery.store.query.term.Variable; | ||
16 | import tools.refinery.store.reasoning.ReasoningBuilder; | 16 | import tools.refinery.store.reasoning.ReasoningBuilder; |
17 | import tools.refinery.store.reasoning.literal.CountCandidateUpperBoundLiteral; | 17 | import tools.refinery.store.reasoning.literal.CountCandidateUpperBoundLiteral; |
18 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; | 18 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; |
@@ -21,8 +21,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
21 | import java.util.Collection; | 21 | import java.util.Collection; |
22 | import java.util.List; | 22 | import java.util.List; |
23 | 23 | ||
24 | import static tools.refinery.store.query.literal.Literals.check; | 24 | import static tools.refinery.logic.literal.Literals.check; |
25 | import static tools.refinery.store.query.term.int_.IntTerms.*; | 25 | import static tools.refinery.logic.term.int_.IntTerms.*; |
26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; | 26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; |
27 | import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW; | 27 | import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW; |
28 | 28 | ||