Avans/weerstation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXED ALL THE FUCKING THINGS

Browse Source 
Ik haat school... eeuwen met de code bezig, blijven maar foute data uit
komen... blijkt alle data in de database zo'n beetje corrupt te zijn als
je 3 maanden of meer terugkijkt... wat een onzin zeg.
This commit is contained in:
Kenneth van Ewijk
2014-10-20 19:00:42 +02:00
parent d85c47b430
commit 38e5715cd6
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUIboard.java
+19 -2
View File
@@ -172,6 +172,8 @@ public class GUIboard {
clearBottom();
msList = normalizeData(msList, (max-min)/32);
max = StatisticsCalculator.max(msList)+1;
min = StatisticsCalculator.min(msList)-1 > 0 ? StatisticsCalculator.min(msList)-1 : StatisticsCalculator.min(msList);
createAxis(min,max);
@@ -214,7 +216,22 @@ public class GUIboard {
private static ArrayList<Double> normalizeData(ArrayList<Double> data2 , double margin){
ArrayList<Double> data = new ArrayList<Double>(data2);
ArrayList<Double> data = new ArrayList<Double>();
int deler = data2.size() / 256; //Delen door het aantal punten dat je over wil houden.
double avg=0;
for(int q=0;q<data2.size(); q++)
{
if(q%deler==0)
{
avg /= deler;
data.add(avg);
avg=0;
}
avg += data2.get(q);
}
double prevPrevVal = 0.0, prevVal = 0.0, nextVal = 0.0, nextNextVal = 0.0, avrVal = 0.0, setVal = 0.0;
@@ -225,7 +242,7 @@ public class GUIboard {
if(i + 2 < data.size()){
nextNextVal = data.get(i+2);
}
if(prevPrevVal > 0 && prevVal > 0 && nextVal > 0 && nextNextVal > 0){
if(prevPrevVal != 0 && prevVal != 0 && nextVal != 0 && nextNextVal != 0){
avrVal = (prevPrevVal + prevVal + nextVal + nextNextVal) / 4;
if((data.get(i) - avrVal) >= margin){
setVal = avrVal;