diff options
Diffstat (limited to 'subprojects/store-query/src/main')
5 files changed, 10 insertions, 10 deletions
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java index b309f24b..3722f7f9 100644 --- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java +++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java | |||
@@ -100,10 +100,10 @@ public abstract class AbstractCallLiteral extends AbstractLiteral { | |||
100 | if (Objects.equals(target, newTarget)) { | 100 | if (Objects.equals(target, newTarget)) { |
101 | return this; | 101 | return this; |
102 | } | 102 | } |
103 | return internalWithTarget(newTarget); | 103 | return withArguments(newTarget, arguments); |
104 | } | 104 | } |
105 | 105 | ||
106 | protected abstract AbstractCallLiteral internalWithTarget(Constraint newTarget); | 106 | public abstract AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments); |
107 | 107 | ||
108 | @Override | 108 | @Override |
109 | public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) { | 109 | public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) { |
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java index dac34332..a2f8e009 100644 --- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java +++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java | |||
@@ -92,8 +92,8 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral { | |||
92 | } | 92 | } |
93 | 93 | ||
94 | @Override | 94 | @Override |
95 | protected AbstractCallLiteral internalWithTarget(Constraint newTarget) { | 95 | public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) { |
96 | return new AggregationLiteral<>(resultVariable, aggregator, inputVariable, newTarget, getArguments()); | 96 | return new AggregationLiteral<>(resultVariable, aggregator, inputVariable, newTarget, newArguments); |
97 | } | 97 | } |
98 | 98 | ||
99 | @Override | 99 | @Override |
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java index 3a80cefd..1b05943d 100644 --- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java +++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java | |||
@@ -102,8 +102,8 @@ public final class CallLiteral extends AbstractCallLiteral implements CanNegate< | |||
102 | } | 102 | } |
103 | 103 | ||
104 | @Override | 104 | @Override |
105 | protected AbstractCallLiteral internalWithTarget(Constraint newTarget) { | 105 | public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) { |
106 | return new CallLiteral(polarity, newTarget, getArguments()); | 106 | return new CallLiteral(polarity, newTarget, newArguments); |
107 | } | 107 | } |
108 | 108 | ||
109 | @Override | 109 | @Override |
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java index e5f6ac0c..3d078d89 100644 --- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java +++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java | |||
@@ -34,8 +34,8 @@ public class CountLiteral extends AbstractCountLiteral<Integer> { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | @Override | 36 | @Override |
37 | protected AbstractCallLiteral internalWithTarget(Constraint newTarget) { | 37 | public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) { |
38 | return new CountLiteral(getResultVariable(), newTarget, getArguments()); | 38 | return new CountLiteral(getResultVariable(), newTarget, newArguments); |
39 | } | 39 | } |
40 | 40 | ||
41 | @Override | 41 | @Override |
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java index 876ae253..5d57c06c 100644 --- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java +++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java | |||
@@ -77,8 +77,8 @@ public class RepresentativeElectionLiteral extends AbstractCallLiteral { | |||
77 | } | 77 | } |
78 | 78 | ||
79 | @Override | 79 | @Override |
80 | protected AbstractCallLiteral internalWithTarget(Constraint newTarget) { | 80 | public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) { |
81 | return new RepresentativeElectionLiteral(connectivity, newTarget, getArguments()); | 81 | return new RepresentativeElectionLiteral(connectivity, newTarget, newArguments); |
82 | } | 82 | } |
83 | 83 | ||
84 | @Override | 84 | @Override |