Make unit conversions more accurate and rename temperature units

Signed-off-by: Kyle Corry <[email protected]>

Author: kylecorry31

src/main/kotlin/com/kylecorry/sol/units/Distance.kt

@@ -12,7 +12,7 @@ value class Distance private constructor(private val measure: Measure) : Compara
     fun convertTo(newUnits: DistanceUnits): Distance {
         val m = value * units.meters
         val newDistance = m / newUnits.meters
-        return from(newDistance, newUnits)
+        return from(newDistance.toFloat(), newUnits)
     }
 
     fun meters(): Distance {
@@ -23,6 +23,10 @@ value class Distance private constructor(private val measure: Measure) : Compara
         return from(multiplier * multiplier, units)
     }
 
+    override fun toString(): String {
+        return "$value $units"
+    }
+
     companion object {
 
         fun meters(distance: Float): Distance {

src/main/kotlin/com/kylecorry/sol/units/DistanceUnits.kt

@@ -1,14 +1,14 @@
 package com.kylecorry.sol.units
 
-enum class DistanceUnits(val id: Int, val meters: Float, val isMetric: Boolean) {
-    Centimeters(1, 0.01f, true),
-    Inches(2, 1 / (3.28084f * 12f), false),
-    Miles(3, 5280f / 3.28084f, false),
-    Yards(4, 0.9144f, false),
-    Feet(5, 1 / 3.28084f, false),
-    Kilometers(6, 1000f, true),
-    Meters(7, 1f, true),
-    NauticalMiles(8, 1852f, false),
-    Millimeters(9, 0.001f, true),
-    Caliber(10, 0.0254f, false),
+enum class DistanceUnits(val id: Int, val meters: Double, val isMetric: Boolean) {
+    Centimeters(1, 0.01, true),
+    Inches(2, 1 / (3.28084 * 12), false),
+    Miles(3, 5280 / 3.28084, false),
+    Yards(4, 0.9144, false),
+    Feet(5, 1 / 3.28084, false),
+    Kilometers(6, 1000.0, true),
+    Meters(7, 1.0, true),
+    NauticalMiles(8, 1852.0, false),
+    Millimeters(9, 0.001, true),
+    Caliber(10, 0.0254, false),
 }

src/main/kotlin/com/kylecorry/sol/units/Energy.kt

@@ -13,7 +13,11 @@ value class Energy private constructor(private val measure: Measure) {
             return this
         }
         val joules = value * units.joules
-        return from(joules / newUnits.joules, newUnits)
+        return from((joules / newUnits.joules).toFloat(), newUnits)
+    }
+
+    override fun toString(): String {
+        return "$value $units"
     }
 
     fun joules(): Energy {

src/main/kotlin/com/kylecorry/sol/units/EnergyUnits.kt

@@ -1,6 +1,6 @@
 package com.kylecorry.sol.units
 
-enum class EnergyUnits(val id: Int, val joules: Float, val isMetric: Boolean) {
-    Joules(1, 1f, true),
-    FootPounds(2, 1.355818f, false),
+enum class EnergyUnits(val id: Int, val joules: Double, val isMetric: Boolean) {
+    Joules(1, 1.0, true),
+    FootPounds(2, 1.355818, false),
 }

src/main/kotlin/com/kylecorry/sol/units/Pressure.kt

@@ -14,13 +14,17 @@ value class Pressure private constructor(private val measure: Measure) : Compara
         }
         val hpa = value * units.hpa
         val newPressure = hpa / toUnits.hpa
-        return from(newPressure, toUnits)
+        return from(newPressure.toFloat(), toUnits)
     }
 
     fun hpa(): Pressure {
         return convertTo(PressureUnits.Hpa)
     }
 
+    override fun toString(): String {
+        return "$value $units"
+    }
+
     override fun compareTo(other: Pressure): Int {
         val hpa = hpa().value
         val otherHpa = other.hpa().value

src/main/kotlin/com/kylecorry/sol/units/PressureUnits.kt

@@ -1,9 +1,9 @@
 package com.kylecorry.sol.units
 
-enum class PressureUnits(val id: Int, val hpa: Float) {
-    Hpa(1, 1f),
-    Mbar(2, 1f),
-    Inhg(3, 1 / 0.02953f),
-    Psi(4, 1 / 0.014503774f),
-    MmHg(5, 1.3332239f)
+enum class PressureUnits(val id: Int, val hpa: Double) {
+    Hpa(1, 1.0),
+    Mbar(2, 1.0),
+    Inhg(3, 1 / 0.02953),
+    Psi(4, 1 / 0.014503774),
+    MmHg(5, 1.3332239)
 }

src/main/kotlin/com/kylecorry/sol/units/Speed.kt

@@ -12,7 +12,11 @@ value class Speed private constructor(private val measure: Measure) {
     fun convertTo(newDistanceUnits: DistanceUnits, newTimeUnits: TimeUnits): Speed {
         val distance = Distance.from(speed, distanceUnits).convertTo(newDistanceUnits).value
         val newSpeed = (distance / timeUnits.seconds) * newTimeUnits.seconds
-        return from(newSpeed, newDistanceUnits, newTimeUnits)
+        return from(newSpeed.toFloat(), newDistanceUnits, newTimeUnits)
+    }
+
+    override fun toString(): String {
+        return "$speed $distanceUnits / $timeUnits"
     }
 
     companion object {

src/main/kotlin/com/kylecorry/sol/units/Temperature.kt

@@ -14,20 +14,24 @@ value class Temperature private constructor(private val measure: Measure) : Comp
         }
 
         val c = when (units) {
-            TemperatureUnits.C -> value
-            TemperatureUnits.F -> (value - 32) * 5 / 9
+            TemperatureUnits.Celsius -> value.toDouble()
+            TemperatureUnits.Fahrenheit -> (value - 32) * 5 / 9.0
         }
 
         val newTemp = when (toUnits) {
-            TemperatureUnits.C -> c
-            TemperatureUnits.F -> (c * 9 / 5) + 32
+            TemperatureUnits.Celsius -> c
+            TemperatureUnits.Fahrenheit -> (c * 9 / 5.0) + 32
         }
 
-        return from(newTemp, toUnits)
+        return from(newTemp.toFloat(), toUnits)
     }
 
     fun celsius(): Temperature {
-        return convertTo(TemperatureUnits.C)
+        return convertTo(TemperatureUnits.Celsius)
+    }
+
+    override fun toString(): String {
+        return "$value $units"
     }
 
     override fun compareTo(other: Temperature): Int {
@@ -42,11 +46,11 @@ value class Temperature private constructor(private val measure: Measure) : Comp
         }
 
         fun celsius(temperature: Float): Temperature {
-            return from(temperature, TemperatureUnits.C)
+            return from(temperature, TemperatureUnits.Celsius)
         }
 
         fun fahrenheit(temperature: Float): Temperature {
-            return from(temperature, TemperatureUnits.F)
+            return from(temperature, TemperatureUnits.Fahrenheit)
         }
     }
 }

src/main/kotlin/com/kylecorry/sol/units/TemperatureUnits.kt

@@ -1,5 +1,6 @@
 package com.kylecorry.sol.units
 
 enum class TemperatureUnits(val id: Int) {
-    F(1), C(2)
+    Fahrenheit(1),
+    Celsius(2)
 }

src/main/kotlin/com/kylecorry/sol/units/TimeUnits.kt

@@ -1,9 +1,9 @@
 package com.kylecorry.sol.units
 
-enum class TimeUnits(val id: Int, val seconds: Float) {
-    Milliseconds(1, 1 / 1000f),
-    Seconds(2, 1f),
-    Minutes(3, 60f),
-    Hours(4, 3600f),
-    Days(5, 86400f)
+enum class TimeUnits(val id: Int, val seconds: Double) {
+    Milliseconds(1, 1 / 1000.0),
+    Seconds(2, 1.0),
+    Minutes(3, 60.0),
+    Hours(4, 3600.0),
+    Days(5, 86400.0)
 }