diff options
author | 2022-11-19 14:00:12 +0100 | |
---|---|---|
committer | 2022-11-22 16:40:03 +0100 | |
commit | 383137c190cab040d2609f8295ef822c3917b88d (patch) | |
tree | d0d88528de2020da51cb6e92459b84cf63609feb /subprojects/language/src/testFixtures | |
parent | chore(deps): bump dependencies (diff) | |
download | refinery-383137c190cab040d2609f8295ef822c3917b88d.tar.gz refinery-383137c190cab040d2609f8295ef822c3917b88d.tar.zst refinery-383137c190cab040d2609f8295ef822c3917b88d.zip |
feat(language): numeric expressions
Diffstat (limited to 'subprojects/language/src/testFixtures')
5 files changed, 24 insertions, 20 deletions
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java index ad57a438..9e4c59f5 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java | |||
@@ -2,13 +2,13 @@ package tools.refinery.language.model.tests.utils; | |||
2 | 2 | ||
3 | import tools.refinery.language.model.problem.*; | 3 | import tools.refinery.language.model.problem.*; |
4 | 4 | ||
5 | public record WrappedArgument(Argument argument) { | 5 | public record WrappedArgument(Expr expr) { |
6 | public Argument get() { | 6 | public Expr get() { |
7 | return argument; | 7 | return expr; |
8 | } | 8 | } |
9 | 9 | ||
10 | public VariableOrNode variableOrNode() { | 10 | public VariableOrNode variableOrNode() { |
11 | return ((VariableOrNodeArgument) argument).getVariableOrNode(); | 11 | return ((VariableOrNodeExpr) expr).getVariableOrNode(); |
12 | } | 12 | } |
13 | 13 | ||
14 | public Variable variable() { | 14 | public Variable variable() { |
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 2282198d..4aa71b99 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 | |||
@@ -1,20 +1,20 @@ | |||
1 | package tools.refinery.language.model.tests.utils; | 1 | package tools.refinery.language.model.tests.utils; |
2 | 2 | ||
3 | import tools.refinery.language.model.problem.Atom; | 3 | import tools.refinery.language.model.problem.Atom; |
4 | import tools.refinery.language.model.problem.Literal; | 4 | import tools.refinery.language.model.problem.Expr; |
5 | import tools.refinery.language.model.problem.NegativeLiteral; | 5 | import tools.refinery.language.model.problem.NegationExpr; |
6 | 6 | ||
7 | public record WrappedLiteral(Literal literal) { | 7 | public record WrappedLiteral(Expr expr) { |
8 | public Literal get() { | 8 | public Expr get() { |
9 | return literal; | 9 | return expr; |
10 | } | 10 | } |
11 | 11 | ||
12 | public WrappedAtom atom() { | 12 | public WrappedAtom atom() { |
13 | return new WrappedAtom((Atom) literal); | 13 | return new WrappedAtom((Atom) expr); |
14 | } | 14 | } |
15 | 15 | ||
16 | public WrappedAtom negated() { | 16 | public WrappedAtom negated() { |
17 | return new WrappedAtom(((NegativeLiteral) literal).getAtom()); | 17 | return new WrappedAtom((Atom) ((NegationExpr) expr).getBody()); |
18 | } | 18 | } |
19 | 19 | ||
20 | public WrappedArgument arg(int i) { | 20 | public WrappedArgument arg(int i) { |
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java index b390051a..c2f18a60 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java | |||
@@ -4,13 +4,9 @@ import tools.refinery.language.model.problem.Parameter; | |||
4 | import tools.refinery.language.model.problem.ParametricDefinition; | 4 | import tools.refinery.language.model.problem.ParametricDefinition; |
5 | 5 | ||
6 | public interface WrappedParametricDefinition { | 6 | public interface WrappedParametricDefinition { |
7 | public ParametricDefinition get(); | 7 | ParametricDefinition get(); |
8 | |||
9 | public default Parameter param(int i) { | ||
10 | return get().getParameters().get(i); | ||
11 | } | ||
12 | 8 | ||
13 | public default WrappedConjunction conj(int i) { | 9 | default Parameter param(int i) { |
14 | return new WrappedConjunction(get().getBodies().get(i)); | 10 | return get().getParameters().get(i); |
15 | } | 11 | } |
16 | } | 12 | } |
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java index 6b07366d..7b95ecc1 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java | |||
@@ -8,4 +8,8 @@ public record WrappedPredicateDefinition(PredicateDefinition predicateDefinition | |||
8 | public PredicateDefinition get() { | 8 | public PredicateDefinition get() { |
9 | return predicateDefinition; | 9 | return predicateDefinition; |
10 | } | 10 | } |
11 | |||
12 | public WrappedConjunction conj(int i) { | ||
13 | return new WrappedConjunction(predicateDefinition.getBodies().get(i)); | ||
14 | } | ||
11 | } | 15 | } |
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 b9f299f6..a4cf2eaf 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 | |||
@@ -7,7 +7,11 @@ public record WrappedRuleDefinition(RuleDefinition ruleDefinition) implements Wr | |||
7 | public RuleDefinition get() { | 7 | public RuleDefinition get() { |
8 | return ruleDefinition; | 8 | return ruleDefinition; |
9 | } | 9 | } |
10 | 10 | ||
11 | public WrappedConjunction conj(int i) { | ||
12 | return new WrappedConjunction(ruleDefinition.getPreconditions().get(i)); | ||
13 | } | ||
14 | |||
11 | public WrappedConsequent consequent(int i) { | 15 | public WrappedConsequent consequent(int i) { |
12 | return new WrappedConsequent(ruleDefinition.getConsequents().get(i)); | 16 | return new WrappedConsequent(ruleDefinition.getConsequents().get(i)); |
13 | } | 17 | } |