refactor: direct predicates

* Remove the direct keyword because it can be inferred
* Use may/must/current instead of value literals
* Transformation rule changes

5 files changed, 44 insertions, 32 deletions

diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java
new file mode 100644
index 00000000..d176727b
--- /dev/null
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java
@@ -0,0 +1,25 @@
+package tools.refinery.language.model.tests.utils;
+
+import tools.refinery.language.model.problem.Action;
+import tools.refinery.language.model.problem.AssertionAction;
+import tools.refinery.language.model.problem.DeleteAction;
+import tools.refinery.language.model.problem.NewAction;
+import tools.refinery.language.model.problem.VariableOrNode;
+
+public record WrappedAction(Action action) {
+        public Action get() {
+                return action;
+        }
+        
+        public VariableOrNode newVar() {
+                return ((NewAction) action).getVariable();
+        }
+        
+        public VariableOrNode deleteVar() {
+                return ((DeleteAction) action).getVariableOrNode();
+        }
+        
+        public WrappedAtom assertedAtom() {
+                return new WrappedAtom(((AssertionAction) action).getAtom());
+        }
+}
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedActionLiteral.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedActionLiteral.java
deleted file mode 100644
index 1411a7ba..00000000
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedActionLiteral.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tools.refinery.language.model.tests.utils;
-
-import tools.refinery.language.model.problem.ActionLiteral;
-import tools.refinery.language.model.problem.DeleteActionLiteral;
-import tools.refinery.language.model.problem.NewActionLiteral;
-import tools.refinery.language.model.problem.ValueActionLiteral;
-import tools.refinery.language.model.problem.VariableOrNode;
-
-public record WrappedActionLiteral(ActionLiteral actionLiteral) {
-        public ActionLiteral get() {
-                return actionLiteral;
-        }
-        
-        public VariableOrNode newVar() {
-                return ((NewActionLiteral) actionLiteral).getVariable();
-        }
-        
-        public VariableOrNode deleteVar() {
-                return ((DeleteActionLiteral) actionLiteral).getVariableOrNode();
-        }
-        
-        public WrappedAtom valueAtom() {
-                return new WrappedAtom(((ValueActionLiteral) actionLiteral).getAtom());
-        }
-}
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedConsequent.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedConsequent.java
new file mode 100644
index 00000000..46faa7da
--- /dev/null
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedConsequent.java
@@ -0,0 +1,13 @@
+package tools.refinery.language.model.tests.utils;
+
+import tools.refinery.language.model.problem.Consequent;
+
+public record WrappedConsequent(Consequent consequent) {
+        public Consequent get() {
+                return consequent;
+        }
+
+        public WrappedAction action(int i) {
+                return new WrappedAction(consequent.getActions().get(i));
+        }
+}
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
index 95d651e6..2282198d 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
@@ -3,15 +3,14 @@ package tools.refinery.language.model.tests.utils;
 import tools.refinery.language.model.problem.Atom;
 import tools.refinery.language.model.problem.Literal;
 import tools.refinery.language.model.problem.NegativeLiteral;
-import tools.refinery.language.model.problem.ValueLiteral;
 
 public record WrappedLiteral(Literal literal) {
         public Literal get() {
                 return literal;
         }
-
-        public WrappedAtom valueAtom() {
-                return new WrappedAtom(((ValueLiteral) literal).getAtom());
+        
+        public WrappedAtom atom() {
+                return new WrappedAtom((Atom) literal);
         }
 
         public WrappedAtom negated() {
@@ -19,6 +18,6 @@ public record WrappedLiteral(Literal literal) {
         }
 
         public WrappedArgument arg(int i) {
-                return new WrappedAtom((Atom) literal).arg(i);
+                return atom().arg(i);
         }
 }
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
index 53a90dde..b9f299f6 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
@@ -8,7 +8,7 @@ public record WrappedRuleDefinition(RuleDefinition ruleDefinition) implements Wr
                 return ruleDefinition;
         }
         
-        public WrappedActionLiteral actionLit(int i) {
-                return new WrappedActionLiteral(ruleDefinition.getAction().getActionLiterals().get(i));
+        public WrappedConsequent consequent(int i) {
+                return new WrappedConsequent(ruleDefinition.getConsequents().get(i));
         }
 }