Converted everything to work with polymorphism

Added "Grootheid" to act as a parent to all children classes, it allows the main "Weerstation" to update them all better and with cleaner code.
2014-10-11 17:46:31 +02:00
parent 94cab3188e
commit a0c37c1a23
13 changed files with 340 additions and 776 deletions
@@ -1,94 +1,32 @@
-package weerstation;
-
 import java.util.ArrayList;

-public class AvgWindspeed {
-	
-	//fields
-	private double currentWindSpeed;
-	private double maxWindSpeed;
-	private double minWindSpeed;
-	private double avgWindSpeed;
-	
-	//constructor
-	public AvgWindspeed(Measurement measurement1, ArrayList<Measurement> measurement2){
-		updateRecent(measurement1);
-		update24Hour(measurement2);
-	}
-	
-	//getters & setters
-	public double getCurrentWindSpeed() {
-		return currentWindSpeed;
-	}
-
-	public void setCurrentWindSpeed(double currentWindSpeed) {
-		if(currentWindSpeed >= 0){
-			this.currentWindSpeed = currentWindSpeed;
-		}
-	}
-
-	public double getMaxWindSpeed() {
-		return maxWindSpeed;
-	}
-
-	public void setMaxWindSpeed(double maxWindSpeed) {
-		if(maxWindSpeed >= 0){
-			this.maxWindSpeed = maxWindSpeed;
-		}
-	}
-
-	public double getMinWindSpeed() {
-		return minWindSpeed;
-	}
-
-	public void setMinWindSpeed(double minWindSpeed) {
-		if(minWindSpeed >= 0){
-			this.minWindSpeed = minWindSpeed;
-		}
-	}
-
-	public double getAvgWindSpeed() {
-		return avgWindSpeed;
-	}
-
-	public void setAvgWindSpeed(double avgWindSpeed) {
-		this.avgWindSpeed = Math.round(avgWindSpeed*100)/100;
-	}
-	
-	//Methods
-	private void calculateMaxMinAvgWindSpeed(ArrayList<Measurement> laatste24uur){
-		int max = 0;
-		int min = 1000;
-		float avg = 0;
-		for(Measurement minut :laatste24uur){
-			if(minut.getRawAvgWindSpeed() > max){
-				max = minut.getRawAvgWindSpeed();
-			}
-			if(minut.getRawAvgWindSpeed() <  min){
-				min = minut.getRawAvgWindSpeed();
-			}
-			avg += minut.getRawWindSpeed();
-		}
-		avg /= laatste24uur.size();
-		
-		setAvgWindSpeed(Calculator.windSnelheid((short)avg));
-		setMaxWindSpeed(Calculator.windSnelheid((short)max));
-		setMinWindSpeed(Calculator.windSnelheid((short)min));
-	}
-
-	
-	public void updateRecent(Measurement measurement1){
-		setCurrentWindSpeed(measurement1.getAvgWindSpeed());
-	}
-	public void update24Hour(ArrayList<Measurement> measurement2){
-		calculateMaxMinAvgWindSpeed(measurement2);
-	}
-	
-	public void display(){
-		GUIboard.writeUpperDigits(getCurrentWindSpeed());
-		GUIboard.writeLeftDigits(getMaxWindSpeed());
-		GUIboard.writeRightDigits(getMinWindSpeed());
-		GUIboard.writePageToMatrix("Windsnelheid in m/s", "Gemiddelde: " + avgWindSpeed, "");
-	}
-	
+public class AvgWindspeed extends Grootheid{
+    
+    //constructor
+    public AvgWindspeed(Measurement measurement1, ArrayList<Measurement> measurement2){
+        updateRecent(measurement1);
+        update24Hour(measurement2);
+    }
+    
+    public void updateRecent(Measurement measurement1){
+        setCurrent(measurement1.getAvgWindSpeed());
+    }
+    
+    public void update24Hour(ArrayList<Measurement> measurement2){
+        
+        ArrayList<Double> list = new ArrayList<Double>();
+        
+        for(Measurement ms : measurement2)
+        {
+            list.add(ms.getAvgWindSpeed());
+        }
+        
+        calculateMaxMinAvg(list);
+    }
+    
+    public void display(){
+        super.display();
+        GUIboard.writePageToMatrix("Windsnelheid in m/s", "Gemiddelde: " + getAvg(), "");
+    }
+    
 }