Speed optimalisation and fixed the damn thing!

AvgWindSpeed.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class AvgWindSpeed extends Grootheid{
@@ -7,21 +8,22 @@ public class AvgWindSpeed extends Grootheid{
     public AvgWindSpeed(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getAvgWindSpeed());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setDeviation(StatisticsCalculator.afwijking(list));
     }
     
     public void display(){
         super.display();
-        GUIboard.writePageToMatrix("Gem. Windsnelheid", "Gemiddelde: " + getAvg(), "");
+        GUIboard.writePageToMatrix("Gem. Windsnelheid", "Afwijking: " + getDeviation(), "");
     }
     
     public void displayGraph()

Barometer.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class Barometer extends Grootheid{
@@ -7,21 +8,23 @@ public class Barometer extends Grootheid{
     public Barometer(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
-
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getBarometer());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setMode(StatisticsCalculator.modus(list));
     }
     
     public void display(){
         super.display();
-        GUIboard.writePageToMatrix("Luchtdruk", "Gemiddelde: " + getAvg(), "");
+		GUIboard.clearLeft();
+		GUIboard.clearRight();
+        GUIboard.writePageToMatrix("Luchtdruk", "Modus: " + getMode(), "");
     }
     
     public void displayGraph()

CloudHeight.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class CloudHeight extends Grootheid{
@@ -7,20 +8,23 @@ public class CloudHeight extends Grootheid{
     public CloudHeight(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getCloudHeight());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){
         super.display();
+		GUIboard.clearLeft();
+		GUIboard.clearRight();
         GUIboard.writePageToMatrix("Wolkhoogte", "Gemiddelde: " + getAvg(), "");
     }
     

DewPoint.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class DewPoint extends Grootheid
@@ -8,21 +9,22 @@ public class DewPoint extends Grootheid
     public DewPoint(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getDewPoint());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setMedian(StatisticsCalculator.median(list));
     }
     
     public void display(){
-        GUIboard.writeUpperDigits(getCurrent());
-        GUIboard.writePageToMatrix("Dauwpunt", "Gemiddelde: " + getAvg(), "");
+        super.display();
+        GUIboard.writePageToMatrix("Dauwpunt", "Mediaan: " + getMedian(), "");
     }
     
     public void displayGraph()

Grootheid.java

@@ -1,4 +1,4 @@
-package weerstation1;
+package weerstation;
 import java.util.ArrayList;
 
 public class Grootheid
@@ -14,10 +14,6 @@ public class Grootheid
 
     //constructor
     public Grootheid(){
-        avg = 0;
-        max = 0;
-        min = 0;
-        current = 0;
     }
     
     //getters & setters
@@ -34,7 +30,7 @@ public class Grootheid
     }
 
     public void setMax(double max) {
-        this.max= max;
+        this.max= Math.round(max * 100.0) / 100.0;;
     }
 
     public double getMin() {
@@ -42,7 +38,7 @@ public class Grootheid
     }
 
     public void setMin(double min) {
-        this.min = min;
+        this.min = Math.round(min * 100.0) / 100.0;;
     }
 
     public double getAvg() {
@@ -50,7 +46,7 @@ public class Grootheid
     }
 
     public void setAvg(double avg) {
-        this.avg = avg;
+        this.avg = Math.round(avg * 100.0) / 100.0;
     }
     
     public double getMode() {
@@ -58,7 +54,7 @@ public class Grootheid
 	}
 
 	public void setMode(double mode) {
-		this.mode = mode;
+		this.mode = Math.round(mode * 100.0) / 100.0;
 	}
 
 	public double getMedian() {
@@ -66,7 +62,7 @@ public class Grootheid
 	}
 
 	public void setMedian(double median) {
-		this.median = median;
+		this.median = Math.round(median * 100.0) / 100.0;
 	}
 
 	public double getDeviation() {
@@ -74,23 +70,20 @@ public class Grootheid
 	}
 
 	public void setDeviation(double deviation) {
-		this.deviation = deviation;
+		this.deviation = Math.round(deviation * 100.0) / 100.0;
 	}
 
 	//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 calculateMaxMin(ArrayList<Double> array){
+    	setMax(StatisticsCalculator.max(array));
+    	setMin(StatisticsCalculator.min(array));
     }
 
     public void updateRecent(Measurement measurement1){
 
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         
     }
     
