Bläddra i källkod

Will now calculate the mode, median and deviation

jancoow 11 år sedan
förälder
incheckning
cbd4ef9077
1 ändrade filer med 32 tillägg och 1 borttagningar
  1. 32 1
      Grootheid.java

+ 32 - 1
Grootheid.java

@@ -1,3 +1,4 @@
+package weerstation1;
 import java.util.ArrayList;
 
 public class Grootheid
@@ -6,6 +7,9 @@ public class Grootheid
     private double avg;
     private double max;
     private double min;
+    private double mode;
+    private double median;
+    private double deviation;
     private double current;
 
     //constructor
@@ -49,11 +53,38 @@ public class Grootheid
         this.avg = avg;
     }
     
-    //Methods
+    public double getMode() {
+		return mode;
+	}
+
+	public void setMode(double mode) {
+		this.mode = mode;
+	}
+
+	public double getMedian() {
+		return median;
+	}
+
+	public void setMedian(double median) {
+		this.median = median;
+	}
+
+	public double getDeviation() {
+		return deviation;
+	}
+
+	public void setDeviation(double deviation) {
+		this.deviation = deviation;
+	}
+
+	//Methods
     public void calculateMaxMinAvg(ArrayList<Double> array){
         setMax( StatisticsCalculator.max(array) );
         setMin( StatisticsCalculator.min(array) );
         setAvg( StatisticsCalculator.avg(array) );
+        setMedian( StatisticsCalculator.median(array) );
+        setMode( StatisticsCalculator.modus(array) );
+        setDeviation( StatisticsCalculator.afwijking(array) );
     }
 
     public void updateRecent(Measurement measurement1){