aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/language-web/src/main/java
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2023-09-11 01:27:30 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2023-09-11 01:27:30 +0200
commit37bcdc4c80f8c5d15ba888aace70f413094910ed (patch)
treed5f387dbaf8c9c6f3ceee0fa14b14a49af138c9e /subprojects/language-web/src/main/java
parentfix: VIATRA projection indexer error (diff)
downloadrefinery-37bcdc4c80f8c5d15ba888aace70f413094910ed.tar.gz
refinery-37bcdc4c80f8c5d15ba888aace70f413094910ed.tar.zst
refinery-37bcdc4c80f8c5d15ba888aace70f413094910ed.zip
fix: build failures after integrating generation
Diffstat (limited to 'subprojects/language-web/src/main/java')
-rw-r--r--subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java10
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;
22import tools.refinery.language.semantics.model.ModelInitializer; 22import tools.refinery.language.semantics.model.ModelInitializer;
23import tools.refinery.language.semantics.model.SemanticsUtils; 23import tools.refinery.language.semantics.model.SemanticsUtils;
24import tools.refinery.language.semantics.model.TracedException; 24import tools.refinery.language.semantics.model.TracedException;
25import tools.refinery.store.dse.propagation.PropagationAdapter;
25import tools.refinery.store.map.Cursor; 26import tools.refinery.store.map.Cursor;
26import tools.refinery.store.model.Model; 27import tools.refinery.store.model.Model;
27import tools.refinery.store.model.ModelStore; 28import tools.refinery.store.model.ModelStore;
@@ -29,9 +30,7 @@ import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
29import tools.refinery.store.reasoning.ReasoningAdapter; 30import tools.refinery.store.reasoning.ReasoningAdapter;
30import tools.refinery.store.reasoning.ReasoningStoreAdapter; 31import tools.refinery.store.reasoning.ReasoningStoreAdapter;
31import tools.refinery.store.reasoning.literal.Concreteness; 32import tools.refinery.store.reasoning.literal.Concreteness;
32import tools.refinery.store.reasoning.refinement.RefinementResult;
33import tools.refinery.store.reasoning.representation.PartialRelation; 33import tools.refinery.store.reasoning.representation.PartialRelation;
34import tools.refinery.store.reasoning.scope.ScopePropagatorAdapter;
35import tools.refinery.store.reasoning.translator.TranslationException; 34import tools.refinery.store.reasoning.translator.TranslationException;
36import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator; 35import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
37import tools.refinery.store.tuple.Tuple; 36import 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