fix: summarize Float and integer to number

Author: MiriamGaus

src/main/java/de/vill/model/Attribute.java

@@ -67,18 +67,16 @@ public String getName() {
      * @return Name of the attribute (never null)
      */
     public String getType() {
-        if (value instanceof Integer) {
-            return Constants.INTEGER; 
-        } else if (value instanceof Boolean) {
+        if (value instanceof Boolean) {
             return Constants.BOOLEAN;
         } else if (value instanceof String) {
             return Constants.STRING;   
         } else if (value instanceof AttributeList) {
             return Constants.ATTRIBUTE_LIST;
-        } else if (value instanceof Float) {
-            return Constants.FLOAT;
-        }else {
-            return Constants.UNDEF;
+        } else if (value instanceof Number) {
+            return Constants.NUMBER;
+        } else {
+            return Constants.UNDEF; 
         }
     }
 

src/main/java/de/vill/model/GlobalAttribute.java

@@ -3,9 +3,7 @@
 import de.vill.model.building.VariableReference;
 import de.vill.util.Constants;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -14,10 +12,10 @@
 public class GlobalAttribute implements VariableReference {
 
     public enum AttributeType {
+        BOOLEAN(Constants.BOOLEAN),
         STRING(Constants.STRING),
-        NUMBER(Constants.NUMBER),
-        BOOLEAN(Constants.BOOLEAN);
-
+        ATTRIBUTE_LIST(Constants.ATTRIBUTE_LIST),
+        NUMBER(Constants.NUMBER);
         private final String name;
 
         AttributeType(String name) {

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

@@ -5,7 +5,6 @@
 import de.vill.model.Feature;
 import de.vill.model.GlobalAttribute;
 import de.vill.model.building.VariableReference;
-import de.vill.util.Constants;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -30,11 +29,7 @@ public String toString(boolean withSubmodels, String currentAlias) {
         return toString(withSubmodels, "aggregateFunction", currentAlias);
     }
 
-    @Override
-    public String getReturnType() {
-        // implement in children
-        return Constants.NUMBER;
-    }
+    abstract public String getReturnType();
 
     @Override
     public List<Expression> getExpressionSubParts() {

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

@@ -3,6 +3,7 @@
 import de.vill.model.Attribute;
 import de.vill.model.Feature;
 import de.vill.model.GlobalAttribute;
+import de.vill.util.Constants;
 
 
 import java.util.Arrays;
@@ -41,6 +42,11 @@ public String toString(boolean withSubmodels, String currentAlias) {
         return super.toString(withSubmodels, "max", currentAlias);
     }
 
+    @Override
+    public String getReturnType() {
+        return Constants.NUMBER;
+    }
+
     @Override
     public List<Expression> getExpressionSubParts() {
         return Arrays.asList();

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

@@ -3,6 +3,7 @@
 import de.vill.model.Attribute;
 import de.vill.model.Feature;
 import de.vill.model.GlobalAttribute;
+import de.vill.util.Constants;
 
 
 import java.util.Arrays;
@@ -42,6 +43,11 @@ public String toString(boolean withSubmodels, String currentAlias) {
         return super.toString(withSubmodels, "min", currentAlias);
     }
 
+    @Override
+    public String getReturnType() {
+        return Constants.NUMBER;
+    }
+
     @Override
     public List<Expression> getExpressionSubParts() {
         return Arrays.asList();

src/main/java/de/vill/util/Constants.java

@@ -2,13 +2,12 @@
 
 public class Constants {
     // Literal Types
-    public static final String INTEGER = "integer";
-    public static final String FLOAT = "float";
     public static final String ATTRIBUTE_LIST = "attribute_list";
     public static final String STRING = "string";
     public static final String BOOLEAN = "boolean";
     public static final String TRUE = "true";
     public static final String UNDEF = "undef";
+    public static final String NUMBER = "number";
 
     // Default attributes
     public static final String TYPE_LEVEL_VALUE = "type_level_value";