"Some" improvements
This commit is contained in:
+7
-22
@@ -1,36 +1,21 @@
|
||||
|
||||
package weerstation1;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Zonsterkte extends Grootheid{
|
||||
public ArrayList<Double> list;
|
||||
|
||||
//constructor
|
||||
//constructor
|
||||
public Zonsterkte(Measurement measurement1, ArrayList<Measurement> measurement2){
|
||||
list = new ArrayList<Double>();
|
||||
updateRecent(measurement1);
|
||||
setName("Zonsterkte");
|
||||
updateRecent(measurement1);
|
||||
updatePeriod(measurement2);
|
||||
}
|
||||
|
||||
|
||||
public void updateRecent(Measurement measurement1){
|
||||
setCurrent(measurement1.getSolarRad());
|
||||
}
|
||||
public void updatePeriod(ArrayList<Measurement> measurement2){
|
||||
createList(measurement2);
|
||||
calculateMaxMin(list);
|
||||
setAvg(StatisticsCalculator.avg(list));
|
||||
}
|
||||
|
||||
public void display(){
|
||||
super.display();
|
||||
GUIboard.clearLeft();
|
||||
GUIboard.clearRight();
|
||||
GUIboard.writePageToMatrix("Zonsterkte", "Gemiddelde: " + getAvg(), "");
|
||||
}
|
||||
|
||||
public void displayGraph()
|
||||
{
|
||||
GUIboard.writeGraphToMatrix(list, getMin(), getMax());
|
||||
maxMin();
|
||||
avg();
|
||||
}
|
||||
|
||||
private void createList(ArrayList<Measurement> measurement2)
|
||||
@@ -42,7 +27,7 @@ public class Zonsterkte extends Grootheid{
|
||||
|
||||
for(Measurement ms : measurement2)
|
||||
{
|
||||
list.add(ms.getSolarRad());
|
||||
list.add((double)ms.getRawSolarRad());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user