From 16a9b534adec2c53b50f92a43c1623918b1c59c0 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 7 Mar 2024 22:10:42 +0100 Subject: refactor: move terms and DNF into logic subproject --- subprojects/store-reasoning/build.gradle.kts | 2 +- .../refinery/store/reasoning/ReasoningBuilder.java | 8 +++--- .../reasoning/actions/CleanupActionLiteral.java | 2 +- .../reasoning/actions/FocusActionLiteral.java | 2 +- .../reasoning/actions/MergeActionLiteral.java | 2 +- .../reasoning/actions/PartialActionLiterals.java | 4 +-- .../reasoning/internal/PartialClauseRewriter.java | 30 +++++++++++----------- .../reasoning/internal/PartialQueryRewriter.java | 4 +-- .../reasoning/internal/ReasoningAdapterImpl.java | 4 +-- .../reasoning/internal/ReasoningBuilderImpl.java | 8 +++--- .../interpretation/PartialRelationRewriter.java | 6 ++--- .../QueryBasedRelationInterpretationFactory.java | 4 +-- .../interpretation/QueryBasedRelationRewriter.java | 8 +++--- .../store/reasoning/lifting/ClauseLifter.java | 14 +++++----- .../store/reasoning/lifting/DnfLifter.java | 6 ++--- .../literal/CountCandidateLowerBoundLiteral.java | 14 +++++----- .../literal/CountCandidateUpperBoundLiteral.java | 14 +++++----- .../reasoning/literal/CountLowerBoundLiteral.java | 14 +++++----- .../reasoning/literal/CountUpperBoundLiteral.java | 18 ++++++------- .../store/reasoning/literal/ModalConstraint.java | 10 ++++---- .../refinery/store/reasoning/literal/Modality.java | 3 ++- .../store/reasoning/literal/PartialLiterals.java | 4 +-- .../reasoning/representation/AnyPartialSymbol.java | 2 +- .../reasoning/representation/PartialFunction.java | 2 +- .../reasoning/representation/PartialRelation.java | 12 ++++----- .../reasoning/representation/PartialSymbol.java | 2 +- .../translator/PartialRelationTranslator.java | 16 ++++++------ .../ContainmentHierarchyTranslator.java | 24 ++++++++--------- .../containment/ContainmentLinkRefiner.java | 2 +- .../translator/containment/ContainsRefiner.java | 2 +- .../containment/InferredContainment.java | 2 +- .../crossreference/CrossReferenceUtils.java | 18 ++++++------- .../crossreference/DirectedCrossReferenceInfo.java | 2 +- .../DirectedCrossReferenceInitializer.java | 2 +- .../DirectedCrossReferenceRefiner.java | 2 +- .../DirectedCrossReferenceTranslator.java | 8 +++--- .../UndirectedCrossReferenceInfo.java | 2 +- .../UndirectedCrossReferenceInitializer.java | 2 +- .../UndirectedCrossReferenceRefiner.java | 2 +- .../UndirectedCrossReferenceTranslator.java | 6 ++--- .../translator/metamodel/ReferenceInfo.java | 2 +- .../translator/metamodel/ReferenceInfoBuilder.java | 4 +-- .../translator/multiobject/EqualsRefiner.java | 6 ++--- .../multiobject/EqualsRelationRewriter.java | 22 ++++++++-------- .../translator/multiobject/ExistsRefiner.java | 6 ++--- .../multiobject/LowerCardinalityView.java | 4 +-- .../multiobject/MultiObjectInitializer.java | 6 ++--- .../multiobject/MultiObjectStorageRefiner.java | 4 +-- .../multiobject/MultiObjectTranslator.java | 22 ++++++++-------- .../translator/multiobject/MultiView.java | 4 +-- .../multiobject/UpperCardinalityView.java | 6 ++--- .../multiplicity/ConstrainedMultiplicity.java | 6 ++--- .../InvalidMultiplicityErrorTranslator.java | 28 +++++++++----------- .../translator/multiplicity/Multiplicity.java | 2 +- .../multiplicity/UnconstrainedMultiplicity.java | 4 +-- .../opposite/OppositeRelationTranslator.java | 6 ++--- .../translator/predicate/PredicateTranslator.java | 14 +++++----- .../proxy/PartialRelationTranslatorProxy.java | 6 ++--- .../typehierarchy/InferredTypeRefiner.java | 2 +- .../typehierarchy/TypeAnalysisResult.java | 2 +- .../typehierarchy/TypeHierarchyInitializer.java | 2 +- .../typehierarchy/TypeHierarchyTranslator.java | 4 +-- .../refinery/store/reasoning/PartialModelTest.java | 8 +++--- .../store/reasoning/lifting/DnfLifterTest.java | 25 +++++++++--------- .../ContainmentHierarchyTranslatorTest.java | 4 +-- .../translator/metamodel/MetamodelBuilderTest.java | 2 +- .../translator/metamodel/MetamodelTest.java | 4 +-- .../translator/multiobject/PartialCountTest.java | 14 +++++----- .../typehierarchy/ConcreteSupertypeTest.java | 2 +- .../TypeAnalysisExampleHierarchyTest.java | 2 +- .../TypeHierarchyPartialModelTest.java | 2 +- .../typehierarchy/TypeHierarchyTest.java | 2 +- 72 files changed, 257 insertions(+), 259 deletions(-) (limited to 'subprojects/store-reasoning') diff --git a/subprojects/store-reasoning/build.gradle.kts b/subprojects/store-reasoning/build.gradle.kts index 068256c2..d1d3c2e5 100644 --- a/subprojects/store-reasoning/build.gradle.kts +++ b/subprojects/store-reasoning/build.gradle.kts @@ -10,6 +10,6 @@ plugins { dependencies { api(project(":refinery-store-dse")) - testImplementation(testFixtures(project(":refinery-store-query"))) + testImplementation(testFixtures(project(":refinery-logic"))) testImplementation(project(":refinery-store-query-interpreter")) } 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; import tools.refinery.store.adapter.ModelAdapterBuilder; import tools.refinery.store.dse.transition.objectives.Objective; import tools.refinery.store.model.ModelStore; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.dnf.FunctionalQuery; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.dnf.FunctionalQuery; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.literal.Modality; 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; import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; import tools.refinery.store.dse.transition.actions.BoundActionLiteral; import tools.refinery.store.model.Model; -import tools.refinery.store.query.term.NodeVariable; +import tools.refinery.logic.term.NodeVariable; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.tuple.Tuple; 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; import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; import tools.refinery.store.dse.transition.actions.BoundActionLiteral; import tools.refinery.store.model.Model; -import tools.refinery.store.query.term.NodeVariable; +import tools.refinery.logic.term.NodeVariable; import tools.refinery.store.reasoning.ReasoningAdapter; 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; import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; import tools.refinery.store.dse.transition.actions.BoundActionLiteral; import tools.refinery.store.model.Model; -import tools.refinery.store.query.term.NodeVariable; +import tools.refinery.logic.term.NodeVariable; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.representation.PartialSymbol; 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 @@ */ package tools.refinery.store.reasoning.actions; -import tools.refinery.store.query.term.NodeVariable; +import tools.refinery.logic.term.NodeVariable; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.representation.PartialSymbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import java.util.List; 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 @@ */ package tools.refinery.store.reasoning.internal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.dnf.DnfBuilder; -import tools.refinery.store.query.dnf.DnfClause; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.AbstractCountLiteral; -import tools.refinery.store.query.literal.CallPolarity; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Aggregator; -import tools.refinery.store.query.term.ConstantTerm; -import tools.refinery.store.query.term.Term; -import tools.refinery.store.query.term.Variable; -import tools.refinery.store.query.term.int_.IntTerms; -import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.dnf.DnfBuilder; +import tools.refinery.logic.dnf.DnfClause; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.AbstractCountLiteral; +import tools.refinery.logic.literal.CallPolarity; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Aggregator; +import tools.refinery.logic.term.ConstantTerm; +import tools.refinery.logic.term.Term; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.int_.IntTerms; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.literal.*; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; -import tools.refinery.store.representation.cardinality.UpperCardinalities; import java.util.*; 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 @@ */ package tools.refinery.store.reasoning.internal; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.rewriter.AbstractRecursiveRewriter; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.rewriter.AbstractRecursiveRewriter; import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; import tools.refinery.store.reasoning.lifting.DnfLifter; 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; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; import tools.refinery.store.tuple.Tuple1; 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; import tools.refinery.store.model.ModelStore; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.query.ModelQueryBuilder; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.dnf.FunctionalQuery; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.dnf.FunctionalQuery; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; import tools.refinery.store.reasoning.ReasoningBuilder; import tools.refinery.store.reasoning.interpretation.PartialInterpretation; 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 @@ */ package tools.refinery.store.reasoning.interpretation; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Variable; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.literal.Modality; 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; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.query.ModelQueryAdapter; import tools.refinery.store.query.ModelQueryBuilder; -import tools.refinery.store.query.dnf.Query; +import tools.refinery.logic.dnf.Query; import tools.refinery.store.query.resultset.ResultSet; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.representation.PartialSymbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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 @@ */ package tools.refinery.store.reasoning.interpretation; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Variable; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.literal.Modality; 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 @@ */ package tools.refinery.store.reasoning.lifting; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.dnf.DnfClause; -import tools.refinery.store.query.literal.*; -import tools.refinery.store.query.term.NodeVariable; -import tools.refinery.store.query.term.ParameterDirection; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.dnf.DnfClause; +import tools.refinery.logic.literal.*; +import tools.refinery.logic.term.NodeVariable; +import tools.refinery.logic.term.ParameterDirection; +import tools.refinery.logic.term.Variable; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.literal.Concreteness; 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 @@ */ package tools.refinery.store.reasoning.lifting; -import tools.refinery.store.query.dnf.*; -import tools.refinery.store.query.equality.DnfEqualityChecker; -import tools.refinery.store.query.literal.Literal; +import tools.refinery.logic.dnf.*; +import tools.refinery.logic.equality.DnfEqualityChecker; +import tools.refinery.logic.literal.Literal; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.literal.Modality; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.AbstractCountLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.substitution.Substitution; -import tools.refinery.store.query.term.DataVariable; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.AbstractCountLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.substitution.Substitution; +import tools.refinery.logic.term.DataVariable; +import tools.refinery.logic.term.Variable; import java.util.List; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.AbstractCountLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.substitution.Substitution; -import tools.refinery.store.query.term.DataVariable; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.AbstractCountLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.substitution.Substitution; +import tools.refinery.logic.term.DataVariable; +import tools.refinery.logic.term.Variable; import java.util.List; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.AbstractCountLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.substitution.Substitution; -import tools.refinery.store.query.term.DataVariable; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.AbstractCountLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.substitution.Substitution; +import tools.refinery.logic.term.DataVariable; +import tools.refinery.logic.term.Variable; import java.util.List; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.AbstractCountLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.substitution.Substitution; -import tools.refinery.store.query.term.DataVariable; -import tools.refinery.store.query.term.Variable; -import tools.refinery.store.representation.cardinality.UpperCardinalities; -import tools.refinery.store.representation.cardinality.UpperCardinality; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.AbstractCountLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.substitution.Substitution; +import tools.refinery.logic.term.DataVariable; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; import java.util.List; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.InvalidQueryException; -import tools.refinery.store.query.equality.LiteralEqualityHelper; -import tools.refinery.store.query.literal.Reduction; -import tools.refinery.store.query.term.Parameter; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.InvalidQueryException; +import tools.refinery.logic.equality.LiteralEqualityHelper; +import tools.refinery.logic.literal.Reduction; +import tools.refinery.logic.term.Parameter; import tools.refinery.store.query.view.AnySymbolView; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.literal.CallPolarity; + +import tools.refinery.logic.literal.CallPolarity; import java.util.Locale; 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 @@ */ package tools.refinery.store.reasoning.literal; -import tools.refinery.store.query.InvalidQueryException; -import tools.refinery.store.query.literal.CallLiteral; +import tools.refinery.logic.InvalidQueryException; +import tools.refinery.logic.literal.CallLiteral; public final class PartialLiterals { 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 @@ */ package tools.refinery.store.reasoning.representation; -import tools.refinery.store.representation.AnyAbstractDomain; +import tools.refinery.logic.AnyAbstractDomain; public sealed interface AnyPartialSymbol permits AnyPartialFunction, PartialSymbol { 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 @@ */ package tools.refinery.store.reasoning.representation; -import tools.refinery.store.representation.AbstractDomain; +import tools.refinery.logic.AbstractDomain; public record PartialFunction(String name, int arity, AbstractDomain abstractDomain) implements AnyPartialFunction, PartialSymbol { 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 @@ */ package tools.refinery.store.reasoning.representation; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.term.Parameter; -import tools.refinery.store.representation.AbstractDomain; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.TruthValueDomain; +import tools.refinery.logic.AbstractDomain; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.term.Parameter; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValueDomain; import java.util.Arrays; import java.util.List; @@ -44,7 +44,7 @@ public record PartialRelation(String name, int arity) implements PartialSymbol extends AnyPartialSymbol permits PartialFunction, PartialRelation { @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 @@ */ package tools.refinery.store.reasoning.translator; +import tools.refinery.logic.Constraint; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.QueryBuilder; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.NodeVariable; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.dse.transition.objectives.Criteria; import tools.refinery.store.dse.transition.objectives.Criterion; import tools.refinery.store.dse.transition.objectives.Objective; import tools.refinery.store.dse.transition.objectives.Objectives; import tools.refinery.store.model.ModelStoreBuilder; -import tools.refinery.store.query.Constraint; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.QueryBuilder; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.NodeVariable; import tools.refinery.store.query.view.MayView; import tools.refinery.store.query.view.MustView; import tools.refinery.store.reasoning.ReasoningAdapter; @@ -36,12 +37,11 @@ import tools.refinery.store.reasoning.refinement.StorageRefiner; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.representation.AnySymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; import java.util.ArrayList; import java.util.function.BiConsumer; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; @SuppressWarnings("UnusedReturnValue") public final class PartialRelationTranslator extends PartialSymbolTranslator { 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 @@ */ package tools.refinery.store.reasoning.translator.containment; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.Connectivity; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.literal.RepresentativeElectionLiteral; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; +import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.Connectivity; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.literal.RepresentativeElectionLiteral; -import tools.refinery.store.query.term.Variable; import tools.refinery.store.query.view.AnySymbolView; import tools.refinery.store.reasoning.lifting.DnfLifter; import tools.refinery.store.reasoning.literal.Concreteness; @@ -28,17 +30,15 @@ import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslat import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; -import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.literal.Literals.not; -import static tools.refinery.store.query.term.int_.IntTerms.constant; -import static tools.refinery.store.query.term.int_.IntTerms.less; +import static tools.refinery.logic.term.int_.IntTerms.constant; +import static tools.refinery.logic.term.int_.IntTerms.less; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL; import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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 import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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 @@ package tools.refinery.store.reasoning.translator.containment; import tools.refinery.store.reasoning.representation.PartialRelation; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import java.util.Objects; 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 @@ */ package tools.refinery.store.reasoning.translator.crossreference; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.NodeVariable; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.NodeVariable; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; -import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; import java.util.ArrayList; import java.util.List; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.term.int_.IntTerms.constant; -import static tools.refinery.store.query.term.int_.IntTerms.less; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.term.int_.IntTerms.constant; +import static tools.refinery.logic.term.int_.IntTerms.less; import static tools.refinery.store.reasoning.literal.PartialLiterals.may; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; public record DirectedCrossReferenceInfo(PartialRelation sourceType, Multiplicity sourceMultiplicity, 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; class DirectedCrossReferenceRefiner extends ConcreteSymbolRefiner { 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 @@ */ package tools.refinery.store.reasoning.translator.crossreference; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.dse.propagation.PropagationBuilder; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; import tools.refinery.store.query.view.ForbiddenView; import tools.refinery.store.reasoning.lifting.DnfLifter; import tools.refinery.store.reasoning.literal.Concreteness; @@ -21,9 +22,8 @@ import tools.refinery.store.reasoning.translator.TranslationException; import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; public record UndirectedCrossReferenceInfo(PartialRelation type, Multiplicity multiplicity, TruthValue defaultValue) { 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; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.reasoning.translator.TranslationException; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; class UndirectedCrossReferenceRefiner extends ConcreteSymbolRefiner { 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; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; +import tools.refinery.logic.dnf.Query; import tools.refinery.store.query.view.ForbiddenView; import tools.refinery.store.reasoning.lifting.DnfLifter; import tools.refinery.store.reasoning.literal.Concreteness; @@ -19,9 +19,9 @@ import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.reasoning.translator.TranslationException; import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add; import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; public record ReferenceInfo(boolean containment, PartialRelation sourceType, Multiplicity multiplicity, 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; import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity; import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity; import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityInterval; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; public final class ReferenceInfoBuilder { 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; import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; public class EqualsRefiner extends AbstractPartialInterpretationRefiner { 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 @@ */ package tools.refinery.store.reasoning.translator.multiobject; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.CallLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.CallLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; import tools.refinery.store.query.view.AnySymbolView; import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.literal.Modality; -import tools.refinery.store.representation.cardinality.UpperCardinalities; -import tools.refinery.store.representation.cardinality.UpperCardinality; import java.util.List; import java.util.Set; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant; -import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.lessEq; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.constant; +import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.lessEq; class EqualsRelationRewriter extends QueryBasedRelationRewriter { 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; import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; public class ExistsRefiner extends AbstractPartialInterpretationRefiner { 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 @@ */ package tools.refinery.store.reasoning.translator.multiobject; -import tools.refinery.store.query.term.Parameter; +import tools.refinery.logic.term.Parameter; import tools.refinery.store.query.view.AbstractFunctionView; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; class LowerCardinalityView extends AbstractFunctionView { public LowerCardinalityView(Symbol 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; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.reasoning.translator.TranslationException; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; 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; import tools.refinery.store.model.Model; import tools.refinery.store.reasoning.refinement.StorageRefiner; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; 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 @@ */ package tools.refinery.store.reasoning.translator.multiobject; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.literal.Literals; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.cardinalityinterval.CardinalityDomain; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.int_.IntTerms; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; +import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; import tools.refinery.store.dse.propagation.PropagationBuilder; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.dse.transition.objectives.Criteria; import tools.refinery.store.dse.transition.objectives.Objectives; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.literal.Literals; -import tools.refinery.store.query.term.Variable; -import tools.refinery.store.query.term.int_.IntTerms; -import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms; import tools.refinery.store.query.view.AnySymbolView; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.ReasoningBuilder; @@ -24,15 +28,11 @@ import tools.refinery.store.reasoning.representation.PartialFunction; import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.reasoning.translator.RoundingMode; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityDomain; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.UpperCardinalities; -import tools.refinery.store.representation.cardinality.UpperCardinality; import java.util.List; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.term.int_.IntTerms.*; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.term.int_.IntTerms.*; public class MultiObjectTranslator implements ModelStoreConfiguration { public static final Symbol 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; import tools.refinery.store.query.view.TuplePreservingView; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; class MultiView extends TuplePreservingView { 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 @@ */ package tools.refinery.store.reasoning.translator.multiobject; -import tools.refinery.store.query.term.Parameter; +import tools.refinery.logic.term.Parameter; import tools.refinery.store.query.view.AbstractFunctionView; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.UpperCardinality; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; class UpperCardinalityView extends AbstractFunctionView { public UpperCardinalityView(Symbol 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.TranslationException; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; -import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.NonEmptyCardinalityInterval; public record ConstrainedMultiplicity(NonEmptyCardinalityInterval multiplicity, PartialRelation errorSymbol) 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 @@ */ package tools.refinery.store.reasoning.translator.multiplicity; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; +import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms; import tools.refinery.store.dse.transition.objectives.Objectives; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.term.Variable; -import tools.refinery.store.query.term.int_.IntTerms; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.lifting.DnfLifter; import tools.refinery.store.reasoning.literal.*; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.reasoning.translator.TranslationException; -import tools.refinery.store.representation.cardinality.FiniteUpperCardinality; -import tools.refinery.store.representation.cardinality.UpperCardinalities; -import tools.refinery.store.representation.cardinality.UpperCardinality; import java.util.List; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM; -import static tools.refinery.store.query.term.int_.IntTerms.constant; -import static tools.refinery.store.query.term.int_.IntTerms.greater; -import static tools.refinery.store.query.term.int_.IntTerms.sub; -import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant; -import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.less; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.term.int_.IntTerms.*; import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; import static tools.refinery.store.reasoning.literal.PartialLiterals.must; @@ -81,17 +76,18 @@ public class InvalidMultiplicityErrorTranslator implements ModelStoreConfigurati mustBuilder.clause(UpperCardinality.class, existingContents -> List.of( must(nodeType.call(node)), new CountUpperBoundLiteral(existingContents, linkType, arguments), - check(less(existingContents, constant(lowerBoundCardinality))) + check(UpperCardinalityTerms.less(existingContents, + UpperCardinalityTerms.constant(lowerBoundCardinality))) )); candidateMayBuilder.clause(Integer.class, existingContents -> List.of( candidateMust(nodeType.call(node)), new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments), - check(IntTerms.less(existingContents, constant(lowerBound))) + check(less(existingContents, constant(lowerBound))) )); candidateMustBuilder.clause(Integer.class, existingContents -> List.of( candidateMust(nodeType.call(node)), new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments), - check(IntTerms.less(existingContents, constant(lowerBound))) + check(less(existingContents, constant(lowerBound))) )); missingBuilder.clause(Integer.class, existingContents -> List.of( 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 @@ */ package tools.refinery.store.reasoning.translator.multiplicity; -import tools.refinery.store.representation.cardinality.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; public sealed interface Multiplicity permits ConstrainedMultiplicity, UnconstrainedMultiplicity { 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 @@ */ package tools.refinery.store.reasoning.translator.multiplicity; -import tools.refinery.store.representation.cardinality.CardinalityInterval; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; // Singleton implementation, because there is only a single complete interval. @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 @@ */ package tools.refinery.store.reasoning.translator.opposite; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Variable; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Variable; import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; import tools.refinery.store.reasoning.literal.Concreteness; 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 @@ */ package tools.refinery.store.reasoning.translator.predicate; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.dnf.RelationalQuery; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.NodeVariable; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.dnf.RelationalQuery; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.NodeVariable; -import tools.refinery.store.query.term.Variable; import tools.refinery.store.query.view.ForbiddenView; import tools.refinery.store.query.view.MayView; import tools.refinery.store.query.view.MustView; @@ -19,9 +20,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.reasoning.translator.TranslationException; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.literal.PartialLiterals.may; import static tools.refinery.store.reasoning.literal.PartialLiterals.must; 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 @@ */ package tools.refinery.store.reasoning.translator.proxy; +import tools.refinery.logic.literal.AbstractCallLiteral; +import tools.refinery.logic.literal.Literal; +import tools.refinery.logic.term.Variable; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.literal.AbstractCallLiteral; -import tools.refinery.store.query.literal.Literal; -import tools.refinery.store.query.term.Variable; import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter; import tools.refinery.store.reasoning.literal.Concreteness; 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; import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; class InferredTypeRefiner extends AbstractPartialInterpretationRefiner { 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 @@ package tools.refinery.store.reasoning.translator.typehierarchy; import tools.refinery.store.reasoning.representation.PartialRelation; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import java.util.*; 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; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; 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 @@ */ package tools.refinery.store.reasoning.translator.typehierarchy; +import tools.refinery.logic.dnf.Query; import tools.refinery.store.dse.transition.Rule; import tools.refinery.store.dse.transition.actions.ActionLiteral; import tools.refinery.store.model.ModelStoreBuilder; import tools.refinery.store.model.ModelStoreConfiguration; -import tools.refinery.store.query.dnf.Query; import tools.refinery.store.reasoning.ReasoningBuilder; import tools.refinery.store.reasoning.actions.PartialActionLiterals; import tools.refinery.store.reasoning.literal.PartialLiterals; @@ -21,7 +21,7 @@ import tools.refinery.store.representation.Symbol; import java.util.ArrayList; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust; import static tools.refinery.store.reasoning.literal.PartialLiterals.may; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java index f8135102..2aa058a4 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java @@ -6,10 +6,11 @@ package tools.refinery.store.reasoning; import org.junit.jupiter.api.Test; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.term.Variable; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.model.ModelStore; import tools.refinery.store.query.ModelQueryAdapter; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.term.Variable; import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; import tools.refinery.store.query.view.ForbiddenView; import tools.refinery.store.reasoning.literal.Concreteness; @@ -18,14 +19,13 @@ import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; import tools.refinery.store.tuple.Tuple; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.ReasoningAdapter.EQUALS_SYMBOL; import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL; import static tools.refinery.store.reasoning.literal.PartialLiterals.may; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java index 793d1cec..f3e4d3b0 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java @@ -7,9 +7,10 @@ package tools.refinery.store.reasoning.lifting; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import tools.refinery.store.query.dnf.Dnf; -import tools.refinery.store.query.dnf.Query; -import tools.refinery.store.query.term.ParameterDirection; +import tools.refinery.logic.dnf.Dnf; +import tools.refinery.logic.dnf.Query; +import tools.refinery.logic.term.ParameterDirection; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.query.view.AnySymbolView; import tools.refinery.store.query.view.FunctionView; import tools.refinery.store.query.view.MustView; @@ -20,15 +21,14 @@ import tools.refinery.store.reasoning.literal.Modality; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.representation.PartialSymbol; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; -import static tools.refinery.store.query.literal.Literals.check; -import static tools.refinery.store.query.literal.Literals.not; -import static tools.refinery.store.query.term.int_.IntTerms.*; -import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo; +import static tools.refinery.logic.literal.Literals.check; +import static tools.refinery.logic.literal.Literals.not; +import static tools.refinery.logic.term.int_.IntTerms.*; +import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo; class DnfLifterTest { private static final Symbol friendSymbol = Symbol.of("friend", 2, TruthValue.class, @@ -49,7 +49,7 @@ class DnfLifterTest { @Test void liftPartialRelationCallTest() { var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of( - friend.call(p1, v1) + friend.call(p1, v1) ))).getDnf(); var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input); @@ -204,7 +204,7 @@ class DnfLifterTest { @Test void liftPartialRelationTransitiveCallTest() { - var input = Query.of("Actual", (builder, p1, p2)-> builder.clause( + var input = Query.of("Actual", (builder, p1, p2) -> builder.clause( friend.callTransitive(p1, p2), not(person.call(p2)) )).getDnf(); @@ -233,7 +233,7 @@ class DnfLifterTest { @Test void liftPartialSymbolTransitiveCallTest() { - var input = Query.of("Actual", (builder, p1, p2)-> builder.clause( + var input = Query.of("Actual", (builder, p1, p2) -> builder.clause( friendMustView.callTransitive(p1, p2), not(person.call(p2)) )).getDnf(); @@ -332,7 +332,8 @@ class DnfLifterTest { var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause( ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2), - not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p1, p2)) + not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p1, + p2)) )).getDnf(); assertThat(actual, structurallyEqualTo(expected)); diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java index 1d0ac02d..e889b80d 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java @@ -18,8 +18,8 @@ import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslat import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity; import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchy; import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; import java.util.Map; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java index ba6ba6da..e2b3f31e 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java @@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.metamodel; import org.junit.jupiter.api.Test; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.TranslationException; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java index 88e6a4d7..f8e9e1b5 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java @@ -16,8 +16,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator; import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; import tools.refinery.store.tuple.Tuple; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java index 48a046fc..5ef189d5 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java @@ -8,9 +8,9 @@ package tools.refinery.store.reasoning.translator.multiobject; import org.junit.jupiter.api.Test; import tools.refinery.store.model.ModelStore; import tools.refinery.store.query.ModelQueryAdapter; -import tools.refinery.store.query.dnf.Query; +import tools.refinery.logic.dnf.Query; import tools.refinery.store.query.resultset.ResultSet; -import tools.refinery.store.query.term.Variable; +import tools.refinery.logic.term.Variable; import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; import tools.refinery.store.reasoning.ReasoningAdapter; import tools.refinery.store.reasoning.ReasoningStoreAdapter; @@ -20,17 +20,17 @@ import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; import tools.refinery.store.reasoning.translator.PartialRelationTranslator; import tools.refinery.store.representation.Symbol; -import tools.refinery.store.representation.TruthValue; -import tools.refinery.store.representation.cardinality.CardinalityIntervals; -import tools.refinery.store.representation.cardinality.UpperCardinalities; -import tools.refinery.store.representation.cardinality.UpperCardinality; +import tools.refinery.logic.term.truthvalue.TruthValue; +import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals; +import tools.refinery.logic.term.uppercardinality.UpperCardinalities; +import tools.refinery.logic.term.uppercardinality.UpperCardinality; import tools.refinery.store.tuple.Tuple; import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static tools.refinery.store.query.literal.Literals.not; +import static tools.refinery.logic.literal.Literals.not; import static tools.refinery.store.reasoning.literal.PartialLiterals.must; class PartialCountTest { diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java index 4bef9d8e..b9edcf75 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java @@ -14,7 +14,7 @@ import tools.refinery.store.reasoning.ReasoningStoreAdapter; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java index d9a5477e..d860c7d6 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java @@ -9,7 +9,7 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import tools.refinery.store.reasoning.representation.PartialRelation; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import java.util.Set; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java index 5af725bb..e87b2684 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java @@ -16,7 +16,7 @@ import tools.refinery.store.reasoning.ReasoningStoreAdapter; import tools.refinery.store.reasoning.literal.Concreteness; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.seed.ModelSeed; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import tools.refinery.store.tuple.Tuple; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java index 931c62dd..b7c99d2d 100644 --- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java +++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java @@ -9,7 +9,7 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import tools.refinery.store.reasoning.representation.PartialRelation; import tools.refinery.store.reasoning.translator.TranslationException; -import tools.refinery.store.representation.TruthValue; +import tools.refinery.logic.term.truthvalue.TruthValue; import java.util.Set; -- cgit v1.2.3-54-g00ecf