refactor: rename CallKind to Polarity

3 files changed, 12 insertions, 12 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CountExpressionEvaluator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CountExpressionEvaluator.java
index 6fc96c05..e583e187 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CountExpressionEvaluator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CountExpressionEvaluator.java
@@ -3,14 +3,14 @@ package tools.refinery.store.query.viatra.internal.pquery;
 import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
 import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.atom.ComparisonOperator;
-import tools.refinery.store.query.atom.CountCallKind;
+import tools.refinery.store.query.atom.CountingPolarity;
 
 import java.util.List;
 
 public record CountExpressionEvaluator(String variableName, ComparisonOperator operator,
                                                                            int threshold) implements IExpressionEvaluator {
-        public CountExpressionEvaluator(String variableName, CountCallKind callKind) {
-                this(variableName, callKind.operator(), callKind.threshold());
+        public CountExpressionEvaluator(String variableName, CountingPolarity polarity) {
+                this(variableName, polarity.operator(), polarity.threshold());
         }
 
         @Override
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 61b984ae..ae99365d 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
@@ -127,21 +127,21 @@ public class DNF2PQuery {
                 }
                 var variablesTuple = translateSubstitution(callAtom.getSubstitution(), body);
                 var translatedReferred = translate(target);
-                var callKind = callAtom.getKind();
-                if (callKind instanceof BasicCallKind basicCallKind) {
-                        switch (basicCallKind) {
+                var polarity = callAtom.getPolarity();
+                if (polarity instanceof SimplePolarity simplePolarity) {
+                        switch (simplePolarity) {
                         case POSITIVE -> new PositivePatternCall(body, variablesTuple, translatedReferred);
                         case TRANSITIVE -> new BinaryTransitiveClosure(body, variablesTuple, translatedReferred);
                         case NEGATIVE -> new NegativePatternCall(body, variablesTuple, translatedReferred);
-                        default -> throw new IllegalArgumentException("Unknown BasicCallKind: " + basicCallKind);
+                        default -> throw new IllegalArgumentException("Unknown BasicCallKind: " + simplePolarity);
                         }
-                } else if (callKind instanceof CountCallKind countCallKind) {
+                } else if (polarity instanceof CountingPolarity countingPolarity) {
                         var countVariableName = DNFUtils.generateUniqueName("count");
                         var countPVariable = body.getOrCreateVariableByName(countVariableName);
                         new PatternMatchCounter(body, variablesTuple, translatedReferred, countPVariable);
-                        new ExpressionEvaluation(body, new CountExpressionEvaluator(countVariableName, countCallKind), null);
+                        new ExpressionEvaluation(body, new CountExpressionEvaluator(countVariableName, countingPolarity), null);
                 } else {
-                        throw new IllegalArgumentException("Unknown CallKind: " + callKind);
+                        throw new IllegalArgumentException("Unknown CallKind: " + polarity);
                 }
         }
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java
index 224df362..ea92b223 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java
@@ -438,7 +438,7 @@ class QueryTest {
                                 .clause(
                                                 new RelationViewAtom(personView, p3),
                                                 new RelationViewAtom(personView, p4),
-                                                new CallAtom<>(BasicCallKind.TRANSITIVE, friendPredicate, p3, p4)
+                                                new CallAtom<>(SimplePolarity.TRANSITIVE, friendPredicate, p3, p4)
                                 )
                                 .build();
 
@@ -480,7 +480,7 @@ class QueryTest {
                                 .parameters(p1)
                                 .clause(
                                                 new RelationViewAtom(personView, p1),
-                                                new CallAtom<>(new CountCallKind(ComparisonOperator.EQUALS, 2), called, p1, p2)
+                                                new CallAtom<>(new CountingPolarity(ComparisonOperator.EQUALS, 2), called, p1, p2)
                                 )
                                 .build();