fix: resolved merge conflict

Julia Pham · Julia Pham · commit 295f84202476 · 2025-12-15T16:29:15.000+01:00
diff --git a/src/main/java/de/vill/model/constraint/AndConstraint.java b/src/main/java/de/vill/model/constraint/AndConstraint.java
@@ -2,6 +2,7 @@
 
 import de.vill.model.building.AutomaticBrackets;
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import de.vill.exception.ParseError;
 
@@ -71,7 +72,7 @@ public void setRight(Constraint right) {
     public String toString(boolean withSubmodels, String currentAlias) {
         return children.stream()
                 .map(c -> AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, c, withSubmodels, currentAlias))
-                .collect(Collectors.joining(" & "));
+                .collect(Collectors.joining(" " + ConstantSymbols.AND + " "));
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/EqualEquationConstraint.java b/src/main/java/de/vill/model/constraint/EqualEquationConstraint.java
@@ -2,14 +2,15 @@
 
 import de.vill.model.building.VariableReference;
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class EqualEquationConstraint extends ExpressionConstraint {
 
     public EqualEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, "==");
+        super(left, right, ConstantSymbols.EQUALS);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/EquivalenceConstraint.java b/src/main/java/de/vill/model/constraint/EquivalenceConstraint.java
@@ -2,6 +2,7 @@
 
 import de.vill.model.building.AutomaticBrackets;
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +29,7 @@ public Constraint getRight() {
     @Override
     public String toString(boolean withSubmodels, String currentAlias) {
         return AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, left, withSubmodels, currentAlias) +
-                " <=> " +
+                " " + ConstantSymbols.EQUIVALENT + " " +
                 AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, right, withSubmodels, currentAlias);
     }
 
diff --git a/src/main/java/de/vill/model/constraint/ExpressionConstraint.java b/src/main/java/de/vill/model/constraint/ExpressionConstraint.java
@@ -3,6 +3,7 @@
 import de.vill.model.Feature;
 import de.vill.model.building.VariableReference;
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
 
 import java.util.*;
 
@@ -75,17 +76,17 @@ public boolean evaluate(Set<Feature> selectedFeatures) {
             return false;
         }
 
-        if ("==".equals(expressionSymbol)) {
+        if (ConstantSymbols.EQUALS.equals(expressionSymbol)) {
             return leftResult == rightResult;
-        } else if ("<".equals(expressionSymbol)) {
+        } else if (ConstantSymbols.LOWER.equals(expressionSymbol)) {
             return leftResult < rightResult;
-        } else if (">".equals(expressionSymbol)) {
+        } else if (ConstantSymbols.GREATER.equals(expressionSymbol)) {
             return leftResult > rightResult;
-        } else if (">=".equals(expressionSymbol)) {
+        } else if (ConstantSymbols.GREATER_OR_EQUAL.equals(expressionSymbol)) {
             return leftResult >= rightResult;
-        } else if ("<=".equals(expressionSymbol)) {
+        } else if (ConstantSymbols.LOWER_OR_EQUAL.equals(expressionSymbol)) {
             return leftResult <= rightResult;
-        } else if ("!=".equals(expressionSymbol)) {
+        } else if (ConstantSymbols.NOT_EQUALS.equals(expressionSymbol)) {
             return leftResult != rightResult;
         }
         return false;
diff --git a/src/main/java/de/vill/model/constraint/GreaterEqualsEquationConstraint.java b/src/main/java/de/vill/model/constraint/GreaterEqualsEquationConstraint.java
@@ -2,14 +2,15 @@
 
 import de.vill.model.building.VariableReference;
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class GreaterEqualsEquationConstraint extends ExpressionConstraint {
     public GreaterEqualsEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, ">=");
+        super(left, right, ConstantSymbols.GREATER_OR_EQUAL);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/GreaterEquationConstraint.java b/src/main/java/de/vill/model/constraint/GreaterEquationConstraint.java
@@ -2,14 +2,15 @@
 
 import de.vill.model.building.VariableReference;
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class GreaterEquationConstraint extends ExpressionConstraint {
     public GreaterEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, ">");
+        super(left, right, ConstantSymbols.GREATER);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/ImplicationConstraint.java b/src/main/java/de/vill/model/constraint/ImplicationConstraint.java
@@ -2,6 +2,7 @@
 
 import de.vill.model.building.AutomaticBrackets;
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +29,7 @@ public Constraint getRight() {
     @Override
     public String toString(boolean withSubmodels, String currentAlias) {
         return AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, left, withSubmodels, currentAlias) +
-                " => " +
+                " " + ConstantSymbols.IMPLIES + " " +
                 AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, right, withSubmodels, currentAlias);
     }
 
