aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/language/src/main
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <marussy@mit.bme.hu>2024-08-01 20:08:28 +0200
committerLibravatar Kristóf Marussy <marussy@mit.bme.hu>2024-08-01 20:10:45 +0200
commit02261dc368cb0c9e5ed681ad6a26d955e82465dd (patch)
treed27dcf3de1725d7ccb19a211f4b4ba6d68dc01bf /subprojects/language/src/main
parentfeat(language): base predicate validation (diff)
downloadrefinery-02261dc368cb0c9e5ed681ad6a26d955e82465dd.tar.gz
refinery-02261dc368cb0c9e5ed681ad6a26d955e82465dd.tar.zst
refinery-02261dc368cb0c9e5ed681ad6a26d955e82465dd.zip
fix(reasoning): default false base predicvate translation
Diffstat (limited to 'subprojects/language/src/main')
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java5
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java2
2 files changed, 2 insertions, 5 deletions
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
index dcd1651c..55b0ca60 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
@@ -115,9 +115,6 @@ public final class ProblemUtil {
115 } 115 }
116 116
117 public static boolean isDerivedStatePredicate(PredicateDefinition predicateDefinition) { 117 public static boolean isDerivedStatePredicate(PredicateDefinition predicateDefinition) {
118 if (predicateDefinition == null || isBuiltIn(predicateDefinition)) {
119 return true;
120 }
121 var containingFeature = predicateDefinition.eContainingFeature(); 118 var containingFeature = predicateDefinition.eContainingFeature();
122 return containingFeature == ProblemPackage.Literals.REFERENCE_DECLARATION__INVALID_MULTIPLICITY || 119 return containingFeature == ProblemPackage.Literals.REFERENCE_DECLARATION__INVALID_MULTIPLICITY ||
123 containingFeature == ProblemPackage.Literals.PREDICATE_DEFINITION__COMPUTED_VALUE; 120 containingFeature == ProblemPackage.Literals.PREDICATE_DEFINITION__COMPUTED_VALUE;
@@ -149,7 +146,7 @@ public final class ProblemUtil {
149 public static boolean isContainmentReference(ReferenceDeclaration referenceDeclaration) { 146 public static boolean isContainmentReference(ReferenceDeclaration referenceDeclaration) {
150 return referenceDeclaration.getKind() == ReferenceKind.CONTAINMENT; 147 return referenceDeclaration.getKind() == ReferenceKind.CONTAINMENT;
151 } 148 }
152; 149
153 public static boolean isContainerReference(ReferenceDeclaration referenceDeclaration) { 150 public static boolean isContainerReference(ReferenceDeclaration referenceDeclaration) {
154 var kind = referenceDeclaration.getKind(); 151 var kind = referenceDeclaration.getKind();
155 if (kind == null) { 152 if (kind == null) {
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 87fa7a34..74a6a0fc 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -382,7 +382,7 @@ public class ProblemValidator extends AbstractProblemValidator {
382 382
383 @Check 383 @Check
384 public void checkPredicateDefinition(PredicateDefinition predicateDefinition) { 384 public void checkPredicateDefinition(PredicateDefinition predicateDefinition) {
385 if (ProblemUtil.isDerivedStatePredicate(predicateDefinition)) { 385 if (ProblemUtil.isBuiltIn(predicateDefinition) || ProblemUtil.isDerivedStatePredicate(predicateDefinition)) {
386 return; 386 return;
387 } 387 }
388 String message = null; 388 String message = null;