@@ -102,5 +95,6 @@ public class Grootheid
     
     public void displayGraph()
     {
+    	
     }
 }

HeatIndex.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class HeatIndex extends Grootheid{
@@ -6,21 +7,22 @@ public class HeatIndex extends Grootheid{
     public HeatIndex(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getHeatIndex());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setMedian(StatisticsCalculator.median(list));
     }
     
     public void display(){
         super.display();
-        GUIboard.writePageToMatrix("Warmte indexcijfer", "Gemiddelde: " + getAvg(), "");
+        GUIboard.writePageToMatrix("Warmte indexcijfer", "Mediaan: " + getMedian(), "");
     }
     
     public void displayGraph()

InsideHum.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class InsideHum extends Grootheid{
@@ -7,16 +8,17 @@ public class InsideHum extends Grootheid{
     public InsideHum(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getInsideHum());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

InsideTemp.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class InsideTemp extends Grootheid{
@@ -7,16 +8,17 @@ public class InsideTemp extends Grootheid{
     public InsideTemp(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getInsideTemp());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

OutsideHum.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class OutsideHum extends Grootheid{
@@ -7,16 +8,17 @@ public class OutsideHum extends Grootheid{
     public OutsideHum(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getOutsideHum());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

OutsideTemp.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class OutsideTemp extends Grootheid{
@@ -7,16 +8,17 @@ public class OutsideTemp extends Grootheid{
     public OutsideTemp(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getOutsideTemp());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

RainRate.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class RainRate extends Grootheid{
@@ -6,16 +7,17 @@ public class RainRate extends Grootheid{
     public RainRate(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getRainRate());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

Sun.java

@@ -1,3 +1,4 @@
+package weerstation;
  
 
 import java.util.ArrayList;
@@ -36,7 +37,7 @@ public class Sun extends Grootheid{
 		setSunRise(measurement1.getSunrise());
 	}
 	
-	public void update24Hour(ArrayList<Measurement> measurement2){
+	public void updatePeriod(ArrayList<Measurement> measurement2){
 	}
 	
 	public void display(){		

UVLevel.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class UVLevel extends Grootheid{
@@ -7,16 +8,17 @@ public class UVLevel extends Grootheid{
     public UVLevel(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getUVLevel());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

WindChill.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class WindChill extends Grootheid{
@@ -7,16 +8,16 @@ public class WindChill extends Grootheid{
     public WindChill(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
-    
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getWindChill());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){

WindDirection.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class WindDirection extends Grootheid{
@@ -7,21 +8,24 @@ public class WindDirection extends Grootheid{
     public WindDirection(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getRawWindDir());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        setMode(StatisticsCalculator.modus(list));
     }
     
     public void display(){
         super.display();
-        GUIboard.writePageToMatrix("Windrichting", "Gemiddelde: " + getAvg(), "");
+		GUIboard.clearLeft();
+		GUIboard.clearRight();
+
+        GUIboard.writePageToMatrix("Windrichting", "Modus: " + getMode(), "");
     }
     
     public void displayGraph()

Zonsterkte.java

@@ -1,3 +1,4 @@
+package weerstation;
 import java.util.ArrayList;
 
 public class Zonsterkte extends Grootheid{
@@ -7,20 +8,23 @@ public class Zonsterkte extends Grootheid{
     public Zonsterkte(Measurement measurement1, ArrayList<Measurement> measurement2){
         list = new ArrayList<Double>();
         updateRecent(measurement1);
-        update24Hour(measurement2);
+        updatePeriod(measurement2);
     }
 
     
     public void updateRecent(Measurement measurement1){
         setCurrent(measurement1.getSolarRad());
     }
-    public void update24Hour(ArrayList<Measurement> measurement2){
+    public void updatePeriod(ArrayList<Measurement> measurement2){
         createList(measurement2);
-        calculateMaxMinAvg(list);
+        calculateMaxMin(list);
+        setAvg(StatisticsCalculator.avg(list));
     }
     
     public void display(){
         super.display();
+		GUIboard.clearLeft();
+		GUIboard.clearRight();
         GUIboard.writePageToMatrix("Zonsterkte", "Gemiddelde: " + getAvg(), "");
     }