Merge branch 'testing-upgrades' into develop

1 files changed, 23 insertions, 16 deletions

diff --git a/src/main/java/sevenUnits/unit/BritishImperial.java b/src/main/java/sevenUnits/unit/BritishImperial.java
index 81a3f2a..743beeb 100644
--- a/src/main/java/sevenUnits/unit/BritishImperial.java
+++ b/src/main/java/sevenUnits/unit/BritishImperial.java
@@ -37,7 +37,7 @@ public final class BritishImperial {
 		public static final LinearUnit ROOD = Length.ROD.times(Length.FURLONG);
 		public static final LinearUnit ACRE = Length.FURLONG.times(Length.CHAIN);
 	}
-
+	
 	/**
 	 * Imperial units that measure length
 	 * 
@@ -46,7 +46,8 @@ public final class BritishImperial {
 	 */
 	public static final class Length {
 		/**
-		 * According to the International Yard and Pound of 1959, a yard is defined as exactly 0.9144 metres.
+		 * According to the International Yard and Pound of 1959, a yard is
+		 * defined as exactly 0.9144 metres.
 		 */
 		public static final LinearUnit YARD = Metric.METRE.times(0.9144);
 		public static final LinearUnit FOOT = YARD.dividedBy(3);
@@ -56,15 +57,15 @@ public final class BritishImperial {
 		public static final LinearUnit FURLONG = CHAIN.times(10);
 		public static final LinearUnit MILE = FURLONG.times(8);
 		public static final LinearUnit LEAGUE = MILE.times(3);
-
+		
 		public static final LinearUnit NAUTICAL_MILE = Metric.METRE.times(1852);
 		public static final LinearUnit CABLE = NAUTICAL_MILE.dividedBy(10);
 		public static final LinearUnit FATHOM = CABLE.dividedBy(100);
-
+		
 		public static final LinearUnit ROD = YARD.times(5.5);
 		public static final LinearUnit LINK = ROD.dividedBy(25);
 	}
-
+	
 	/**
 	 * British Imperial units that measure mass.
 	 * 
@@ -82,7 +83,7 @@ public final class BritishImperial {
 		public static final LinearUnit LONG_TON = HUNDREDWEIGHT.times(20);
 		public static final LinearUnit SLUG = Metric.KILOGRAM.times(14.59390294);
 	}
-
+	
 	/**
 	 * British Imperial units that measure volume
 	 * 
@@ -90,27 +91,33 @@ public final class BritishImperial {
 	 * @since 2019-11-08
 	 */
 	public static final class Volume {
-		public static final LinearUnit FLUID_OUNCE = Metric.LITRE.withPrefix(Metric.MILLI).times(28.4130625);
+		public static final LinearUnit FLUID_OUNCE = Metric.LITRE
+				.withPrefix(Metric.MILLI).times(28.4130625);
 		public static final LinearUnit GILL = FLUID_OUNCE.times(5);
 		public static final LinearUnit PINT = FLUID_OUNCE.times(20);
 		public static final LinearUnit QUART = PINT.times(2);
 		public static final LinearUnit GALLON = QUART.times(4);
 		public static final LinearUnit PECK = GALLON.times(2);
 		public static final LinearUnit BUSHEL = PECK.times(4);
-
+		
 		public static final LinearUnit CUBIC_INCH = Length.INCH.toExponent(3);
 		public static final LinearUnit CUBIC_FOOT = Length.FOOT.toExponent(3);
 		public static final LinearUnit CUBIC_YARD = Length.YARD.toExponent(3);
 		public static final LinearUnit ACRE_FOOT = Area.ACRE.times(Length.FOOT);
 	}
-
-	public static final LinearUnit OUNCE_FORCE = Mass.OUNCE.times(Metric.Constants.EARTH_GRAVITY);
-	public static final LinearUnit POUND_FORCE = Mass.POUND.times(Metric.Constants.EARTH_GRAVITY);
-
-	public static final LinearUnit BRITISH_THERMAL_UNIT = Metric.JOULE.times(1055.06);
+	
+	public static final LinearUnit OUNCE_FORCE = Mass.OUNCE
+			.times(Metric.Constants.EARTH_GRAVITY);
+	public static final LinearUnit POUND_FORCE = Mass.POUND
+			.times(Metric.Constants.EARTH_GRAVITY);
+	
+	public static final LinearUnit BRITISH_THERMAL_UNIT = Metric.JOULE
+			.times(1055.06);
 	public static final LinearUnit CALORIE = Metric.JOULE.times(4.184);
 	public static final LinearUnit KILOCALORIE = Metric.JOULE.times(4184);
-
-	public static final Unit FAHRENHEIT = Unit.fromConversionFunctions(Metric.KELVIN.getBase(),
-			tempK -> tempK * 1.8 - 459.67, tempF -> (tempF + 459.67) / 1.8);
+	
+	public static final Unit FAHRENHEIT = Unit
+			.fromConversionFunctions(Metric.KELVIN.getBase(),
+					tempK -> tempK * 1.8 - 459.67, tempF -> (tempF + 459.67) / 1.8)
+			.withName(NameSymbol.of("degrees Fahrenheit", "\u00B0F"));
 }