diff --git a/src/main/java/no/nibio/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java index cf8c30cf2e3a206b40b2483bfad83cfc0f31befa..3253b192d2d3c6562d62dfd4b9e68809a9fa7222 100644 --- a/src/main/java/no/nibio/vips/util/WeatherUtil.java +++ b/src/main/java/no/nibio/vips/util/WeatherUtil.java @@ -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; + } } diff --git a/src/test/java/no/nibio/vips/util/WeatherUtilTest.java b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java index 38b9d8fc4c2c19c79d1d305ee336703dbeda6e68..02819625521e4e766471ed8fe0bd70ff26b5434b 100644 --- a/src/test/java/no/nibio/vips/util/WeatherUtilTest.java +++ b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java @@ -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. *