diff --git a/src/main/java/de/vill/model/constraint/LowerEqualsEquationConstraint.java b/src/main/java/de/vill/model/constraint/LowerEqualsEquationConstraint.java
@@ -1,12 +1,14 @@
 package de.vill.model.constraint;
 
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
+
 import java.util.Collections;
 import java.util.List;
 
 public class LowerEqualsEquationConstraint extends ExpressionConstraint {
     public LowerEqualsEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, "<=");
+        super(left, right, ConstantSymbols.LOWER_OR_EQUAL);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/LowerEquationConstraint.java b/src/main/java/de/vill/model/constraint/LowerEquationConstraint.java
@@ -1,12 +1,14 @@
 package de.vill.model.constraint;
 
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
+
 import java.util.Collections;
 import java.util.List;
 
 public class LowerEquationConstraint extends ExpressionConstraint {
     public LowerEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, "<");
+        super(left, right, ConstantSymbols.LOWER);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/MultiOrConstraint.java b/src/main/java/de/vill/model/constraint/MultiOrConstraint.java
diff --git a/src/main/java/de/vill/model/constraint/NotConstraint.java b/src/main/java/de/vill/model/constraint/NotConstraint.java
@@ -1,6 +1,7 @@
 package de.vill.model.constraint;
 
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import java.util.Arrays;
 import java.util.List;
@@ -20,13 +21,13 @@ public Constraint getContent() {
     @Override
     public String toString(boolean withSubmodels, String currentAlias) {
         StringBuilder result = new StringBuilder();
-        result.append("!");
+        result.append(ConstantSymbols.NOT);
         if (content instanceof VariableReference || content instanceof ParenthesisConstraint) {
             result.append(content.toString(withSubmodels, currentAlias));
         } else {
-            result.append("(");
+            result.append(ConstantSymbols.PAREN_OPEN);
             result.append(content.toString(withSubmodels, currentAlias));
-            result.append(")");
+            result.append(ConstantSymbols.PAREN_CLOSE);
         }
         return result.toString();
     }
diff --git a/src/main/java/de/vill/model/constraint/NotEqualsEquationConstraint.java b/src/main/java/de/vill/model/constraint/NotEqualsEquationConstraint.java
@@ -1,12 +1,14 @@
 package de.vill.model.constraint;
 
 import de.vill.model.expression.Expression;
+import de.vill.util.ConstantSymbols;
+
 import java.util.Collections;
 import java.util.List;
 
 public class NotEqualsEquationConstraint extends ExpressionConstraint {
     public NotEqualsEquationConstraint(final Expression left, final Expression right) {
-        super(left, right, "!=");
+        super(left, right, ConstantSymbols.NOT_EQUALS);
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/OrConstraint.java b/src/main/java/de/vill/model/constraint/OrConstraint.java
@@ -3,6 +3,7 @@
 import de.vill.exception.ParseError;
 import de.vill.model.building.AutomaticBrackets;
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,7 +71,7 @@ public void setRight(Constraint right) {
     public String toString(boolean withSubmodels, String currentAlias) {
         return children.stream()
                 .map(c -> AutomaticBrackets.enforceConstraintBracketsIfNecessary(this, c, withSubmodels, currentAlias))
-                .collect(Collectors.joining(" | "));
+                .collect(Collectors.joining(" " + ConstantSymbols.OR + " "));
     }
 
     @Override
diff --git a/src/main/java/de/vill/model/constraint/ParenthesisConstraint.java b/src/main/java/de/vill/model/constraint/ParenthesisConstraint.java
@@ -1,6 +1,7 @@
 package de.vill.model.constraint;
 
 import de.vill.model.building.VariableReference;
+import de.vill.util.ConstantSymbols;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,9 +20,9 @@ public Constraint getContent() {
 
     @Override
     public String toString(boolean withSubmodels, String currentAlias) {
-        return "(" +
+        return ConstantSymbols.PAREN_OPEN +
                 content.toString(withSubmodels, currentAlias) +
-                ")";
+                ConstantSymbols.PAREN_CLOSE;
     }
 
     @Override
diff --git a/src/main/java/de/vill/util/ConstantSymbols.java b/src/main/java/de/vill/util/ConstantSymbols.java
@@ -0,0 +1,24 @@
+package de.vill.util;
+
+public class ConstantSymbols {
+
+    // Logical operators
+    public static final String OR = "|";
+    public static final String AND = "&";
+    public static final String NOT = "!";
+    public static final String IMPLIES = "=>";
+    public static final String EQUIVALENT = "<=>";
+
+    // Comparison
+    public static final String EQUALS = "==";
+    public static final String NOT_EQUALS = "!=";
+    public static final String GREATER = ">";
+    public static final String LOWER = "<";
+    public static final String GREATER_OR_EQUAL = ">=";
+    public static final String LOWER_OR_EQUAL = "<=";
+
+    //Parenthesis
+    public static final String PAREN_OPEN = "(";
+    public static final String PAREN_CLOSE = ")";
+
+}
