refactor: query terms

* Separate different operators into different classes to make it easier to add
  functionality (e.g., simplification) later.
* Add UpperCardinality terms.
* Move UpperCardinality aggregator and tests into refinery-store-query.

1 files changed, 2 insertions, 7 deletions

diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
index dd7a018d..d6a9e02c 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
@@ -5,11 +5,11 @@
  */
 package tools.refinery.store.reasoning.translator;
 
+import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.substitution.Substitutions;
 
 import java.util.*;
 
@@ -66,14 +66,9 @@ public final class Advice {
         public List<Literal> substitute(List<Variable> substituteParameters) {
                 checkArity(substituteParameters);
                 markProcessed();
-                int arity = parameters.size();
-                var variableMap = new HashMap<Variable, Variable>(arity);
-                for (int i = 0; i < arity; i++) {
-                        variableMap.put(parameters.get(i), substituteParameters.get(i));
-                }
                 // Use a renewing substitution to remove any non-parameter variables and avoid clashed between variables
                 // coming from different advice in the same clause.
-                var substitution = Substitutions.renewing(variableMap);
+                var substitution = Substitution.builder().putManyChecked(parameters, substituteParameters).renewing().build();
                 return literals.stream().map(literal -> literal.substitute(substitution)).toList();
         }