diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-03-07 22:10:42 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-04-07 14:55:46 +0200 |
commit | 16a9b534adec2c53b50f92a43c1623918b1c59c0 (patch) | |
tree | 690b299a2ca31e302ddad219a7aa94bcf86d5d0b /subprojects/store-reasoning/src/main/java | |
parent | fix(frontend): * operator highlighting (diff) | |
download | refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.gz refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.zst refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.zip |
refactor: move terms and DNF into logic subproject
Diffstat (limited to 'subprojects/store-reasoning/src/main/java')
61 files changed, 223 insertions, 226 deletions
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java index 79bce33e..7ffa6faa 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java | |||
@@ -8,10 +8,10 @@ package tools.refinery.store.reasoning; | |||
8 | import tools.refinery.store.adapter.ModelAdapterBuilder; | 8 | import tools.refinery.store.adapter.ModelAdapterBuilder; |
9 | import tools.refinery.store.dse.transition.objectives.Objective; | 9 | import tools.refinery.store.dse.transition.objectives.Objective; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.dnf.Dnf; | 11 | import tools.refinery.logic.dnf.Dnf; |
12 | import tools.refinery.store.query.dnf.FunctionalQuery; | 12 | import tools.refinery.logic.dnf.FunctionalQuery; |
13 | import tools.refinery.store.query.dnf.Query; | 13 | import tools.refinery.logic.dnf.Query; |
14 | import tools.refinery.store.query.dnf.RelationalQuery; | 14 | import tools.refinery.logic.dnf.RelationalQuery; |
15 | import tools.refinery.store.reasoning.literal.Concreteness; | 15 | import tools.refinery.store.reasoning.literal.Concreteness; |
16 | import tools.refinery.store.reasoning.literal.Modality; | 16 | import tools.refinery.store.reasoning.literal.Modality; |
17 | import tools.refinery.store.reasoning.refinement.PartialModelInitializer; | 17 | import tools.refinery.store.reasoning.refinement.PartialModelInitializer; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java index 62c35cee..6a0004d9 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions; | |||
8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; |
9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; | 9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; |
10 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
11 | import tools.refinery.store.query.term.NodeVariable; | 11 | import tools.refinery.logic.term.NodeVariable; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | import tools.refinery.store.tuple.Tuple; | 13 | import tools.refinery.store.tuple.Tuple; |
14 | 14 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java index 5a6f22d2..c819a1f9 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions; | |||
8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; |
9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; | 9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; |
10 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
11 | import tools.refinery.store.query.term.NodeVariable; | 11 | import tools.refinery.logic.term.NodeVariable; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | 13 | ||
14 | import java.util.List; | 14 | import java.util.List; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java index 8d0d7961..79e0237c 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions; | |||
8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; |
9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; | 9 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; |
10 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
11 | import tools.refinery.store.query.term.NodeVariable; | 11 | import tools.refinery.logic.term.NodeVariable; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 13 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java index f36fde44..7b4c5446 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java | |||
@@ -5,10 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.actions; | 6 | package tools.refinery.store.reasoning.actions; |
7 | 7 | ||
8 | import tools.refinery.store.query.term.NodeVariable; | 8 | import tools.refinery.logic.term.NodeVariable; |
9 | import tools.refinery.store.reasoning.representation.PartialRelation; | 9 | import tools.refinery.store.reasoning.representation.PartialRelation; |
10 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 10 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
11 | import tools.refinery.store.representation.TruthValue; | 11 | import tools.refinery.logic.term.truthvalue.TruthValue; |
12 | 12 | ||
13 | import java.util.List; | 13 | import java.util.List; |
14 | 14 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java index 40993235..dc508a7b 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java | |||
@@ -5,25 +5,25 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.internal; | 6 | package tools.refinery.store.reasoning.internal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.dnf.Dnf; | 9 | import tools.refinery.logic.dnf.Dnf; |
10 | import tools.refinery.store.query.dnf.DnfBuilder; | 10 | import tools.refinery.logic.dnf.DnfBuilder; |
11 | import tools.refinery.store.query.dnf.DnfClause; | 11 | import tools.refinery.logic.dnf.DnfClause; |
12 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 12 | import tools.refinery.logic.literal.AbstractCallLiteral; |
13 | import tools.refinery.store.query.literal.AbstractCountLiteral; | 13 | import tools.refinery.logic.literal.AbstractCountLiteral; |
14 | import tools.refinery.store.query.literal.CallPolarity; | 14 | import tools.refinery.logic.literal.CallPolarity; |
15 | import tools.refinery.store.query.literal.Literal; | 15 | import tools.refinery.logic.literal.Literal; |
16 | import tools.refinery.store.query.term.Aggregator; | 16 | import tools.refinery.logic.term.Aggregator; |
17 | import tools.refinery.store.query.term.ConstantTerm; | 17 | import tools.refinery.logic.term.ConstantTerm; |
18 | import tools.refinery.store.query.term.Term; | 18 | import tools.refinery.logic.term.Term; |
19 | import tools.refinery.store.query.term.Variable; | 19 | import tools.refinery.logic.term.Variable; |
20 | import tools.refinery.store.query.term.int_.IntTerms; | 20 | import tools.refinery.logic.term.int_.IntTerms; |
21 | import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms; | 21 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; |
22 | import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; | ||
22 | import tools.refinery.store.reasoning.ReasoningAdapter; | 23 | import tools.refinery.store.reasoning.ReasoningAdapter; |
23 | import tools.refinery.store.reasoning.literal.*; | 24 | import tools.refinery.store.reasoning.literal.*; |
24 | import tools.refinery.store.reasoning.representation.PartialRelation; | 25 | import tools.refinery.store.reasoning.representation.PartialRelation; |
25 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; | 26 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; |
26 | import tools.refinery.store.representation.cardinality.UpperCardinalities; | ||
27 | 27 | ||
28 | import java.util.*; | 28 | import java.util.*; |
29 | import java.util.function.BinaryOperator; | 29 | import java.util.function.BinaryOperator; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java index 79cba263..9a916b69 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java | |||
@@ -5,8 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.internal; | 6 | package tools.refinery.store.reasoning.internal; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.Dnf; | 8 | import tools.refinery.logic.dnf.Dnf; |
9 | import tools.refinery.store.query.rewriter.AbstractRecursiveRewriter; | 9 | import tools.refinery.logic.rewriter.AbstractRecursiveRewriter; |
10 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; | 10 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; |
11 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 11 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
12 | import tools.refinery.store.reasoning.representation.PartialRelation; | 12 | import tools.refinery.store.reasoning.representation.PartialRelation; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java index bd16bdfa..a287cce3 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java | |||
@@ -19,8 +19,8 @@ import tools.refinery.store.reasoning.representation.AnyPartialSymbol; | |||
19 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 19 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
20 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; | 20 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; |
21 | import tools.refinery.store.representation.Symbol; | 21 | import tools.refinery.store.representation.Symbol; |
22 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 22 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
23 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 23 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
24 | import tools.refinery.store.tuple.Tuple; | 24 | import tools.refinery.store.tuple.Tuple; |
25 | import tools.refinery.store.tuple.Tuple1; | 25 | import tools.refinery.store.tuple.Tuple1; |
26 | 26 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java index 722458c8..87122b1d 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java | |||
@@ -12,10 +12,10 @@ import tools.refinery.store.dse.transition.objectives.Objectives; | |||
12 | import tools.refinery.store.model.ModelStore; | 12 | import tools.refinery.store.model.ModelStore; |
13 | import tools.refinery.store.model.ModelStoreBuilder; | 13 | import tools.refinery.store.model.ModelStoreBuilder; |
14 | import tools.refinery.store.query.ModelQueryBuilder; | 14 | import tools.refinery.store.query.ModelQueryBuilder; |
15 | import tools.refinery.store.query.dnf.Dnf; | 15 | import tools.refinery.logic.dnf.Dnf; |
16 | import tools.refinery.store.query.dnf.FunctionalQuery; | 16 | import tools.refinery.logic.dnf.FunctionalQuery; |
17 | import tools.refinery.store.query.dnf.Query; | 17 | import tools.refinery.logic.dnf.Query; |
18 | import tools.refinery.store.query.dnf.RelationalQuery; | 18 | import tools.refinery.logic.dnf.RelationalQuery; |
19 | import tools.refinery.store.reasoning.ReasoningBuilder; | 19 | import tools.refinery.store.reasoning.ReasoningBuilder; |
20 | import tools.refinery.store.reasoning.interpretation.PartialInterpretation; | 20 | import tools.refinery.store.reasoning.interpretation.PartialInterpretation; |
21 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 21 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java index 6ad35c20..72ad386c 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java | |||
@@ -5,9 +5,9 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.interpretation; | 6 | package tools.refinery.store.reasoning.interpretation; |
7 | 7 | ||
8 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 8 | import tools.refinery.logic.literal.AbstractCallLiteral; |
9 | import tools.refinery.store.query.literal.Literal; | 9 | import tools.refinery.logic.literal.Literal; |
10 | import tools.refinery.store.query.term.Variable; | 10 | import tools.refinery.logic.term.Variable; |
11 | import tools.refinery.store.reasoning.literal.Concreteness; | 11 | import tools.refinery.store.reasoning.literal.Concreteness; |
12 | import tools.refinery.store.reasoning.literal.Modality; | 12 | import tools.refinery.store.reasoning.literal.Modality; |
13 | 13 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java index 5cdaa185..8fe34b27 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java | |||
@@ -9,12 +9,12 @@ import tools.refinery.store.map.Cursor; | |||
9 | import tools.refinery.store.model.ModelStoreBuilder; | 9 | import tools.refinery.store.model.ModelStoreBuilder; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.ModelQueryBuilder; | 11 | import tools.refinery.store.query.ModelQueryBuilder; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.resultset.ResultSet; | 13 | import tools.refinery.store.query.resultset.ResultSet; |
14 | import tools.refinery.store.reasoning.ReasoningAdapter; | 14 | import tools.refinery.store.reasoning.ReasoningAdapter; |
15 | import tools.refinery.store.reasoning.literal.Concreteness; | 15 | import tools.refinery.store.reasoning.literal.Concreteness; |
16 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 16 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
17 | import tools.refinery.store.representation.TruthValue; | 17 | import tools.refinery.logic.term.truthvalue.TruthValue; |
18 | import tools.refinery.store.tuple.Tuple; | 18 | import tools.refinery.store.tuple.Tuple; |
19 | 19 | ||
20 | import java.util.Set; | 20 | import java.util.Set; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java index 78fdbb89..a6850e75 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java | |||
@@ -5,10 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.interpretation; | 6 | package tools.refinery.store.reasoning.interpretation; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.RelationalQuery; | 8 | import tools.refinery.logic.dnf.RelationalQuery; |
9 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 9 | import tools.refinery.logic.literal.AbstractCallLiteral; |
10 | import tools.refinery.store.query.literal.Literal; | 10 | import tools.refinery.logic.literal.Literal; |
11 | import tools.refinery.store.query.term.Variable; | 11 | import tools.refinery.logic.term.Variable; |
12 | import tools.refinery.store.reasoning.literal.Concreteness; | 12 | import tools.refinery.store.reasoning.literal.Concreteness; |
13 | import tools.refinery.store.reasoning.literal.Modality; | 13 | import tools.refinery.store.reasoning.literal.Modality; |
14 | 14 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java index 17916c02..02e16dc5 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java | |||
@@ -5,13 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.lifting; | 6 | package tools.refinery.store.reasoning.lifting; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.dnf.Dnf; | 9 | import tools.refinery.logic.dnf.Dnf; |
10 | import tools.refinery.store.query.dnf.DnfClause; | 10 | import tools.refinery.logic.dnf.DnfClause; |
11 | import tools.refinery.store.query.literal.*; | 11 | import tools.refinery.logic.literal.*; |
12 | import tools.refinery.store.query.term.NodeVariable; | 12 | import tools.refinery.logic.term.NodeVariable; |
13 | import tools.refinery.store.query.term.ParameterDirection; | 13 | import tools.refinery.logic.term.ParameterDirection; |
14 | import tools.refinery.store.query.term.Variable; | 14 | import tools.refinery.logic.term.Variable; |
15 | import tools.refinery.store.reasoning.ReasoningAdapter; | 15 | import tools.refinery.store.reasoning.ReasoningAdapter; |
16 | import tools.refinery.store.reasoning.literal.Concreteness; | 16 | import tools.refinery.store.reasoning.literal.Concreteness; |
17 | import tools.refinery.store.reasoning.literal.ModalConstraint; | 17 | import tools.refinery.store.reasoning.literal.ModalConstraint; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java index 889f595f..1eeb5de1 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java | |||
@@ -5,9 +5,9 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.lifting; | 6 | package tools.refinery.store.reasoning.lifting; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.*; | 8 | import tools.refinery.logic.dnf.*; |
9 | import tools.refinery.store.query.equality.DnfEqualityChecker; | 9 | import tools.refinery.logic.equality.DnfEqualityChecker; |
10 | import tools.refinery.store.query.literal.Literal; | 10 | import tools.refinery.logic.literal.Literal; |
11 | import tools.refinery.store.reasoning.literal.Concreteness; | 11 | import tools.refinery.store.reasoning.literal.Concreteness; |
12 | import tools.refinery.store.reasoning.literal.Modality; | 12 | import tools.refinery.store.reasoning.literal.Modality; |
13 | 13 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java index 91dd2b72..e4c180fc 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java | |||
@@ -5,13 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 9 | import tools.refinery.logic.literal.AbstractCallLiteral; |
10 | import tools.refinery.store.query.literal.AbstractCountLiteral; | 10 | import tools.refinery.logic.literal.AbstractCountLiteral; |
11 | import tools.refinery.store.query.literal.Literal; | 11 | import tools.refinery.logic.literal.Literal; |
12 | import tools.refinery.store.query.substitution.Substitution; | 12 | import tools.refinery.logic.substitution.Substitution; |
13 | import tools.refinery.store.query.term.DataVariable; | 13 | import tools.refinery.logic.term.DataVariable; |
14 | import tools.refinery.store.query.term.Variable; | 14 | import tools.refinery.logic.term.Variable; |
15 | 15 | ||
16 | import java.util.List; | 16 | import java.util.List; |
17 | 17 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java index 94c9399d..2faeda22 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java | |||
@@ -5,13 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 9 | import tools.refinery.logic.literal.AbstractCallLiteral; |
10 | import tools.refinery.store.query.literal.AbstractCountLiteral; | 10 | import tools.refinery.logic.literal.AbstractCountLiteral; |
11 | import tools.refinery.store.query.literal.Literal; | 11 | import tools.refinery.logic.literal.Literal; |
12 | import tools.refinery.store.query.substitution.Substitution; | 12 | import tools.refinery.logic.substitution.Substitution; |
13 | import tools.refinery.store.query.term.DataVariable; | 13 | import tools.refinery.logic.term.DataVariable; |
14 | import tools.refinery.store.query.term.Variable; | 14 | import tools.refinery.logic.term.Variable; |
15 | 15 | ||
16 | import java.util.List; | 16 | import java.util.List; |
17 | 17 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java index b75b0cab..c009cfae 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java | |||
@@ -5,13 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 9 | import tools.refinery.logic.literal.AbstractCallLiteral; |
10 | import tools.refinery.store.query.literal.AbstractCountLiteral; | 10 | import tools.refinery.logic.literal.AbstractCountLiteral; |
11 | import tools.refinery.store.query.literal.Literal; | 11 | import tools.refinery.logic.literal.Literal; |
12 | import tools.refinery.store.query.substitution.Substitution; | 12 | import tools.refinery.logic.substitution.Substitution; |
13 | import tools.refinery.store.query.term.DataVariable; | 13 | import tools.refinery.logic.term.DataVariable; |
14 | import tools.refinery.store.query.term.Variable; | 14 | import tools.refinery.logic.term.Variable; |
15 | 15 | ||
16 | import java.util.List; | 16 | import java.util.List; |
17 | 17 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java index 03842143..84bea8c0 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java | |||
@@ -5,15 +5,15 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 9 | import tools.refinery.logic.literal.AbstractCallLiteral; |
10 | import tools.refinery.store.query.literal.AbstractCountLiteral; | 10 | import tools.refinery.logic.literal.AbstractCountLiteral; |
11 | import tools.refinery.store.query.literal.Literal; | 11 | import tools.refinery.logic.literal.Literal; |
12 | import tools.refinery.store.query.substitution.Substitution; | 12 | import tools.refinery.logic.substitution.Substitution; |
13 | import tools.refinery.store.query.term.DataVariable; | 13 | import tools.refinery.logic.term.DataVariable; |
14 | import tools.refinery.store.query.term.Variable; | 14 | import tools.refinery.logic.term.Variable; |
15 | import tools.refinery.store.representation.cardinality.UpperCardinalities; | 15 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; |
16 | import tools.refinery.store.representation.cardinality.UpperCardinality; | 16 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; |
17 | 17 | ||
18 | import java.util.List; | 18 | import java.util.List; |
19 | 19 | ||
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 2235a95d..6b8af460 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 | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.Constraint; |
9 | import tools.refinery.store.query.InvalidQueryException; | 9 | import tools.refinery.logic.InvalidQueryException; |
10 | import tools.refinery.store.query.equality.LiteralEqualityHelper; | 10 | import tools.refinery.logic.equality.LiteralEqualityHelper; |
11 | import tools.refinery.store.query.literal.Reduction; | 11 | import tools.refinery.logic.literal.Reduction; |
12 | import tools.refinery.store.query.term.Parameter; | 12 | import tools.refinery.logic.term.Parameter; |
13 | import tools.refinery.store.query.view.AnySymbolView; | 13 | import tools.refinery.store.query.view.AnySymbolView; |
14 | 14 | ||
15 | import java.util.List; | 15 | import java.util.List; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java index c99a0399..045b7147 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java | |||
@@ -5,7 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.literal.CallPolarity; | 8 | |
9 | import tools.refinery.logic.literal.CallPolarity; | ||
9 | 10 | ||
10 | import java.util.Locale; | 11 | import java.util.Locale; |
11 | 12 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java index 2614c26e..72b085a5 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java | |||
@@ -5,8 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.literal; | 6 | package tools.refinery.store.reasoning.literal; |
7 | 7 | ||
8 | import tools.refinery.store.query.InvalidQueryException; | 8 | import tools.refinery.logic.InvalidQueryException; |
9 | import tools.refinery.store.query.literal.CallLiteral; | 9 | import tools.refinery.logic.literal.CallLiteral; |
10 | 10 | ||
11 | public final class PartialLiterals { | 11 | public final class PartialLiterals { |
12 | private PartialLiterals() { | 12 | private PartialLiterals() { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java index 788eef73..3e10c6c1 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.representation; | 6 | package tools.refinery.store.reasoning.representation; |
7 | 7 | ||
8 | import tools.refinery.store.representation.AnyAbstractDomain; | 8 | import tools.refinery.logic.AnyAbstractDomain; |
9 | 9 | ||
10 | public sealed interface AnyPartialSymbol permits AnyPartialFunction, PartialSymbol { | 10 | public sealed interface AnyPartialSymbol permits AnyPartialFunction, PartialSymbol { |
11 | String name(); | 11 | String name(); |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java index e59c8af8..236be7f8 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.representation; | 6 | package tools.refinery.store.reasoning.representation; |
7 | 7 | ||
8 | import tools.refinery.store.representation.AbstractDomain; | 8 | import tools.refinery.logic.AbstractDomain; |
9 | 9 | ||
10 | public record PartialFunction<A, C>(String name, int arity, AbstractDomain<A, C> abstractDomain) | 10 | public record PartialFunction<A, C>(String name, int arity, AbstractDomain<A, C> abstractDomain) |
11 | implements AnyPartialFunction, PartialSymbol<A, C> { | 11 | implements AnyPartialFunction, PartialSymbol<A, C> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java index 4ccb7033..0f108247 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.representation; | 6 | package tools.refinery.store.reasoning.representation; |
7 | 7 | ||
8 | import tools.refinery.store.query.Constraint; | 8 | import tools.refinery.logic.AbstractDomain; |
9 | import tools.refinery.store.query.term.Parameter; | 9 | import tools.refinery.logic.Constraint; |
10 | import tools.refinery.store.representation.AbstractDomain; | 10 | import tools.refinery.logic.term.Parameter; |
11 | import tools.refinery.store.representation.TruthValue; | 11 | import tools.refinery.logic.term.truthvalue.TruthValue; |
12 | import tools.refinery.store.representation.TruthValueDomain; | 12 | import tools.refinery.logic.term.truthvalue.TruthValueDomain; |
13 | 13 | ||
14 | import java.util.Arrays; | 14 | import java.util.Arrays; |
15 | import java.util.List; | 15 | import java.util.List; |
@@ -44,7 +44,7 @@ public record PartialRelation(String name, int arity) implements PartialSymbol<T | |||
44 | 44 | ||
45 | @Override | 45 | @Override |
46 | public int hashCode() { | 46 | public int hashCode() { |
47 | // Compare by identity to make hash table lookups more efficient. | 47 | // Compare by identity to make hash table look-ups more efficient. |
48 | return System.identityHashCode(this); | 48 | return System.identityHashCode(this); |
49 | } | 49 | } |
50 | 50 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java index 38b2e466..6986d518 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.representation; | 6 | package tools.refinery.store.reasoning.representation; |
7 | 7 | ||
8 | import tools.refinery.store.representation.AbstractDomain; | 8 | import tools.refinery.logic.AbstractDomain; |
9 | 9 | ||
10 | public sealed interface PartialSymbol<A, C> extends AnyPartialSymbol permits PartialFunction, PartialRelation { | 10 | public sealed interface PartialSymbol<A, C> extends AnyPartialSymbol permits PartialFunction, PartialRelation { |
11 | @Override | 11 | @Override |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java index c2039afc..75fb3397 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java | |||
@@ -5,18 +5,19 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator; | 6 | package tools.refinery.store.reasoning.translator; |
7 | 7 | ||
8 | import tools.refinery.logic.Constraint; | ||
9 | import tools.refinery.logic.dnf.Query; | ||
10 | import tools.refinery.logic.dnf.QueryBuilder; | ||
11 | import tools.refinery.logic.dnf.RelationalQuery; | ||
12 | import tools.refinery.logic.literal.Literal; | ||
13 | import tools.refinery.logic.term.NodeVariable; | ||
14 | import tools.refinery.logic.term.truthvalue.TruthValue; | ||
8 | import tools.refinery.store.dse.transition.Rule; | 15 | import tools.refinery.store.dse.transition.Rule; |
9 | import tools.refinery.store.dse.transition.objectives.Criteria; | 16 | import tools.refinery.store.dse.transition.objectives.Criteria; |
10 | import tools.refinery.store.dse.transition.objectives.Criterion; | 17 | import tools.refinery.store.dse.transition.objectives.Criterion; |
11 | import tools.refinery.store.dse.transition.objectives.Objective; | 18 | import tools.refinery.store.dse.transition.objectives.Objective; |
12 | import tools.refinery.store.dse.transition.objectives.Objectives; | 19 | import tools.refinery.store.dse.transition.objectives.Objectives; |
13 | import tools.refinery.store.model.ModelStoreBuilder; | 20 | import tools.refinery.store.model.ModelStoreBuilder; |
14 | import tools.refinery.store.query.Constraint; | ||
15 | import tools.refinery.store.query.dnf.Query; | ||
16 | import tools.refinery.store.query.dnf.QueryBuilder; | ||
17 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
18 | import tools.refinery.store.query.literal.Literal; | ||
19 | import tools.refinery.store.query.term.NodeVariable; | ||
20 | import tools.refinery.store.query.view.MayView; | 21 | import tools.refinery.store.query.view.MayView; |
21 | import tools.refinery.store.query.view.MustView; | 22 | import tools.refinery.store.query.view.MustView; |
22 | import tools.refinery.store.reasoning.ReasoningAdapter; | 23 | import tools.refinery.store.reasoning.ReasoningAdapter; |
@@ -36,12 +37,11 @@ import tools.refinery.store.reasoning.refinement.StorageRefiner; | |||
36 | import tools.refinery.store.reasoning.representation.PartialRelation; | 37 | import tools.refinery.store.reasoning.representation.PartialRelation; |
37 | import tools.refinery.store.representation.AnySymbol; | 38 | import tools.refinery.store.representation.AnySymbol; |
38 | import tools.refinery.store.representation.Symbol; | 39 | import tools.refinery.store.representation.Symbol; |
39 | import tools.refinery.store.representation.TruthValue; | ||
40 | 40 | ||
41 | import java.util.ArrayList; | 41 | import java.util.ArrayList; |
42 | import java.util.function.BiConsumer; | 42 | import java.util.function.BiConsumer; |
43 | 43 | ||
44 | import static tools.refinery.store.query.literal.Literals.not; | 44 | import static tools.refinery.logic.literal.Literals.not; |
45 | 45 | ||
46 | @SuppressWarnings("UnusedReturnValue") | 46 | @SuppressWarnings("UnusedReturnValue") |
47 | public final class PartialRelationTranslator extends PartialSymbolTranslator<TruthValue, Boolean> { | 47 | public final class PartialRelationTranslator extends PartialSymbolTranslator<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java index c85bd8b7..1183d456 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java | |||
@@ -5,16 +5,18 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.containment; | 6 | package tools.refinery.store.reasoning.translator.containment; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
9 | import tools.refinery.logic.dnf.RelationalQuery; | ||
10 | import tools.refinery.logic.literal.Connectivity; | ||
11 | import tools.refinery.logic.literal.Literal; | ||
12 | import tools.refinery.logic.literal.RepresentativeElectionLiteral; | ||
13 | import tools.refinery.logic.term.Variable; | ||
14 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; | ||
15 | import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; | ||
8 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; | 16 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; |
9 | import tools.refinery.store.dse.transition.Rule; | 17 | import tools.refinery.store.dse.transition.Rule; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 18 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.model.ModelStoreConfiguration; | 19 | import tools.refinery.store.model.ModelStoreConfiguration; |
12 | import tools.refinery.store.query.dnf.Query; | ||
13 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
14 | import tools.refinery.store.query.literal.Connectivity; | ||
15 | import tools.refinery.store.query.literal.Literal; | ||
16 | import tools.refinery.store.query.literal.RepresentativeElectionLiteral; | ||
17 | import tools.refinery.store.query.term.Variable; | ||
18 | import tools.refinery.store.query.view.AnySymbolView; | 20 | import tools.refinery.store.query.view.AnySymbolView; |
19 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 21 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
20 | import tools.refinery.store.reasoning.literal.Concreteness; | 22 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -28,17 +30,15 @@ import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslat | |||
28 | import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; | 30 | import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; |
29 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; | 31 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; |
30 | import tools.refinery.store.representation.Symbol; | 32 | import tools.refinery.store.representation.Symbol; |
31 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | ||
32 | import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; | ||
33 | 33 | ||
34 | import java.util.ArrayList; | 34 | import java.util.ArrayList; |
35 | import java.util.List; | 35 | import java.util.List; |
36 | import java.util.Map; | 36 | import java.util.Map; |
37 | 37 | ||
38 | import static tools.refinery.store.query.literal.Literals.check; | 38 | import static tools.refinery.logic.term.int_.IntTerms.constant; |
39 | import static tools.refinery.store.query.literal.Literals.not; | 39 | import static tools.refinery.logic.term.int_.IntTerms.less; |
40 | import static tools.refinery.store.query.term.int_.IntTerms.constant; | 40 | import static tools.refinery.logic.literal.Literals.check; |
41 | import static tools.refinery.store.query.term.int_.IntTerms.less; | 41 | import static tools.refinery.logic.literal.Literals.not; |
42 | import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL; | 42 | import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL; |
43 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; | 43 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; |
44 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.focus; | 44 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.focus; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java index e44fcffd..ef007efc 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java | |||
@@ -12,7 +12,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; | |||
12 | import tools.refinery.store.reasoning.representation.PartialRelation; | 12 | import tools.refinery.store.reasoning.representation.PartialRelation; |
13 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 13 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
14 | import tools.refinery.store.representation.Symbol; | 14 | import tools.refinery.store.representation.Symbol; |
15 | import tools.refinery.store.representation.TruthValue; | 15 | import tools.refinery.logic.term.truthvalue.TruthValue; |
16 | import tools.refinery.store.tuple.Tuple; | 16 | import tools.refinery.store.tuple.Tuple; |
17 | 17 | ||
18 | import java.util.ArrayList; | 18 | import java.util.ArrayList; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java index a7196a1c..3fe63339 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java | |||
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRe | |||
11 | import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; | 11 | import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; |
12 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 12 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
13 | import tools.refinery.store.representation.Symbol; | 13 | import tools.refinery.store.representation.Symbol; |
14 | import tools.refinery.store.representation.TruthValue; | 14 | import tools.refinery.logic.term.truthvalue.TruthValue; |
15 | import tools.refinery.store.tuple.Tuple; | 15 | import tools.refinery.store.tuple.Tuple; |
16 | 16 | ||
17 | import java.util.LinkedHashMap; | 17 | import java.util.LinkedHashMap; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java index 8a757ed2..77c7aaf4 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.reasoning.translator.containment; | 6 | package tools.refinery.store.reasoning.translator.containment; |
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.representation.TruthValue; | 9 | import tools.refinery.logic.term.truthvalue.TruthValue; |
10 | 10 | ||
11 | import java.util.Objects; | 11 | import java.util.Objects; |
12 | import java.util.Set; | 12 | import java.util.Set; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java index c4a2f2b3..26449df5 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java | |||
@@ -5,22 +5,22 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.crossreference; | 6 | package tools.refinery.store.reasoning.translator.crossreference; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.Query; | 8 | import tools.refinery.logic.dnf.Query; |
9 | import tools.refinery.store.query.dnf.RelationalQuery; | 9 | import tools.refinery.logic.dnf.RelationalQuery; |
10 | import tools.refinery.store.query.literal.Literal; | 10 | import tools.refinery.logic.literal.Literal; |
11 | import tools.refinery.store.query.term.NodeVariable; | 11 | import tools.refinery.logic.term.NodeVariable; |
12 | import tools.refinery.store.query.term.Variable; | 12 | import tools.refinery.logic.term.Variable; |
13 | import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; | ||
13 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; | 14 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; |
14 | import tools.refinery.store.reasoning.representation.PartialRelation; | 15 | import tools.refinery.store.reasoning.representation.PartialRelation; |
15 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 16 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
16 | import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; | ||
17 | 17 | ||
18 | import java.util.ArrayList; | 18 | import java.util.ArrayList; |
19 | import java.util.List; | 19 | import java.util.List; |
20 | 20 | ||
21 | import static tools.refinery.store.query.literal.Literals.check; | 21 | import static tools.refinery.logic.literal.Literals.check; |
22 | import static tools.refinery.store.query.term.int_.IntTerms.constant; | 22 | import static tools.refinery.logic.term.int_.IntTerms.constant; |
23 | import static tools.refinery.store.query.term.int_.IntTerms.less; | 23 | import static tools.refinery.logic.term.int_.IntTerms.less; |
24 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; | 24 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; |
25 | 25 | ||
26 | class CrossReferenceUtils { | 26 | class CrossReferenceUtils { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java index 7241b032..982f835f 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java | |||
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.crossreference; | |||
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
10 | import tools.refinery.store.representation.TruthValue; | 10 | import tools.refinery.logic.term.truthvalue.TruthValue; |
11 | 11 | ||
12 | public record DirectedCrossReferenceInfo(PartialRelation sourceType, Multiplicity sourceMultiplicity, | 12 | public record DirectedCrossReferenceInfo(PartialRelation sourceType, Multiplicity sourceMultiplicity, |
13 | PartialRelation targetType, Multiplicity targetMultiplicity, | 13 | PartialRelation targetType, Multiplicity targetMultiplicity, |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java index 9347e91e..7cb16a28 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java | |||
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer; | |||
11 | import tools.refinery.store.reasoning.representation.PartialRelation; | 11 | import tools.refinery.store.reasoning.representation.PartialRelation; |
12 | import tools.refinery.store.reasoning.seed.ModelSeed; | 12 | import tools.refinery.store.reasoning.seed.ModelSeed; |
13 | import tools.refinery.store.representation.Symbol; | 13 | import tools.refinery.store.representation.Symbol; |
14 | import tools.refinery.store.representation.TruthValue; | 14 | import tools.refinery.logic.term.truthvalue.TruthValue; |
15 | import tools.refinery.store.tuple.Tuple; | 15 | import tools.refinery.store.tuple.Tuple; |
16 | 16 | ||
17 | class DirectedCrossReferenceInitializer implements PartialModelInitializer { | 17 | class DirectedCrossReferenceInitializer implements PartialModelInitializer { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java index 2e804b44..75dd5dad 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java | |||
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; | |||
11 | import tools.refinery.store.reasoning.representation.PartialRelation; | 11 | import tools.refinery.store.reasoning.representation.PartialRelation; |
12 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 12 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
13 | import tools.refinery.store.representation.Symbol; | 13 | import tools.refinery.store.representation.Symbol; |
14 | import tools.refinery.store.representation.TruthValue; | 14 | import tools.refinery.logic.term.truthvalue.TruthValue; |
15 | import tools.refinery.store.tuple.Tuple; | 15 | import tools.refinery.store.tuple.Tuple; |
16 | 16 | ||
17 | class DirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> { | 17 | class DirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java index fc7477f1..5bf1f5ab 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java | |||
@@ -5,12 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.crossreference; | 6 | package tools.refinery.store.reasoning.translator.crossreference; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
9 | import tools.refinery.logic.dnf.RelationalQuery; | ||
10 | import tools.refinery.logic.term.truthvalue.TruthValue; | ||
8 | import tools.refinery.store.dse.propagation.PropagationBuilder; | 11 | import tools.refinery.store.dse.propagation.PropagationBuilder; |
9 | import tools.refinery.store.dse.transition.Rule; | 12 | import tools.refinery.store.dse.transition.Rule; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 13 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.model.ModelStoreConfiguration; | 14 | import tools.refinery.store.model.ModelStoreConfiguration; |
12 | import tools.refinery.store.query.dnf.Query; | ||
13 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
14 | import tools.refinery.store.query.view.ForbiddenView; | 15 | import tools.refinery.store.query.view.ForbiddenView; |
15 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 16 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
16 | import tools.refinery.store.reasoning.literal.Concreteness; | 17 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -21,9 +22,8 @@ import tools.refinery.store.reasoning.translator.TranslationException; | |||
21 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; | 22 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; |
22 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 23 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
23 | import tools.refinery.store.representation.Symbol; | 24 | import tools.refinery.store.representation.Symbol; |
24 | import tools.refinery.store.representation.TruthValue; | ||
25 | 25 | ||
26 | import static tools.refinery.store.query.literal.Literals.not; | 26 | import static tools.refinery.logic.literal.Literals.not; |
27 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; | 27 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; |
28 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; | 28 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; |
29 | import static tools.refinery.store.reasoning.literal.PartialLiterals.*; | 29 | import static tools.refinery.store.reasoning.literal.PartialLiterals.*; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java index 34e9032a..560eb04a 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java | |||
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.crossreference; | |||
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
10 | import tools.refinery.store.representation.TruthValue; | 10 | import tools.refinery.logic.term.truthvalue.TruthValue; |
11 | 11 | ||
12 | public record UndirectedCrossReferenceInfo(PartialRelation type, Multiplicity multiplicity, TruthValue defaultValue) { | 12 | public record UndirectedCrossReferenceInfo(PartialRelation type, Multiplicity multiplicity, TruthValue defaultValue) { |
13 | public boolean isConstrained() { | 13 | public boolean isConstrained() { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java index 77339aa0..5bb1b967 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java | |||
@@ -13,7 +13,7 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
13 | import tools.refinery.store.reasoning.seed.ModelSeed; | 13 | import tools.refinery.store.reasoning.seed.ModelSeed; |
14 | import tools.refinery.store.reasoning.translator.TranslationException; | 14 | import tools.refinery.store.reasoning.translator.TranslationException; |
15 | import tools.refinery.store.representation.Symbol; | 15 | import tools.refinery.store.representation.Symbol; |
16 | import tools.refinery.store.representation.TruthValue; | 16 | import tools.refinery.logic.term.truthvalue.TruthValue; |
17 | import tools.refinery.store.tuple.Tuple; | 17 | import tools.refinery.store.tuple.Tuple; |
18 | 18 | ||
19 | import java.util.LinkedHashMap; | 19 | import java.util.LinkedHashMap; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java index 43c1462b..54aca80f 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java | |||
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; | |||
11 | import tools.refinery.store.reasoning.representation.PartialRelation; | 11 | import tools.refinery.store.reasoning.representation.PartialRelation; |
12 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 12 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
13 | import tools.refinery.store.representation.Symbol; | 13 | import tools.refinery.store.representation.Symbol; |
14 | import tools.refinery.store.representation.TruthValue; | 14 | import tools.refinery.logic.term.truthvalue.TruthValue; |
15 | import tools.refinery.store.tuple.Tuple; | 15 | import tools.refinery.store.tuple.Tuple; |
16 | 16 | ||
17 | class UndirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> { | 17 | class UndirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java index b76838b3..97c0b800 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java | |||
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.propagation.PropagationBuilder; | |||
9 | import tools.refinery.store.dse.transition.Rule; | 9 | import tools.refinery.store.dse.transition.Rule; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 10 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.model.ModelStoreConfiguration; | 11 | import tools.refinery.store.model.ModelStoreConfiguration; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.view.ForbiddenView; | 13 | import tools.refinery.store.query.view.ForbiddenView; |
14 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 14 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
15 | import tools.refinery.store.reasoning.literal.Concreteness; | 15 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -19,9 +19,9 @@ import tools.refinery.store.reasoning.translator.PartialRelationTranslator; | |||
19 | import tools.refinery.store.reasoning.translator.TranslationException; | 19 | import tools.refinery.store.reasoning.translator.TranslationException; |
20 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; | 20 | import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; |
21 | import tools.refinery.store.representation.Symbol; | 21 | import tools.refinery.store.representation.Symbol; |
22 | import tools.refinery.store.representation.TruthValue; | 22 | import tools.refinery.logic.term.truthvalue.TruthValue; |
23 | 23 | ||
24 | import static tools.refinery.store.query.literal.Literals.not; | 24 | import static tools.refinery.logic.literal.Literals.not; |
25 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; | 25 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; |
26 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; | 26 | import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; |
27 | import static tools.refinery.store.reasoning.literal.PartialLiterals.*; | 27 | import static tools.refinery.store.reasoning.literal.PartialLiterals.*; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java index 9d7fc9c3..47a2e95f 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java | |||
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.metamodel; | |||
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 9 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
10 | import tools.refinery.store.representation.TruthValue; | 10 | import tools.refinery.logic.term.truthvalue.TruthValue; |
11 | 11 | ||
12 | public record ReferenceInfo(boolean containment, PartialRelation sourceType, Multiplicity multiplicity, | 12 | public record ReferenceInfo(boolean containment, PartialRelation sourceType, Multiplicity multiplicity, |
13 | PartialRelation targetType, PartialRelation opposite, TruthValue defaultValue) { | 13 | PartialRelation targetType, PartialRelation opposite, TruthValue defaultValue) { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java index 43d01503..39240d6b 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java | |||
@@ -11,8 +11,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
11 | import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; | 11 | import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; |
12 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; | 12 | import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; |
13 | import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity; | 13 | import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity; |
14 | import tools.refinery.store.representation.TruthValue; | 14 | import tools.refinery.logic.term.truthvalue.TruthValue; |
15 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 15 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
16 | 16 | ||
17 | public final class ReferenceInfoBuilder { | 17 | public final class ReferenceInfoBuilder { |
18 | private boolean containment; | 18 | private boolean containment; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java index d8db4ec4..0b89ec58 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java | |||
@@ -10,9 +10,9 @@ import tools.refinery.store.reasoning.ReasoningAdapter; | |||
10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; | 10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; |
11 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 11 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
12 | import tools.refinery.store.representation.Symbol; | 12 | import tools.refinery.store.representation.Symbol; |
13 | import tools.refinery.store.representation.TruthValue; | 13 | import tools.refinery.logic.term.truthvalue.TruthValue; |
14 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 14 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
15 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 15 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
16 | import tools.refinery.store.tuple.Tuple; | 16 | import tools.refinery.store.tuple.Tuple; |
17 | 17 | ||
18 | public class EqualsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { | 18 | public class EqualsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java index 61b9488c..d4852f91 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java | |||
@@ -5,25 +5,25 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiobject; | 6 | package tools.refinery.store.reasoning.translator.multiobject; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.Query; | 8 | import tools.refinery.logic.dnf.Query; |
9 | import tools.refinery.store.query.dnf.RelationalQuery; | 9 | import tools.refinery.logic.dnf.RelationalQuery; |
10 | import tools.refinery.store.query.literal.AbstractCallLiteral; | 10 | import tools.refinery.logic.literal.AbstractCallLiteral; |
11 | import tools.refinery.store.query.literal.CallLiteral; | 11 | import tools.refinery.logic.literal.CallLiteral; |
12 | import tools.refinery.store.query.literal.Literal; | 12 | import tools.refinery.logic.literal.Literal; |
13 | import tools.refinery.store.query.term.Variable; | 13 | import tools.refinery.logic.term.Variable; |
14 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; | ||
15 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; | ||
14 | import tools.refinery.store.query.view.AnySymbolView; | 16 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter; | 17 | import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter; |
16 | import tools.refinery.store.reasoning.literal.Concreteness; | 18 | import tools.refinery.store.reasoning.literal.Concreteness; |
17 | import tools.refinery.store.reasoning.literal.Modality; | 19 | import tools.refinery.store.reasoning.literal.Modality; |
18 | import tools.refinery.store.representation.cardinality.UpperCardinalities; | ||
19 | import tools.refinery.store.representation.cardinality.UpperCardinality; | ||
20 | 20 | ||
21 | import java.util.List; | 21 | import java.util.List; |
22 | import java.util.Set; | 22 | import java.util.Set; |
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.uppercardinality.UpperCardinalityTerms.constant; | 25 | import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.constant; |
26 | import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.lessEq; | 26 | import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.lessEq; |
27 | 27 | ||
28 | class EqualsRelationRewriter extends QueryBasedRelationRewriter { | 28 | class EqualsRelationRewriter extends QueryBasedRelationRewriter { |
29 | private EqualsRelationRewriter(RelationalQuery may, RelationalQuery must) { | 29 | private EqualsRelationRewriter(RelationalQuery may, RelationalQuery must) { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java index f134fe92..3908fedb 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java | |||
@@ -10,9 +10,9 @@ import tools.refinery.store.reasoning.ReasoningAdapter; | |||
10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; | 10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; |
11 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 11 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
12 | import tools.refinery.store.representation.Symbol; | 12 | import tools.refinery.store.representation.Symbol; |
13 | import tools.refinery.store.representation.TruthValue; | 13 | import tools.refinery.logic.term.truthvalue.TruthValue; |
14 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 14 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
15 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 15 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
16 | import tools.refinery.store.tuple.Tuple; | 16 | import tools.refinery.store.tuple.Tuple; |
17 | 17 | ||
18 | public class ExistsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { | 18 | public class ExistsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java index 9873888c..5691b9e3 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java | |||
@@ -5,10 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiobject; | 6 | package tools.refinery.store.reasoning.translator.multiobject; |
7 | 7 | ||
8 | import tools.refinery.store.query.term.Parameter; | 8 | import tools.refinery.logic.term.Parameter; |
9 | import tools.refinery.store.query.view.AbstractFunctionView; | 9 | import tools.refinery.store.query.view.AbstractFunctionView; |
10 | import tools.refinery.store.representation.Symbol; | 10 | import tools.refinery.store.representation.Symbol; |
11 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 11 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
12 | 12 | ||
13 | class LowerCardinalityView extends AbstractFunctionView<CardinalityInterval> { | 13 | class LowerCardinalityView extends AbstractFunctionView<CardinalityInterval> { |
14 | public LowerCardinalityView(Symbol<CardinalityInterval> symbol) { | 14 | public LowerCardinalityView(Symbol<CardinalityInterval> symbol) { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java index 89918155..694a800b 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java | |||
@@ -12,9 +12,9 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer; | |||
12 | import tools.refinery.store.reasoning.seed.ModelSeed; | 12 | import tools.refinery.store.reasoning.seed.ModelSeed; |
13 | import tools.refinery.store.reasoning.translator.TranslationException; | 13 | import tools.refinery.store.reasoning.translator.TranslationException; |
14 | import tools.refinery.store.representation.Symbol; | 14 | import tools.refinery.store.representation.Symbol; |
15 | import tools.refinery.store.representation.TruthValue; | 15 | import tools.refinery.logic.term.truthvalue.TruthValue; |
16 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 16 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
17 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 17 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
18 | import tools.refinery.store.tuple.Tuple; | 18 | import tools.refinery.store.tuple.Tuple; |
19 | 19 | ||
20 | import java.util.Arrays; | 20 | import java.util.Arrays; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java index e48934d8..147ae486 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java | |||
@@ -9,8 +9,8 @@ import tools.refinery.store.model.Interpretation; | |||
9 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
10 | import tools.refinery.store.reasoning.refinement.StorageRefiner; | 10 | import tools.refinery.store.reasoning.refinement.StorageRefiner; |
11 | import tools.refinery.store.representation.Symbol; | 11 | import tools.refinery.store.representation.Symbol; |
12 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 12 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
13 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 13 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
15 | 15 | ||
16 | class MultiObjectStorageRefiner implements StorageRefiner { | 16 | class MultiObjectStorageRefiner implements StorageRefiner { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java index 97fda9d5..be15b6d7 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java | |||
@@ -5,17 +5,21 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiobject; | 6 | package tools.refinery.store.reasoning.translator.multiobject; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
9 | import tools.refinery.logic.literal.Literals; | ||
10 | import tools.refinery.logic.term.Variable; | ||
11 | import tools.refinery.logic.term.cardinalityinterval.CardinalityDomain; | ||
12 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; | ||
13 | import tools.refinery.logic.term.int_.IntTerms; | ||
14 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; | ||
15 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; | ||
16 | import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; | ||
8 | import tools.refinery.store.dse.propagation.PropagationBuilder; | 17 | import tools.refinery.store.dse.propagation.PropagationBuilder; |
9 | import tools.refinery.store.dse.transition.Rule; | 18 | import tools.refinery.store.dse.transition.Rule; |
10 | import tools.refinery.store.dse.transition.objectives.Criteria; | 19 | import tools.refinery.store.dse.transition.objectives.Criteria; |
11 | import tools.refinery.store.dse.transition.objectives.Objectives; | 20 | import tools.refinery.store.dse.transition.objectives.Objectives; |
12 | import tools.refinery.store.model.ModelStoreBuilder; | 21 | import tools.refinery.store.model.ModelStoreBuilder; |
13 | import tools.refinery.store.model.ModelStoreConfiguration; | 22 | import tools.refinery.store.model.ModelStoreConfiguration; |
14 | import tools.refinery.store.query.dnf.Query; | ||
15 | import tools.refinery.store.query.literal.Literals; | ||
16 | import tools.refinery.store.query.term.Variable; | ||
17 | import tools.refinery.store.query.term.int_.IntTerms; | ||
18 | import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms; | ||
19 | import tools.refinery.store.query.view.AnySymbolView; | 23 | import tools.refinery.store.query.view.AnySymbolView; |
20 | import tools.refinery.store.reasoning.ReasoningAdapter; | 24 | import tools.refinery.store.reasoning.ReasoningAdapter; |
21 | import tools.refinery.store.reasoning.ReasoningBuilder; | 25 | import tools.refinery.store.reasoning.ReasoningBuilder; |
@@ -24,15 +28,11 @@ import tools.refinery.store.reasoning.representation.PartialFunction; | |||
24 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; | 28 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; |
25 | import tools.refinery.store.reasoning.translator.RoundingMode; | 29 | import tools.refinery.store.reasoning.translator.RoundingMode; |
26 | import tools.refinery.store.representation.Symbol; | 30 | import tools.refinery.store.representation.Symbol; |
27 | import tools.refinery.store.representation.cardinality.CardinalityDomain; | ||
28 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | ||
29 | import tools.refinery.store.representation.cardinality.UpperCardinalities; | ||
30 | import tools.refinery.store.representation.cardinality.UpperCardinality; | ||
31 | 31 | ||
32 | import java.util.List; | 32 | import java.util.List; |
33 | 33 | ||
34 | import static tools.refinery.store.query.literal.Literals.check; | 34 | import static tools.refinery.logic.literal.Literals.check; |
35 | import static tools.refinery.store.query.term.int_.IntTerms.*; | 35 | import static tools.refinery.logic.term.int_.IntTerms.*; |
36 | 36 | ||
37 | public class MultiObjectTranslator implements ModelStoreConfiguration { | 37 | public class MultiObjectTranslator implements ModelStoreConfiguration { |
38 | public static final Symbol<CardinalityInterval> COUNT_STORAGE = Symbol.of("COUNT", 1, CardinalityInterval.class, | 38 | public static final Symbol<CardinalityInterval> COUNT_STORAGE = Symbol.of("COUNT", 1, CardinalityInterval.class, |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java index 498bcd83..d81274b3 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java | |||
@@ -7,8 +7,8 @@ package tools.refinery.store.reasoning.translator.multiobject; | |||
7 | 7 | ||
8 | import tools.refinery.store.query.view.TuplePreservingView; | 8 | import tools.refinery.store.query.view.TuplePreservingView; |
9 | import tools.refinery.store.representation.Symbol; | 9 | import tools.refinery.store.representation.Symbol; |
10 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 10 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
11 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 11 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
12 | import tools.refinery.store.tuple.Tuple; | 12 | import tools.refinery.store.tuple.Tuple; |
13 | 13 | ||
14 | class MultiView extends TuplePreservingView<CardinalityInterval> { | 14 | class MultiView extends TuplePreservingView<CardinalityInterval> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java index 6be6ae1b..5797c4b0 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiobject; | 6 | package tools.refinery.store.reasoning.translator.multiobject; |
7 | 7 | ||
8 | import tools.refinery.store.query.term.Parameter; | 8 | import tools.refinery.logic.term.Parameter; |
9 | import tools.refinery.store.query.view.AbstractFunctionView; | 9 | import tools.refinery.store.query.view.AbstractFunctionView; |
10 | import tools.refinery.store.representation.Symbol; | 10 | import tools.refinery.store.representation.Symbol; |
11 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 11 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
12 | import tools.refinery.store.representation.cardinality.UpperCardinality; | 12 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; |
13 | 13 | ||
14 | class UpperCardinalityView extends AbstractFunctionView<CardinalityInterval> { | 14 | class UpperCardinalityView extends AbstractFunctionView<CardinalityInterval> { |
15 | public UpperCardinalityView(Symbol<CardinalityInterval> symbol) { | 15 | public UpperCardinalityView(Symbol<CardinalityInterval> symbol) { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java index 9db9cc96..c327aac8 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java | |||
@@ -7,9 +7,9 @@ package tools.refinery.store.reasoning.translator.multiplicity; | |||
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.reasoning.translator.TranslationException; | 9 | import tools.refinery.store.reasoning.translator.TranslationException; |
10 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 10 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
11 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 11 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
12 | import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval; | 12 | import tools.refinery.logic.term.cardinalityinterval.NonEmptyCardinalityInterval; |
13 | 13 | ||
14 | public record ConstrainedMultiplicity(NonEmptyCardinalityInterval multiplicity, PartialRelation errorSymbol) | 14 | public record ConstrainedMultiplicity(NonEmptyCardinalityInterval multiplicity, PartialRelation errorSymbol) |
15 | implements Multiplicity { | 15 | implements Multiplicity { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java index a506d802..0ca6eac2 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java | |||
@@ -5,31 +5,26 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiplicity; | 6 | package tools.refinery.store.reasoning.translator.multiplicity; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
9 | import tools.refinery.logic.term.Variable; | ||
10 | import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; | ||
11 | import tools.refinery.logic.term.uppercardinality.UpperCardinalities; | ||
12 | import tools.refinery.logic.term.uppercardinality.UpperCardinality; | ||
13 | import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; | ||
8 | import tools.refinery.store.dse.transition.objectives.Objectives; | 14 | import tools.refinery.store.dse.transition.objectives.Objectives; |
9 | import tools.refinery.store.model.ModelStoreBuilder; | 15 | import tools.refinery.store.model.ModelStoreBuilder; |
10 | import tools.refinery.store.model.ModelStoreConfiguration; | 16 | import tools.refinery.store.model.ModelStoreConfiguration; |
11 | import tools.refinery.store.query.dnf.Query; | ||
12 | import tools.refinery.store.query.term.Variable; | ||
13 | import tools.refinery.store.query.term.int_.IntTerms; | ||
14 | import tools.refinery.store.reasoning.ReasoningAdapter; | 17 | import tools.refinery.store.reasoning.ReasoningAdapter; |
15 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 18 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
16 | import tools.refinery.store.reasoning.literal.*; | 19 | import tools.refinery.store.reasoning.literal.*; |
17 | import tools.refinery.store.reasoning.representation.PartialRelation; | 20 | import tools.refinery.store.reasoning.representation.PartialRelation; |
18 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; | 21 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; |
19 | import tools.refinery.store.reasoning.translator.TranslationException; | 22 | import tools.refinery.store.reasoning.translator.TranslationException; |
20 | import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; | ||
21 | import tools.refinery.store.representation.cardinality.UpperCardinalities; | ||
22 | import tools.refinery.store.representation.cardinality.UpperCardinality; | ||
23 | 23 | ||
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.INT_SUM; | 27 | import static tools.refinery.logic.term.int_.IntTerms.*; |
28 | import static tools.refinery.store.query.term.int_.IntTerms.constant; | ||
29 | import static tools.refinery.store.query.term.int_.IntTerms.greater; | ||
30 | import static tools.refinery.store.query.term.int_.IntTerms.sub; | ||
31 | import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant; | ||
32 | import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.less; | ||
33 | import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; | 28 | import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; |
34 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; | 29 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; |
35 | 30 | ||
@@ -81,17 +76,18 @@ public class InvalidMultiplicityErrorTranslator implements ModelStoreConfigurati | |||
81 | mustBuilder.clause(UpperCardinality.class, existingContents -> List.of( | 76 | mustBuilder.clause(UpperCardinality.class, existingContents -> List.of( |
82 | must(nodeType.call(node)), | 77 | must(nodeType.call(node)), |
83 | new CountUpperBoundLiteral(existingContents, linkType, arguments), | 78 | new CountUpperBoundLiteral(existingContents, linkType, arguments), |
84 | check(less(existingContents, constant(lowerBoundCardinality))) | 79 | check(UpperCardinalityTerms.less(existingContents, |
80 | UpperCardinalityTerms.constant(lowerBoundCardinality))) | ||
85 | )); | 81 | )); |
86 | candidateMayBuilder.clause(Integer.class, existingContents -> List.of( | 82 | candidateMayBuilder.clause(Integer.class, existingContents -> List.of( |
87 | candidateMust(nodeType.call(node)), | 83 | candidateMust(nodeType.call(node)), |
88 | new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments), | 84 | new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments), |
89 | check(IntTerms.less(existingContents, constant(lowerBound))) | 85 | check(less(existingContents, constant(lowerBound))) |
90 | )); | 86 | )); |
91 | candidateMustBuilder.clause(Integer.class, existingContents -> List.of( | 87 | candidateMustBuilder.clause(Integer.class, existingContents -> List.of( |
92 | candidateMust(nodeType.call(node)), | 88 | candidateMust(nodeType.call(node)), |
93 | new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments), | 89 | new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments), |
94 | check(IntTerms.less(existingContents, constant(lowerBound))) | 90 | check(less(existingContents, constant(lowerBound))) |
95 | )); | 91 | )); |
96 | missingBuilder.clause(Integer.class, existingContents -> List.of( | 92 | missingBuilder.clause(Integer.class, existingContents -> List.of( |
97 | candidateMust(nodeType.call(node)), | 93 | candidateMust(nodeType.call(node)), |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java index d1d6dd1e..d6035781 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiplicity; | 6 | package tools.refinery.store.reasoning.translator.multiplicity; |
7 | 7 | ||
8 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 8 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
9 | 9 | ||
10 | public sealed interface Multiplicity permits ConstrainedMultiplicity, UnconstrainedMultiplicity { | 10 | public sealed interface Multiplicity permits ConstrainedMultiplicity, UnconstrainedMultiplicity { |
11 | CardinalityInterval multiplicity(); | 11 | CardinalityInterval multiplicity(); |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java index 2159b88c..fb669a79 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java | |||
@@ -5,8 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.multiplicity; | 6 | package tools.refinery.store.reasoning.translator.multiplicity; |
7 | 7 | ||
8 | import tools.refinery.store.representation.cardinality.CardinalityInterval; | 8 | import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; |
9 | import tools.refinery.store.representation.cardinality.CardinalityIntervals; | 9 | import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; |
10 | 10 | ||
11 | // Singleton implementation, because there is only a single complete interval. | 11 | // Singleton implementation, because there is only a single complete interval. |
12 | @SuppressWarnings("squid:S6548") | 12 | @SuppressWarnings("squid:S6548") |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java index 6e15a628..29abed7a 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.opposite; | 6 | package tools.refinery.store.reasoning.translator.opposite; |
7 | 7 | ||
8 | import tools.refinery.logic.literal.AbstractCallLiteral; | ||
9 | import tools.refinery.logic.literal.Literal; | ||
10 | import tools.refinery.logic.term.Variable; | ||
8 | import tools.refinery.store.model.ModelStoreBuilder; | 11 | import tools.refinery.store.model.ModelStoreBuilder; |
9 | import tools.refinery.store.model.ModelStoreConfiguration; | 12 | import tools.refinery.store.model.ModelStoreConfiguration; |
10 | import tools.refinery.store.query.literal.AbstractCallLiteral; | ||
11 | import tools.refinery.store.query.literal.Literal; | ||
12 | import tools.refinery.store.query.term.Variable; | ||
13 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; | 13 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; |
14 | import tools.refinery.store.reasoning.literal.Concreteness; | 14 | import tools.refinery.store.reasoning.literal.Concreteness; |
15 | import tools.refinery.store.reasoning.literal.ModalConstraint; | 15 | import tools.refinery.store.reasoning.literal.ModalConstraint; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java index b401118e..010ce977 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java | |||
@@ -5,13 +5,14 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.predicate; | 6 | package tools.refinery.store.reasoning.translator.predicate; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
9 | import tools.refinery.logic.dnf.RelationalQuery; | ||
10 | import tools.refinery.logic.literal.Literal; | ||
11 | import tools.refinery.logic.term.NodeVariable; | ||
12 | import tools.refinery.logic.term.Variable; | ||
13 | import tools.refinery.logic.term.truthvalue.TruthValue; | ||
8 | import tools.refinery.store.model.ModelStoreBuilder; | 14 | import tools.refinery.store.model.ModelStoreBuilder; |
9 | import tools.refinery.store.model.ModelStoreConfiguration; | 15 | import tools.refinery.store.model.ModelStoreConfiguration; |
10 | import tools.refinery.store.query.dnf.Query; | ||
11 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
12 | import tools.refinery.store.query.literal.Literal; | ||
13 | import tools.refinery.store.query.term.NodeVariable; | ||
14 | import tools.refinery.store.query.term.Variable; | ||
15 | import tools.refinery.store.query.view.ForbiddenView; | 16 | import tools.refinery.store.query.view.ForbiddenView; |
16 | import tools.refinery.store.query.view.MayView; | 17 | import tools.refinery.store.query.view.MayView; |
17 | import tools.refinery.store.query.view.MustView; | 18 | import tools.refinery.store.query.view.MustView; |
@@ -19,9 +20,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
19 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; | 20 | import tools.refinery.store.reasoning.translator.PartialRelationTranslator; |
20 | import tools.refinery.store.reasoning.translator.TranslationException; | 21 | import tools.refinery.store.reasoning.translator.TranslationException; |
21 | import tools.refinery.store.representation.Symbol; | 22 | import tools.refinery.store.representation.Symbol; |
22 | import tools.refinery.store.representation.TruthValue; | ||
23 | 23 | ||
24 | import static tools.refinery.store.query.literal.Literals.not; | 24 | import static tools.refinery.logic.literal.Literals.not; |
25 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; | 25 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; |
26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; | 26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.must; |
27 | 27 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java index 45dc5bd2..50873993 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.proxy; | 6 | package tools.refinery.store.reasoning.translator.proxy; |
7 | 7 | ||
8 | import tools.refinery.logic.literal.AbstractCallLiteral; | ||
9 | import tools.refinery.logic.literal.Literal; | ||
10 | import tools.refinery.logic.term.Variable; | ||
8 | import tools.refinery.store.model.ModelStoreBuilder; | 11 | import tools.refinery.store.model.ModelStoreBuilder; |
9 | import tools.refinery.store.model.ModelStoreConfiguration; | 12 | import tools.refinery.store.model.ModelStoreConfiguration; |
10 | import tools.refinery.store.query.literal.AbstractCallLiteral; | ||
11 | import tools.refinery.store.query.literal.Literal; | ||
12 | import tools.refinery.store.query.term.Variable; | ||
13 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; | 13 | import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; |
14 | import tools.refinery.store.reasoning.literal.Concreteness; | 14 | import tools.refinery.store.reasoning.literal.Concreteness; |
15 | import tools.refinery.store.reasoning.literal.ModalConstraint; | 15 | import tools.refinery.store.reasoning.literal.ModalConstraint; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java index 40a7b3fa..257b9136 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java | |||
@@ -10,7 +10,7 @@ import tools.refinery.store.reasoning.ReasoningAdapter; | |||
10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; | 10 | import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; |
11 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 11 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
12 | import tools.refinery.store.representation.Symbol; | 12 | import tools.refinery.store.representation.Symbol; |
13 | import tools.refinery.store.representation.TruthValue; | 13 | import tools.refinery.logic.term.truthvalue.TruthValue; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
15 | 15 | ||
16 | class InferredTypeRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { | 16 | class InferredTypeRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> { |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java index ebe0d1b9..324e2b9e 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.reasoning.translator.typehierarchy; | 6 | package tools.refinery.store.reasoning.translator.typehierarchy; |
7 | 7 | ||
8 | import tools.refinery.store.reasoning.representation.PartialRelation; | 8 | import tools.refinery.store.reasoning.representation.PartialRelation; |
9 | import tools.refinery.store.representation.TruthValue; | 9 | import tools.refinery.logic.term.truthvalue.TruthValue; |
10 | 10 | ||
11 | import java.util.*; | 11 | import java.util.*; |
12 | 12 | ||
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java index 233e43f0..aa76d927 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java | |||
@@ -10,7 +10,7 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer; | |||
10 | import tools.refinery.store.reasoning.representation.PartialRelation; | 10 | import tools.refinery.store.reasoning.representation.PartialRelation; |
11 | import tools.refinery.store.reasoning.seed.ModelSeed; | 11 | import tools.refinery.store.reasoning.seed.ModelSeed; |
12 | import tools.refinery.store.representation.Symbol; | 12 | import tools.refinery.store.representation.Symbol; |
13 | import tools.refinery.store.representation.TruthValue; | 13 | import tools.refinery.logic.term.truthvalue.TruthValue; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
15 | 15 | ||
16 | import java.util.Arrays; | 16 | import java.util.Arrays; |
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java index 37ea1448..700bbe88 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.translator.typehierarchy; | 6 | package tools.refinery.store.reasoning.translator.typehierarchy; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Query; | ||
8 | import tools.refinery.store.dse.transition.Rule; | 9 | import tools.refinery.store.dse.transition.Rule; |
9 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 10 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 11 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.model.ModelStoreConfiguration; | 12 | import tools.refinery.store.model.ModelStoreConfiguration; |
12 | import tools.refinery.store.query.dnf.Query; | ||
13 | import tools.refinery.store.reasoning.ReasoningBuilder; | 13 | import tools.refinery.store.reasoning.ReasoningBuilder; |
14 | import tools.refinery.store.reasoning.actions.PartialActionLiterals; | 14 | import tools.refinery.store.reasoning.actions.PartialActionLiterals; |
15 | import tools.refinery.store.reasoning.literal.PartialLiterals; | 15 | import tools.refinery.store.reasoning.literal.PartialLiterals; |
@@ -21,7 +21,7 @@ import tools.refinery.store.representation.Symbol; | |||
21 | 21 | ||
22 | import java.util.ArrayList; | 22 | import java.util.ArrayList; |
23 | 23 | ||
24 | import static tools.refinery.store.query.literal.Literals.not; | 24 | import static tools.refinery.logic.literal.Literals.not; |
25 | import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; | 25 | import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; |
26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; | 26 | import static tools.refinery.store.reasoning.literal.PartialLiterals.may; |
27 | 27 | ||