Resolved issues following merge

Author: SundermannC

src/main/java/de/vill/model/building/AutomaticBrackets.java

@@ -54,7 +54,7 @@ private AutomaticBrackets() {}
         expressionPrecedenceLookup.put(MaxAggregateFunctionExpression.class, 2);
         expressionPrecedenceLookup.put(MinAggregateFunctionExpression.class, 2);
         expressionPrecedenceLookup.put(SumAggregateFunctionExpression.class, 2);
-        expressionPrecedenceLookup.put(ParenthesisConstraint.class, 2);
+        expressionPrecedenceLookup.put(ParenthesisExpression.class, 2);
 
         expressionPrecedenceLookup.put(LiteralExpression.class, 2);
         expressionPrecedenceLookup.put(NumberExpression.class, 2);

src/main/java/de/vill/model/expression/AggregateFunctionExpression.java

@@ -11,12 +11,21 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static de.vill.util.Util.addNecessaryQuotes;
 public abstract class AggregateFunctionExpression extends Expression {
 
     protected GlobalAttribute attribute;
     protected Feature rootFeature;
 
+
+    public AggregateFunctionExpression(GlobalAttribute attribute) {
+        this.attribute = attribute;
+    }
+
+    public AggregateFunctionExpression(GlobalAttribute attribute, Feature rootFeature) {
+        this(attribute);
+        this.rootFeature = rootFeature;
+    }
+    
     @Override
     public String toString(boolean withSubmodels, String currentAlias) {
         return toString(withSubmodels, "aggregateFunction", currentAlias);
@@ -98,9 +107,4 @@ public boolean equals(Object obj) {
     public List<VariableReference> getReferences() {
         return List.of(attribute);
     }
-
-    @Override
-    public Expression clone(){
-        return new AggregateFunctionExpression(attribute, rootFeature);
-    }
 }

src/main/java/de/vill/model/expression/AvgAggregateFunctionExpression.java

@@ -51,4 +51,9 @@ public List<Expression> getExpressionSubParts() {
     public String getReturnType() {
         return Constants.NUMBER;
     }
+
+    @Override
+    public Expression clone() {
+        return new AvgAggregateFunctionExpression(attribute, rootFeature);
+    }
 }

src/main/java/de/vill/model/expression/MaxAggregateFunctionExpression.java

@@ -51,4 +51,9 @@ public String getReturnType() {
     public List<Expression> getExpressionSubParts() {
         return Arrays.asList();
     }
+
+    @Override
+    public Expression clone() {
+        return new MaxAggregateFunctionExpression(attribute, rootFeature);
+    }
 }

src/main/java/de/vill/model/expression/MinAggregateFunctionExpression.java

@@ -52,4 +52,9 @@ public String getReturnType() {
     public List<Expression> getExpressionSubParts() {
         return Arrays.asList();
     }
+
+    @Override
+    public Expression clone() {
+        return new MinAggregateFunctionExpression(attribute, rootFeature);
+    }
 }

src/main/java/de/vill/model/expression/SumAggregateFunctionExpression.java

@@ -49,4 +49,8 @@ public List<Expression> getExpressionSubParts() {
     public String getReturnType() {
         return Constants.NUMBER;
     }
+    @Override
+    public Expression clone() {
+        return new SumAggregateFunctionExpression(attribute, rootFeature);
+    }
 }