diff options
Diffstat (limited to 'subprojects/language-web')
-rw-r--r-- | subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java index 8470bb99..c745d86e 100644 --- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java +++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java | |||
@@ -22,6 +22,7 @@ import tools.refinery.language.semantics.metadata.MetadataCreator; | |||
22 | import tools.refinery.language.semantics.model.ModelInitializer; | 22 | import tools.refinery.language.semantics.model.ModelInitializer; |
23 | import tools.refinery.language.semantics.model.SemanticsUtils; | 23 | import tools.refinery.language.semantics.model.SemanticsUtils; |
24 | import tools.refinery.language.semantics.model.TracedException; | 24 | import tools.refinery.language.semantics.model.TracedException; |
25 | import tools.refinery.store.dse.propagation.PropagationAdapter; | ||
25 | import tools.refinery.store.map.Cursor; | 26 | import tools.refinery.store.map.Cursor; |
26 | import tools.refinery.store.model.Model; | 27 | import tools.refinery.store.model.Model; |
27 | import tools.refinery.store.model.ModelStore; | 28 | import tools.refinery.store.model.ModelStore; |
@@ -29,9 +30,7 @@ import tools.refinery.store.query.viatra.ViatraModelQueryAdapter; | |||
29 | import tools.refinery.store.reasoning.ReasoningAdapter; | 30 | import tools.refinery.store.reasoning.ReasoningAdapter; |
30 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | 31 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; |
31 | import tools.refinery.store.reasoning.literal.Concreteness; | 32 | import tools.refinery.store.reasoning.literal.Concreteness; |
32 | import tools.refinery.store.reasoning.refinement.RefinementResult; | ||
33 | import tools.refinery.store.reasoning.representation.PartialRelation; | 33 | import tools.refinery.store.reasoning.representation.PartialRelation; |
34 | import tools.refinery.store.reasoning.scope.ScopePropagatorAdapter; | ||
35 | import tools.refinery.store.reasoning.translator.TranslationException; | 34 | import tools.refinery.store.reasoning.translator.TranslationException; |
36 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; | 35 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; |
37 | import tools.refinery.store.tuple.Tuple; | 36 | import tools.refinery.store.tuple.Tuple; |
@@ -77,9 +76,9 @@ class SemanticsWorker implements Callable<SemanticsResult> { | |||
77 | var builder = ModelStore.builder() | 76 | var builder = ModelStore.builder() |
78 | .with(ViatraModelQueryAdapter.builder() | 77 | .with(ViatraModelQueryAdapter.builder() |
79 | .cancellationToken(cancellationToken)) | 78 | .cancellationToken(cancellationToken)) |
79 | .with(PropagationAdapter.builder()) | ||
80 | .with(ReasoningAdapter.builder() | 80 | .with(ReasoningAdapter.builder() |
81 | .requiredInterpretations(Concreteness.PARTIAL)) | 81 | .requiredInterpretations(Concreteness.PARTIAL)); |
82 | .with(ScopePropagatorAdapter.builder()); | ||
83 | cancellationToken.checkCancelled(); | 82 | cancellationToken.checkCancelled(); |
84 | try { | 83 | try { |
85 | var modelSeed = initializer.createModel(problem, builder); | 84 | var modelSeed = initializer.createModel(problem, builder); |
@@ -94,9 +93,6 @@ class SemanticsWorker implements Callable<SemanticsResult> { | |||
94 | cancellationToken.checkCancelled(); | 93 | cancellationToken.checkCancelled(); |
95 | var cancellableModelSeed = CancellableSeed.wrap(cancellationToken, modelSeed); | 94 | var cancellableModelSeed = CancellableSeed.wrap(cancellationToken, modelSeed); |
96 | var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(cancellableModelSeed); | 95 | var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(cancellableModelSeed); |
97 | if (model.getAdapter(ScopePropagatorAdapter.class).propagate() == RefinementResult.REJECTED) { | ||
98 | return new SemanticsInternalErrorResult("Scopes are unsatisfiable"); | ||
99 | } | ||
100 | cancellationToken.checkCancelled(); | 96 | cancellationToken.checkCancelled(); |
101 | var partialInterpretation = getPartialInterpretation(initializer, model); | 97 | var partialInterpretation = getPartialInterpretation(initializer, model); |
102 | 98 | ||