From 64e80eeb547153613654a3af2648701951bd24d9 Mon Sep 17 00:00:00 2001 From: jancoow Date: Mon, 20 Oct 2014 21:19:39 +0200 Subject: [PATCH] Speed optimalisation and fixed the damn thing! --- LangsteZomerPeriode.java | 7 ++++--- MaximaleRegenPeriode.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/LangsteZomerPeriode.java b/LangsteZomerPeriode.java index 79cd8c2..84f6bb3 100644 --- a/LangsteZomerPeriode.java +++ b/LangsteZomerPeriode.java @@ -1,3 +1,4 @@ +package weerstation; import java.util.ArrayList; public class LangsteZomerPeriode extends Grootheid{ @@ -9,16 +10,16 @@ public class LangsteZomerPeriode extends Grootheid{ list = new ArrayList(); zomerPeriode = new Periode(); updateRecent(measurement1); - update24Hour(measurement2); + updatePeriod(measurement2); } public void updateRecent(Measurement measurement1){ setCurrent(measurement1.getOutsideTemp()); } - public void update24Hour(ArrayList measurement2){ + public void updatePeriod(ArrayList measurement2){ createList(measurement2); - calculateMaxMinAvg(list); + calculateMaxMin(list); int[] index = StatisticsCalculator.langsteZomersePeriode(list); zomerPeriode = Calculator.timeStampToPeriode( measurement2.get(index[0]).getDateStamp(), measurement2.get(index[1]).getDateStamp()); diff --git a/MaximaleRegenPeriode.java b/MaximaleRegenPeriode.java index 73295e4..1351ff2 100644 --- a/MaximaleRegenPeriode.java +++ b/MaximaleRegenPeriode.java @@ -1,3 +1,4 @@ +package weerstation; import java.util.ArrayList; public class MaximaleRegenPeriode extends Grootheid{ @@ -7,16 +8,16 @@ public class MaximaleRegenPeriode extends Grootheid{ public MaximaleRegenPeriode(Measurement measurement1, ArrayList measurement2){ list = new ArrayList(); updateRecent(measurement1); - update24Hour(measurement2); + updatePeriod(measurement2); } public void updateRecent(Measurement measurement1){ setCurrent(measurement1.getRainRate()); } - public void update24Hour(ArrayList measurement2){ + public void updatePeriod(ArrayList measurement2){ createList(measurement2); - calculateMaxMinAvg(list); + calculateMaxMin(list); } public void display(){