Revize f30ebb74

re #8113 re #7885 all functions implemented, contingency table generation improved; re #8154 value filtering added; no comments

src/main/java/vldc/aswi/model/table/ValueFunction.java

@@ -6 +6 @@
  */
 public class ValueFunction {
 
+    private double totalResult = 0.0;
+
+    private double totalResultAvg;
+
+    private double totalResultAvgSum;
+
+    private double totalResultSum;
+
+    private double totalMin;
+
+    private double totalMax;
+
+    private boolean isFirstMin = true;
+
+    private boolean isFirstMax = true;
+
     /**
      * Value
      */
-    private String value;
+    private String nameOfSelect;
+
+    private String name;
+
     /**
      * Function
      */
     private String function;
 
+    private String type;
+
     /**
      * Creates an instance of the class
-     * @param value value
+     * @param nameOfSelect value
      * @param function function
      */
-    public ValueFunction(String value, String function) {
-        this.value = value;
+    public ValueFunction(String nameOfSelect, String name, String function, String type) {
+        this.nameOfSelect = nameOfSelect;
+        this.name = name;
         this.function = function;
+        this.type = type;
     }
 
     /**
      * Gets value.
      * @return value
      */
-    public String getValue() {
-        return value;
+    public String getNameOfSelect() {
+        return nameOfSelect;
     }
 
     /**
      * Sets value.
-     * @param value value
+     * @param nameOfSelect value
      */
-    public void setValue(String value) {
-        this.value = value;
+    public void setNameOfSelect(String nameOfSelect) {
+        this.nameOfSelect = nameOfSelect;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     /**
@@ -56 +87 @@
     public void setFunction(String function) {
         this.function = function;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public double getTotalResult() {
+        return totalResult;
+    }
+
+    public void setTotalResult(double totalResult) {
+        this.totalResult = totalResult;
+    }
+
+    public double getTotalResultAvg() {
+        return totalResultAvg;
+    }
+
+    public void setTotalResultAvg(double totalResultAvg) {
+        this.totalResultAvg = totalResultAvg;
+    }
+
+    public double getTotalResultAvgSum() {
+        return totalResultAvgSum;
+    }
+
+    public void setTotalResultAvgSum(double totalResultAvgSum) {
+        this.totalResultAvgSum = totalResultAvgSum;
+    }
+
+    public double getTotalResultSum() {
+        return totalResultSum;
+    }
+
+    public void setTotalResultSum(double totalResultSum) {
+        this.totalResultSum = totalResultSum;
+    }
+
+    public double getTotalMin() {
+        return totalMin;
+    }
+
+    public void setTotalMin(double totalMin) {
+        this.totalMin = totalMin;
+    }
+
+    public double getTotalMax() {
+        return totalMax;
+    }
+
+    public void setTotalMax(double totalMax) {
+        this.totalMax = totalMax;
+    }
+
+    public boolean isFirstMin() {
+        return isFirstMin;
+    }
+
+    public void setFirstMin(boolean firstMin) {
+        isFirstMin = firstMin;
+    }
+
+    public boolean isFirstMax() {
+        return isFirstMax;
+    }
+
+    public void setFirstMax(boolean firstMax) {
+        isFirstMax = firstMax;
+    }
 }