diff options
author | Kristóf Marussy <kristof@marussy.com> | 2023-09-11 19:22:26 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2023-09-11 19:22:26 +0200 |
commit | 4d365b54dad8d066bba2a2b1a05092b4802b9970 (patch) | |
tree | 12e5ae36b0041463ded54e7a69dcdc9f3662794f /subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java | |
parent | fix: build failures after integrating generation (diff) | |
download | refinery-4d365b54dad8d066bba2a2b1a05092b4802b9970.tar.gz refinery-4d365b54dad8d066bba2a2b1a05092b4802b9970.tar.zst refinery-4d365b54dad8d066bba2a2b1a05092b4802b9970.zip |
feat: cancellation token for ModelStore
Diffstat (limited to 'subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java')
-rw-r--r-- | subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java | 9 |
1 files changed, 4 insertions, 5 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 c745d86e..33b1c4fb 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 | |||
@@ -34,7 +34,7 @@ import tools.refinery.store.reasoning.representation.PartialRelation; | |||
34 | import tools.refinery.store.reasoning.translator.TranslationException; | 34 | import tools.refinery.store.reasoning.translator.TranslationException; |
35 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; | 35 | import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; |
36 | import tools.refinery.store.tuple.Tuple; | 36 | import tools.refinery.store.tuple.Tuple; |
37 | import tools.refinery.viatra.runtime.CancellationToken; | 37 | import tools.refinery.store.util.CancellationToken; |
38 | 38 | ||
39 | import java.util.ArrayList; | 39 | import java.util.ArrayList; |
40 | import java.util.TreeMap; | 40 | import java.util.TreeMap; |
@@ -74,8 +74,8 @@ class SemanticsWorker implements Callable<SemanticsResult> { | |||
74 | @Override | 74 | @Override |
75 | public SemanticsResult call() { | 75 | public SemanticsResult call() { |
76 | var builder = ModelStore.builder() | 76 | var builder = ModelStore.builder() |
77 | .with(ViatraModelQueryAdapter.builder() | 77 | .cancellationToken(cancellationToken) |
78 | .cancellationToken(cancellationToken)) | 78 | .with(ViatraModelQueryAdapter.builder()) |
79 | .with(PropagationAdapter.builder()) | 79 | .with(PropagationAdapter.builder()) |
80 | .with(ReasoningAdapter.builder() | 80 | .with(ReasoningAdapter.builder() |
81 | .requiredInterpretations(Concreteness.PARTIAL)); | 81 | .requiredInterpretations(Concreteness.PARTIAL)); |
@@ -91,8 +91,7 @@ class SemanticsWorker implements Callable<SemanticsResult> { | |||
91 | cancellationToken.checkCancelled(); | 91 | cancellationToken.checkCancelled(); |
92 | var store = builder.build(); | 92 | var store = builder.build(); |
93 | cancellationToken.checkCancelled(); | 93 | cancellationToken.checkCancelled(); |
94 | var cancellableModelSeed = CancellableSeed.wrap(cancellationToken, modelSeed); | 94 | var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed); |
95 | var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(cancellableModelSeed); | ||
96 | cancellationToken.checkCancelled(); | 95 | cancellationToken.checkCancelled(); |
97 | var partialInterpretation = getPartialInterpretation(initializer, model); | 96 | var partialInterpretation = getPartialInterpretation(initializer, model); |
98 | 97 | ||