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