1 files changed, 24 insertions, 39 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 fb89bea6..44974869 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
@@ -15,16 +15,11 @@ import org.eclipse.xtext.validation.FeatureBasedDiagnostic;
 import org.eclipse.xtext.validation.IDiagnosticConverter;
 import org.eclipse.xtext.validation.Issue;
 import org.eclipse.xtext.web.server.validation.ValidationResult;
+import tools.refinery.generator.ModelSemantics;
+import tools.refinery.generator.ModelSemanticsFactory;
 import tools.refinery.language.model.problem.Problem;
-import tools.refinery.language.semantics.metadata.MetadataCreator;
-import tools.refinery.language.semantics.model.ModelInitializer;
-import tools.refinery.language.semantics.model.TracedException;
-import tools.refinery.store.dse.propagation.PropagationAdapter;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
-import tools.refinery.store.reasoning.ReasoningAdapter;
-import tools.refinery.store.reasoning.ReasoningStoreAdapter;
-import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.language.web.semantics.metadata.MetadataCreator;
+import tools.refinery.language.semantics.TracedException;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.util.CancellationToken;
 
@@ -35,20 +30,20 @@ class SemanticsWorker implements Callable<SemanticsResult> {
         private static final String DIAGNOSTIC_ID = "tools.refinery.language.semantics.SemanticError";
 
         @Inject
-        private PartialInterpretation2Json partialInterpretation2Json;
-
-        @Inject
         private OperationCanceledManager operationCanceledManager;
 
         @Inject
         private IDiagnosticConverter diagnosticConverter;
 
         @Inject
-        private ModelInitializer initializer;
+        private ModelSemanticsFactory semanticsFactory;
 
         @Inject
         private MetadataCreator metadataCreator;
 
+        @Inject
+        private PartialInterpretation2Json partialInterpretation2Json;
+
         private Problem problem;
 
         private CancellationToken cancellationToken;
@@ -64,36 +59,26 @@ class SemanticsWorker implements Callable<SemanticsResult> {
 
         @Override
         public SemanticsResult call() {
-                var builder = ModelStore.builder()
-                                .cancellationToken(cancellationToken)
-                                .with(QueryInterpreterAdapter.builder())
-                                .with(PropagationAdapter.builder())
-                                .with(ReasoningAdapter.builder()
-                                                .requiredInterpretations(Concreteness.PARTIAL));
                 cancellationToken.checkCancelled();
+                ModelSemantics semantics;
                 try {
-                        var modelSeed = initializer.createModel(problem, builder);
-                        cancellationToken.checkCancelled();
-                        metadataCreator.setInitializer(initializer);
-                        cancellationToken.checkCancelled();
-                        var nodesMetadata = metadataCreator.getNodesMetadata();
-                        cancellationToken.checkCancelled();
-                        var relationsMetadata = metadataCreator.getRelationsMetadata();
-                        cancellationToken.checkCancelled();
-                        var store = builder.build();
-                        cancellationToken.checkCancelled();
-                        var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
-                        cancellationToken.checkCancelled();
-                        var partialInterpretation = partialInterpretation2Json.getPartialInterpretation(initializer, model,
-                                        Concreteness.PARTIAL, cancellationToken);
-
-                        return new SemanticsSuccessResult(nodesMetadata, relationsMetadata, partialInterpretation);
-                } catch (TracedException e) {
-                        return getTracedErrorResult(e.getSourceElement(), e.getMessage());
+                        semantics = semanticsFactory.cancellationToken(cancellationToken).createSemantics(problem);
                 } catch (TranslationException e) {
-                        var sourceElement = initializer.getInverseTrace(e.getPartialSymbol());
-                        return getTracedErrorResult(sourceElement, e.getMessage());
+                        return new SemanticsInternalErrorResult(e.getMessage());
+                } catch (TracedException e) {
+                        var cause = e.getCause();
+                        // Suppress the type of the cause exception.
+                        var message = cause == null ? e.getMessage() : cause.getMessage();
+                        return getTracedErrorResult(e.getSourceElement(), message);
                 }
+                cancellationToken.checkCancelled();
+                metadataCreator.setProblemTrace(semantics.getProblemTrace());
+                var nodesMetadata = metadataCreator.getNodesMetadata(semantics.getModel(), true);
+                cancellationToken.checkCancelled();
+                var relationsMetadata = metadataCreator.getRelationsMetadata();
+                cancellationToken.checkCancelled();
+                var partialInterpretation = partialInterpretation2Json.getPartialInterpretation(semantics, cancellationToken);
+                return new SemanticsSuccessResult(nodesMetadata, relationsMetadata, partialInterpretation);
         }
 
         private SemanticsResult getTracedErrorResult(EObject sourceElement, String message) {