Relation.checkIsRelation(Relation)

Author: xeren

dartagnan/src/main/java/com/dat3m/dartagnan/solver/caat4wmm/ExecutionGraph.java

@@ -206,7 +206,7 @@ private Constraint getOrCreateConstraintFromAxiom(Axiom axiom) {
     }
 
     private RelationGraph getOrCreateGraphFromRelation(Relation rel) {
-        rel.checkRelation();
+        Relation.checkIsRelation(rel);
         if (predicateToRelationMap.containsKey(rel)) {
             return (RelationGraph) predicateToRelationMap.get(rel);
         }
@@ -216,7 +216,7 @@ private RelationGraph getOrCreateGraphFromRelation(Relation rel) {
     }
 
     private RelationGraph createGraphFromRelation(Relation rel) {
-        rel.checkRelation();
+        Relation.checkIsRelation(rel);
         final RelationGraph graph;
         final Class<?> relClass = rel.getDefinition().getClass();
         final List<Relation> dependencies = rel.getDependencies();
@@ -269,7 +269,7 @@ private RelationGraph createGraphFromRelation(Relation rel) {
     }
 
     private SetPredicate getOrCreateSetFromRelation(Relation relation) {
-        relation.checkSet();
+        Relation.checkIsSet(relation);
         final CAATPredicate existing = predicateToRelationMap.get(relation);
         if (existing != null) {
             return (SetPredicate) existing;

dartagnan/src/main/java/com/dat3m/dartagnan/solver/caat4wmm/basePredicates/DynamicDefaultWMMGraph.java

@@ -12,8 +12,7 @@ public class DynamicDefaultWMMGraph extends MaterializedWMMGraph {
     private final Relation relation;
 
     public DynamicDefaultWMMGraph(Relation rel) {
-        rel.checkRelation();
-        this.relation = rel;
+        this.relation = Relation.checkIsRelation(rel);
     }
 
     @Override

dartagnan/src/main/java/com/dat3m/dartagnan/solver/caat4wmm/basePredicates/DynamicDefaultWMMSet.java

@@ -12,9 +12,8 @@ public class DynamicDefaultWMMSet extends MaterializedWMMSet {
 
     private final Relation relation;
 
-    public DynamicDefaultWMMSet(Relation rel) {
-        rel.checkSet();
-        this.relation = rel;
+    public DynamicDefaultWMMSet(Relation predicate) {
+        this.relation = Relation.checkIsSet(predicate);
     }
 
     @Override

dartagnan/src/main/java/com/dat3m/dartagnan/verification/model/ExecutionModelManager.java

@@ -246,7 +246,7 @@ private CAATPredicate createPredicate(Relation r) {
     }
 
     private SetPredicate createSet(Relation r) {
-        r.checkSet();
+        Relation.checkIsSet(r);
         SetPredicate set = r.getDependencies().isEmpty() ? new SimpleSet() : r.getDefinition().accept(setBuilder);
         set.setName(r.getNameOrTerm());
         if (!r.isRecursive()) {
@@ -256,7 +256,7 @@ private SetPredicate createSet(Relation r) {
     }
 
     private RelationGraph createGraph(Relation r) {
-        r.checkRelation();
+        Relation.checkIsRelation(r);
         RelationGraph rg = r.getDependencies().isEmpty() ? new SimpleGraph() : r.getDefinition().accept(graphBuilder);
         rg.setName(r.getNameOrTerm());
         if (!r.isRecursive()) {
@@ -266,13 +266,11 @@ private RelationGraph createGraph(Relation r) {
     }
 
     private SetPredicate getOrCreateSet(Relation r) {
-        r.checkSet();
-        return (SetPredicate) getOrCreatePredicate(r);
+        return (SetPredicate) getOrCreatePredicate(Relation.checkIsSet(r));
     }
 
     private RelationGraph getOrCreateGraph(Relation r) {
-        r.checkRelation();
-        return (RelationGraph) getOrCreatePredicate(r);
+        return (RelationGraph) getOrCreatePredicate(Relation.checkIsRelation(r));
     }
 
     private CAATPredicate getOrCreatePredicate(Relation r) {

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/Relation.java

@@ -32,46 +32,28 @@ public enum Arity { UNARY, BINARY }
         this.arity = arity;
     }
 
-    /**
-     * @return {@link Arity#UNARY UNARY} if this instance describes an event set in executions.
-     * {@link Arity#BINARY BINARY} if this instance describes an event relation in executions.
-     */
     public Arity getArity() {
         return arity;
     }
 
-    /**
-     * @return {@code true} if this instance describes an event set in executions.  Otherwise {@code false}.
-     */
     public boolean isSet() {
         return arity == Arity.UNARY;
     }
 
-    /**
-     * @return {@code true} if this instance describes an event relation in executions.  Otherwise {@code false}.
-     */
     public boolean isRelation() {
         return arity == Arity.BINARY;
     }
 
-    /**
-     * @throws IllegalArgumentException This instance does not describe an event set in executions.
-     */
-    public void checkSet() {
-        Preconditions.checkArgument(isSet(), "Non-unary relation %s.", this);
+    public static Relation checkIsSet(Relation relation) {
+        Preconditions.checkArgument(relation.isSet(), "Non-unary relation %s.", relation);
+        return relation;
     }
 
-    /**
-     * @throws IllegalArgumentException This instance does not describe an event relation in executions.
-     */
-    public void checkRelation() {
-        Preconditions.checkArgument(isRelation(), "Non-binary relation %s.", this);
+    public static Relation checkIsRelation(Relation relation) {
+        Preconditions.checkArgument(relation.isRelation(), "Non-binary relation %s.", relation);
+        return relation;
     }
 
-    /**
-     * @param others Instances of this class.
-     * @throws IllegalArgumentException At least one instance in {@code others} has a different arity than this.
-     */
     public void checkEqualArityRelation(Collection<Relation> others) {
         Preconditions.checkArgument(!isSet() || others.stream().allMatch(Relation::isSet),
                 "Non-unary relation in %s", others);

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/axiom/Acyclicity.java

@@ -26,13 +26,11 @@ public class Acyclicity extends Axiom {
     private static final Logger logger = LogManager.getLogger(Acyclicity.class);
 
     public Acyclicity(Relation rel, boolean negated, boolean flag) {
-        super(rel, negated, flag);
-        rel.checkRelation();
+        super(Relation.checkIsRelation(rel), negated, flag);
     }
 
     public Acyclicity(Relation rel) {
-        super(rel, false, false);
-        rel.checkRelation();
+        this(rel, false, false);
     }
 
     // Under-approximates the must-set of (rel+ ; rel).

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/axiom/Irreflexivity.java

@@ -15,13 +15,11 @@
 public class Irreflexivity extends Axiom {
 
     public Irreflexivity(Relation rel, boolean negated, boolean flag) {
-        super(rel, negated, flag);
-        rel.checkRelation();
+        super(Relation.checkIsRelation(rel), negated, flag);
     }
 
     public Irreflexivity(Relation rel) {
-        super(rel, false, false);
-        rel.checkRelation();
+        this(rel, false, false);
     }
 
     @Override

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/definition/AMOPairs.java

@@ -7,8 +7,7 @@
 public class AMOPairs extends Definition {
 
     public AMOPairs(Relation r0) {
-        super(r0, RelationNameRepository.AMO);
-        r0.checkRelation();
+        super(Relation.checkIsRelation(r0), RelationNameRepository.AMO);
     }
 
     @Override

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/definition/CASDependency.java

@@ -8,8 +8,7 @@
 public class CASDependency extends Definition {
 
     public CASDependency(Relation r0) {
-        super(r0, CASDEP);
-        r0.checkRelation();
+        super(Relation.checkIsRelation(r0), CASDEP);
     }
 
     @Override

dartagnan/src/main/java/com/dat3m/dartagnan/wmm/definition/CartesianProduct.java

@@ -11,12 +11,9 @@ public class CartesianProduct extends Definition {
     private final Relation range;
 
     public CartesianProduct(Relation r0, Relation r1, Relation r2) {
-        super(r0, "%s*%s");
-        domain = r1;
-        range = r2;
-        r0.checkRelation();
-        r1.checkSet();
-        r2.checkSet();
+        super(Relation.checkIsRelation(r0), "%s*%s");
+        domain = Relation.checkIsSet(r1);
+        range = Relation.checkIsSet(r2);
     }
 
     public Relation getDomain() { return domain; }