From a636a86accf0ed00d0700e04ac0e1ce4f8cadf64 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 10 Mar 2024 02:11:15 +0100 Subject: refactor(logic): abstract domain interface Require all abstract domain elements to implement the AbstractValue interface. --- .../tools/refinery/language/semantics/internal/DecisionTreeValue.java | 2 +- .../java/tools/refinery/language/semantics/internal/TerminalNode.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'subprojects/language-semantics/src/main') diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java index 3260ef3d..a6b55989 100644 --- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java +++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java @@ -25,7 +25,7 @@ public enum DecisionTreeValue { } public TruthValue merge(TruthValue other) { - return truthValue == null ? other : truthValue.merge(other); + return truthValue == null ? other : truthValue.meet(other); } public DecisionTreeValue overwrite(DecisionTreeValue other) { diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java index 2ebaecef..75933fe4 100644 --- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java +++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java @@ -48,7 +48,7 @@ class TerminalNode extends DecisionTreeNode { protected void mergeAllValues(int nextLevel, Tuple tuple, TruthValue value) { otherwise = DecisionTreeValue.fromTruthValue(otherwise.merge(value)); children = IntObjectMaps.mutable.from(children.keyValuesView(), IntObjectPair::getOne, - pair -> pair.getTwo().merge(value)); + pair -> pair.getTwo().meet(value)); reduceChildren(); } -- cgit v1.2.3-70-g09d2