From da329ef68104ce8885d2b50f308f58f717de3004 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kenneth@jessweb.nl>
Date: Fri, 17 Oct 2014 10:08:42 +0200
Subject: [PATCH] Added StatsCalculator and Periode Class

---
 Grootheid.java            | 23 +++---------
 Periode.java              |  7 ++++
 StatisticsCalculator.java | 74 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 19 deletions(-)
 create mode 100644 Periode.java
 create mode 100644 StatisticsCalculator.java

diff --git a/Grootheid.java b/Grootheid.java
index 8e84335..0e1bf5c 100644
--- a/Grootheid.java
+++ b/Grootheid.java
@@ -50,25 +50,10 @@ public class Grootheid
     }
     
     //Methods
-    public void calculateMaxMinAvg(ArrayList<Double> laatste24uur){
-        double tempMax = 0;
-        double tempAvg = 0;
-        double tempMin = laatste24uur.get(0);
-        
-        for(double ms : laatste24uur){
-            if(ms > tempMax){
-                tempMax = ms;
-            }
-            if(ms <  tempMin){
-                tempMin = ms;
-            }
-            tempAvg += ms;
-        }
-        tempAvg /= laatste24uur.size();
-        
-        setMax(tempMax);
-        setMin(tempMin);
-        setAvg(tempAvg);
+    public void calculateMaxMinAvg(ArrayList<Double> array){
+        setMax( StatisticsCalculator.max(array) );
+        setMin( StatisticsCalculator.min(array) );
+        setAvg( StatisticsCalculator.avg(array) );
     }
 
     public void updateRecent(Measurement measurement1){
diff --git a/Periode.java b/Periode.java
new file mode 100644
index 0000000..4ca4cad
--- /dev/null
+++ b/Periode.java
@@ -0,0 +1,7 @@
+public class Periode
+{
+    public Periode()
+    {
+
+    }
+}
diff --git a/StatisticsCalculator.java b/StatisticsCalculator.java
new file mode 100644
index 0000000..7c9c81b
--- /dev/null
+++ b/StatisticsCalculator.java
@@ -0,0 +1,74 @@
+import java.util.ArrayList;  
+
+public class StatisticsCalculator {
+    
+    public static double max(ArrayList<Double> array)
+    {
+        double max = 0;
+        
+        for(double waarde : array){
+            if(waarde > max){
+                max = waarde;
+            }
+        }
+        
+        return max;
+    }
+    
+    public static double min(ArrayList<Double> array)
+    {
+        double min = array.get(0);
+        
+        for(double waarde : array){
+            if(waarde < min){
+                min = waarde;
+            }
+        }
+        
+        return min;
+    }
+    
+    public static double avg(ArrayList<Double> array)
+    {
+        double avg = 0;
+        
+        for(double waarde : array){
+            avg += waarde;
+        }
+        avg /= array.size();
+        return avg;
+    }
+    
+    public static Periode langsteDroogstePeriode(ArrayList<Double> array)
+    {
+        Periode periode = new Periode();
+        
+        
+        return periode;
+    }
+    
+    public static Periode langsteDroogstePeriodeMetMax(ArrayList<Double> array, int maxNeerslag)
+    {
+        Periode periode = new Periode();
+        
+        
+        return periode;
+    }
+    
+    public static Periode langsteRegenPeriode(ArrayList<Double> array)
+    {
+        Periode periode = new Periode();
+        
+        
+        return periode;
+    }
+    
+    public static double meesteRegenAchterElkaar(ArrayList<Double> array)
+    {
+        double regenHoeveelheid = 0;
+        
+        
+        return regenHoeveelheid;
+    }
+    
+}