Skip to content
Snippets Groups Projects
Commit fb64fb3d authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Added temp scale conversion methods

parent f7f039f9
No related branches found
No related tags found
No related merge requests found
......@@ -1519,4 +1519,26 @@ public class WeatherUtil {
// Joule is watts * seconds so average output is hourly joule / 3600 seconds
return joulePerSquareCentimeter * 10000 / 3600;
}
/**
* Convert from Fahrenheit to Celcius
*
* @param fahrenheitTemp
* @return
*/
public Double getCelciusFromFahrenheit(Double fahrenheitTemp)
{
return (fahrenheitTemp - 32) / 1.8;
}
/**
* Convert from Celcius to Fahrenheit
*
* @param celciusTemp
* @return
*/
public Double getFahrenheitFromCelcius(Double celciusTemp)
{
return (celciusTemp * 1.8) + 32;
}
}
......@@ -647,6 +647,18 @@ public void testGetFirstObservations()
assertEquals(cal.getTime(), last.getTimeMeasured());
}
public void testGetFahrenheitFromCelciusAndViceVersa()
{
System.out.println("testGetFahrenheitFromCelciusAndViceVersa");
WeatherUtil instance = new WeatherUtil();
Double expResult = 50.0;
Double result = instance.getFahrenheitFromCelcius(10.0);
assertEquals(expResult, result);
expResult = 10.0;
result = instance.getCelciusFromFahrenheit(instance.getFahrenheitFromCelcius(10.0));
assertEquals(expResult, result);
}
/**
* Test of normalizeToExactDate method, of class WeatherUtil.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment