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

Changed to avarage windspeed

Browse Source
This commit is contained in:
Kenneth van Ewijk
2014-10-13 14:34:41 +02:00
parent 7a2154f846
commit de7ce1dd45
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Calculator.java
+5 -2
View File
@@ -157,9 +157,12 @@ public class Calculator {
//windchill in graden Celcius
//Janco en Keneth
public static double windChill(short gradenFahrenheit, short mijlPerUur)
public static double windChill(short grdnFh, short mph)
{
short windChill = (short) (35.74 + (0.6215*gradenFahrenheit) - 35.75*Math.pow(mijlPerUur, 0.16) + 0.4275*gradenFahrenheit*Math.pow(mijlPerUur, 0.16));
double gradenFahrenheit = grdnFh;
double mijlPerUur = mph;
double windChill2 = (35.74 + (0.6215*gradenFahrenheit) - 35.75*Math.pow(mijlPerUur, 0.16) + 0.4275*gradenFahrenheit*Math.pow(mijlPerUur, 0.16));
short windChill = (short) windChill2;
return temperatuur(windChill);
}
Measurement.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class Measurement
public String getSunset () { return Calculator.sunSet(sunset); };
// windChill
public double getWindChill () { return round(Calculator.windChill(outsideTemp, windSpeed),2); };
public double getWindChill () { return round(Calculator.windChill(outsideTemp, avgWindSpeed),2); };
// heatIndex
public double getHeatIndex () { return round(Calculator.heatIndex(outsideHum, outsideTemp),0); };