From fb64fb3d8c0038b443ecf83cfa9252f7a7cca39a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 2 Nov 2016 10:50:45 -0700
Subject: [PATCH] Added temp scale conversion methods
---
.../java/no/nibio/vips/util/WeatherUtil.java | 22 +++++++++++++++++++
.../no/nibio/vips/util/WeatherUtilTest.java | 12 ++++++++++
2 files changed, 34 insertions(+)
diff --git a/src/main/java/no/nibio/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java
index cf8c30c..3253b19 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 38b9d8f..0281962 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.
*
--
GitLab