refactor: simplified Dnf parameter directions

2 files changed, 9 insertions, 21 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
index ec880435..5b0ea61d 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
@@ -88,8 +88,7 @@ public class Dnf2PQuery {
                 List<PParameter> parameterList = new ArrayList<>();
                 for (var parameter : dnfQuery.getSymbolicParameters()) {
                         var direction = switch (parameter.getDirection()) {
-                                case IN_OUT -> PParameterDirection.INOUT;
-                                case OUT -> PParameterDirection.OUT;
+                                case OUT -> parameter.isUnifiable() ? PParameterDirection.INOUT : PParameterDirection.OUT;
                                 case IN -> throw new IllegalArgumentException("Query %s with input parameter %s is not supported"
                                                 .formatted(dnfQuery, parameter.getVariable()));
                         };
@@ -154,9 +153,9 @@ public class Dnf2PQuery {
         }
 
         private void translateEquivalenceLiteral(EquivalenceLiteral equivalenceLiteral, PBody body) {
-                PVariable varSource = body.getOrCreateVariableByName(equivalenceLiteral.getLeft().getUniqueName());
-                PVariable varTarget = body.getOrCreateVariableByName(equivalenceLiteral.getRight().getUniqueName());
-                if (equivalenceLiteral.isPositive()) {
+                PVariable varSource = body.getOrCreateVariableByName(equivalenceLiteral.left().getUniqueName());
+                PVariable varTarget = body.getOrCreateVariableByName(equivalenceLiteral.right().getUniqueName());
+                if (equivalenceLiteral.positive()) {
                         new Equality(body, varSource, varTarget);
                 } else {
                         new Inequality(body, varSource, varTarget);
@@ -213,13 +212,13 @@ public class Dnf2PQuery {
         }
 
         private void translateConstantLiteral(ConstantLiteral constantLiteral, PBody body) {
-                var variable = body.getOrCreateVariableByName(constantLiteral.getVariable().getUniqueName());
-                new ConstantValue(body, variable, constantLiteral.getNodeId());
+                var variable = body.getOrCreateVariableByName(constantLiteral.variable().getUniqueName());
+                new ConstantValue(body, variable, constantLiteral.nodeId());
         }
 
         private <T> void translateAssignLiteral(AssignLiteral<T> assignLiteral, PBody body) {
-                var variable = body.getOrCreateVariableByName(assignLiteral.getTargetVariable().getUniqueName());
-                var term = assignLiteral.getTerm();
+                var variable = body.getOrCreateVariableByName(assignLiteral.variable().getUniqueName());
+                var term = assignLiteral.term();
                 if (term instanceof ConstantTerm<T> constantTerm) {
                         new ConstantValue(body, variable, constantTerm.getValue());
                 } else {
@@ -229,7 +228,7 @@ public class Dnf2PQuery {
         }
 
         private void translateAssumeLiteral(AssumeLiteral assumeLiteral, PBody body) {
-                var evaluator = new AssumptionEvaluator(assumeLiteral.getTerm());
+                var evaluator = new AssumptionEvaluator(assumeLiteral.term());
                 new ExpressionEvaluation(body, evaluator, null);
         }
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
index 46ce37b4..a9a2f71c 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
@@ -23,7 +23,6 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static tools.refinery.store.query.literal.Literals.assume;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.term.int_.IntTerms.constant;
@@ -707,14 +706,4 @@ class QueryTest {
                 queryEngine.flushChanges();
                 assertResults(Map.of(), predicateResultSet);
         }
-
-        @Test
-        void alwaysTrueTest() {
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("AlwaysTrue").parameters(p1).clause().build();
-
-                var queryBuilder = ViatraModelQueryAdapter.builder();
-
-                assertThrows(IllegalArgumentException.class, () -> queryBuilder.queries(predicate));
-        }
 }