diff options
Diffstat (limited to 'subprojects/store-reasoning')
7 files changed, 13 insertions, 13 deletions
diff --git a/subprojects/store-reasoning/build.gradle.kts b/subprojects/store-reasoning/build.gradle.kts index ed8355f3..068256c2 100644 --- a/subprojects/store-reasoning/build.gradle.kts +++ b/subprojects/store-reasoning/build.gradle.kts | |||
@@ -11,5 +11,5 @@ plugins { | |||
11 | dependencies { | 11 | dependencies { |
12 | api(project(":refinery-store-dse")) | 12 | api(project(":refinery-store-dse")) |
13 | testImplementation(testFixtures(project(":refinery-store-query"))) | 13 | testImplementation(testFixtures(project(":refinery-store-query"))) |
14 | testImplementation(project(":refinery-store-query-viatra")) | 14 | testImplementation(project(":refinery-store-query-interpreter")) |
15 | } | 15 | } |
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 77560a68..f8135102 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 | |||
@@ -10,7 +10,7 @@ import tools.refinery.store.model.ModelStore; | |||
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Query; | 11 | import tools.refinery.store.query.dnf.Query; |
12 | import tools.refinery.store.query.term.Variable; | 12 | import tools.refinery.store.query.term.Variable; |
13 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 13 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
14 | import tools.refinery.store.query.view.ForbiddenView; | 14 | import tools.refinery.store.query.view.ForbiddenView; |
15 | import tools.refinery.store.reasoning.literal.Concreteness; | 15 | import tools.refinery.store.reasoning.literal.Concreteness; |
16 | import tools.refinery.store.reasoning.representation.PartialRelation; | 16 | import tools.refinery.store.reasoning.representation.PartialRelation; |
@@ -42,7 +42,7 @@ class PartialModelTest { | |||
42 | var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.UNKNOWN); | 42 | var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.UNKNOWN); |
43 | 43 | ||
44 | var store = ModelStore.builder() | 44 | var store = ModelStore.builder() |
45 | .with(ViatraModelQueryAdapter.builder()) | 45 | .with(QueryInterpreterAdapter.builder()) |
46 | .with(ReasoningAdapter.builder()) | 46 | .with(ReasoningAdapter.builder()) |
47 | .with(new MultiObjectTranslator()) | 47 | .with(new MultiObjectTranslator()) |
48 | .with(PartialRelationTranslator.of(person) | 48 | .with(PartialRelationTranslator.of(person) |
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 bbfaff84..1d0ac02d 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 | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.containment; | |||
8 | import org.junit.jupiter.api.BeforeEach; | 8 | import org.junit.jupiter.api.BeforeEach; |
9 | import org.junit.jupiter.api.Test; | 9 | import org.junit.jupiter.api.Test; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 11 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
14 | import tools.refinery.store.reasoning.literal.Concreteness; | 14 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -52,7 +52,7 @@ class ContainmentHierarchyTranslatorTest { | |||
52 | ); | 52 | ); |
53 | 53 | ||
54 | store = ModelStore.builder() | 54 | store = ModelStore.builder() |
55 | .with(ViatraModelQueryAdapter.builder()) | 55 | .with(QueryInterpreterAdapter.builder()) |
56 | .with(ReasoningAdapter.builder()) | 56 | .with(ReasoningAdapter.builder()) |
57 | .with(new MultiObjectTranslator()) | 57 | .with(new MultiObjectTranslator()) |
58 | .with(new TypeHierarchyTranslator(typeHierarchy)) | 58 | .with(new TypeHierarchyTranslator(typeHierarchy)) |
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 eabbdffe..6c2f55af 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 | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.metamodel; | |||
8 | import org.junit.jupiter.api.Test; | 8 | import org.junit.jupiter.api.Test; |
9 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 11 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
14 | import tools.refinery.store.reasoning.literal.Concreteness; | 14 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -141,7 +141,7 @@ class MetamodelTest { | |||
141 | 141 | ||
142 | private static Model createModel(Metamodel metamodel, ModelSeed seed) { | 142 | private static Model createModel(Metamodel metamodel, ModelSeed seed) { |
143 | var store = ModelStore.builder() | 143 | var store = ModelStore.builder() |
144 | .with(ViatraModelQueryAdapter.builder()) | 144 | .with(QueryInterpreterAdapter.builder()) |
145 | .with(ReasoningAdapter.builder()) | 145 | .with(ReasoningAdapter.builder()) |
146 | .with(new MultiObjectTranslator()) | 146 | .with(new MultiObjectTranslator()) |
147 | .with(new MetamodelTranslator(metamodel)) | 147 | .with(new MetamodelTranslator(metamodel)) |
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 64230cf6..48a046fc 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 | |||
@@ -11,7 +11,7 @@ import tools.refinery.store.query.ModelQueryAdapter; | |||
11 | import tools.refinery.store.query.dnf.Query; | 11 | import tools.refinery.store.query.dnf.Query; |
12 | import tools.refinery.store.query.resultset.ResultSet; | 12 | import tools.refinery.store.query.resultset.ResultSet; |
13 | import tools.refinery.store.query.term.Variable; | 13 | import tools.refinery.store.query.term.Variable; |
14 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 14 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
15 | import tools.refinery.store.reasoning.ReasoningAdapter; | 15 | import tools.refinery.store.reasoning.ReasoningAdapter; |
16 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 16 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
17 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; | 17 | import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral; |
@@ -305,7 +305,7 @@ class PartialCountTest { | |||
305 | var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.FALSE); | 305 | var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.FALSE); |
306 | 306 | ||
307 | var store = ModelStore.builder() | 307 | var store = ModelStore.builder() |
308 | .with(ViatraModelQueryAdapter.builder() | 308 | .with(QueryInterpreterAdapter.builder() |
309 | .query(query)) | 309 | .query(query)) |
310 | .with(ReasoningAdapter.builder()) | 310 | .with(ReasoningAdapter.builder()) |
311 | .with(new MultiObjectTranslator()) | 311 | .with(new MultiObjectTranslator()) |
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 3658d603..4bef9d8e 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 | |||
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.typehierarchy; | |||
8 | import org.junit.jupiter.api.BeforeEach; | 8 | import org.junit.jupiter.api.BeforeEach; |
9 | import org.junit.jupiter.api.Test; | 9 | import org.junit.jupiter.api.Test; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 11 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
12 | import tools.refinery.store.reasoning.ReasoningAdapter; | 12 | import tools.refinery.store.reasoning.ReasoningAdapter; |
13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 13 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
14 | import tools.refinery.store.reasoning.literal.Concreteness; | 14 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -34,7 +34,7 @@ class ConcreteSupertypeTest { | |||
34 | .build(); | 34 | .build(); |
35 | 35 | ||
36 | store = ModelStore.builder() | 36 | store = ModelStore.builder() |
37 | .with(ViatraModelQueryAdapter.builder()) | 37 | .with(QueryInterpreterAdapter.builder()) |
38 | .with(ReasoningAdapter.builder()) | 38 | .with(ReasoningAdapter.builder()) |
39 | .with(new TypeHierarchyTranslator(typeHierarchy)) | 39 | .with(new TypeHierarchyTranslator(typeHierarchy)) |
40 | .build(); | 40 | .build(); |
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 cd9df19a..5af725bb 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 | |||
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; | |||
10 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
11 | import tools.refinery.store.model.ModelStore; | 11 | import tools.refinery.store.model.ModelStore; |
12 | import tools.refinery.store.query.ModelQueryAdapter; | 12 | import tools.refinery.store.query.ModelQueryAdapter; |
13 | import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | 13 | import tools.refinery.store.query.interpreter.QueryInterpreterAdapter; |
14 | import tools.refinery.store.reasoning.ReasoningAdapter; | 14 | import tools.refinery.store.reasoning.ReasoningAdapter; |
15 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 15 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
16 | import tools.refinery.store.reasoning.literal.Concreteness; | 16 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -42,7 +42,7 @@ class TypeHierarchyPartialModelTest { | |||
42 | .build(); | 42 | .build(); |
43 | 43 | ||
44 | var store = ModelStore.builder() | 44 | var store = ModelStore.builder() |
45 | .with(ViatraModelQueryAdapter.builder()) | 45 | .with(QueryInterpreterAdapter.builder()) |
46 | .with(ReasoningAdapter.builder()) | 46 | .with(ReasoningAdapter.builder()) |
47 | .with(new TypeHierarchyTranslator(typeHierarchy)) | 47 | .with(new TypeHierarchyTranslator(typeHierarchy)) |
48 | .build(); | 48 | .build(); |