Added imperial units to BritishImperial and USCustomary.

3 files changed, 213 insertions, 0 deletions

diff --git a/src/org/unitConverter/unit/BritishImperial.java b/src/org/unitConverter/unit/BritishImperial.java
index c9316f3..ea23cd1 100644
--- a/src/org/unitConverter/unit/BritishImperial.java
+++ b/src/org/unitConverter/unit/BritishImperial.java
@@ -23,6 +23,94 @@ package org.unitConverter.unit;
  * @since 2019-10-21
  */
 public final class BritishImperial {
+	/**
+	 * Imperial units that measure area
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Area {
+		public static final LinearUnit SQUARE_FOOT = Length.FOOT.toExponent(2);
+		public static final LinearUnit SQUARE_YARD = Length.YARD.toExponent(2);
+		public static final LinearUnit SQUARE_MILE = Length.MILE.toExponent(2);
+		public static final LinearUnit PERCH = Length.ROD.times(Length.ROD);
+		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
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-10-28
+	 */
+	public static final class Length {
+		/**
+		 * According to the International Yard and Pound of 1959, a yard is defined as exactly 0.9144 metres.
+		 */
+		public static final LinearUnit YARD = SI.METRE.times(0.9144);
+		public static final LinearUnit FOOT = YARD.dividedBy(3);
+		public static final LinearUnit INCH = FOOT.dividedBy(12);
+		public static final LinearUnit THOU = INCH.dividedBy(1000);
+		public static final LinearUnit CHAIN = YARD.times(22);
+		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 = SI.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.
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Mass {
+		public static final LinearUnit POUND = SI.GRAM.times(453.59237);
+		public static final LinearUnit OUNCE = POUND.dividedBy(16);
+		public static final LinearUnit DRACHM = POUND.dividedBy(256);
+		public static final LinearUnit GRAIN = POUND.dividedBy(7000);
+		public static final LinearUnit STONE = POUND.times(14);
+		public static final LinearUnit QUARTER = STONE.times(2);
+		public static final LinearUnit HUNDREDWEIGHT = QUARTER.times(4);
+		public static final LinearUnit LONG_TON = HUNDREDWEIGHT.times(20);
+		public static final LinearUnit SLUG = SI.KILOGRAM.times(14.59390294);
+	}
+
+	/**
+	 * British Imperial units that measure volume
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Volume {
+		public static final LinearUnit FLUID_OUNCE = SI.LITRE.withPrefix(SI.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(SI.Constants.EARTH_GRAVITY);
+	public static final LinearUnit POUND_FORCE = Mass.POUND.times(SI.Constants.EARTH_GRAVITY);
+
+	public static final LinearUnit BRITISH_THERMAL_UNIT = SI.JOULE.times(1055.06);
+	public static final LinearUnit CALORIE = SI.JOULE.times(4.184);
+	public static final LinearUnit KILOCALORIE = SI.JOULE.times(4184);
+
 	public static final Unit FAHRENHEIT = Unit.fromConversionFunctions(SI.KELVIN.getBase(),
 			tempK -> tempK * 1.8 - 459.67, tempF -> (tempF + 459.67) / 1.8);
 }
diff --git a/src/org/unitConverter/unit/SI.java b/src/org/unitConverter/unit/SI.java
index f623179..45a81e2 100644
--- a/src/org/unitConverter/unit/SI.java
+++ b/src/org/unitConverter/unit/SI.java
@@ -72,6 +72,16 @@ public final class SI {
 		}

 	}

 

+	/**

+	 * Constants that relate to the SI or other systems.

+	 * 

+	 * @author Adrien Hopkins

+	 * @since 2019-11-08

+	 */

+	public static final class Constants {

+		public static final LinearUnit EARTH_GRAVITY = METRE.dividedBy(SECOND).dividedBy(SECOND).times(9.80665);

+	}

+

 	// dimensions used in the SI, as ObjectProducts

 	public static final class Dimensions {

 		public static final ObjectProduct<BaseDimension> EMPTY = ObjectProduct.empty();

@@ -165,12 +175,19 @@ public final class SI {
 	public static final LinearUnit SIEVERT = JOULE.dividedBy(KILOGRAM); // for dose equivalent

 	public static final LinearUnit KATAL = MOLE.dividedBy(SECOND);

 

+	// common derived units included for convenience

+	public static final LinearUnit GRAM = KILOGRAM.dividedBy(1000);

+	public static final LinearUnit SQUARE_METRE = METRE.toExponent(2);

+	public static final LinearUnit CUBIC_METRE = METRE.toExponent(3);

+	public static final LinearUnit METRE_PER_SECOND = METRE.dividedBy(SECOND);

+

 	// Non-SI units included for convenience

 	public static final Unit CELSIUS = Unit.fromConversionFunctions(KELVIN.getBase(), tempK -> tempK - 273.15,

 			tempC -> tempC + 273.15);

 	public static final LinearUnit MINUTE = SECOND.times(60);

 	public static final LinearUnit HOUR = MINUTE.times(60);

 	public static final LinearUnit DAY = HOUR.times(60);

+	public static final LinearUnit KILOMETRE_PER_HOUR = METRE.times(1000).dividedBy(HOUR);

 	public static final LinearUnit DEGREE = RADIAN.times(360 / (2 * Math.PI));

 	public static final LinearUnit ARCMINUTE = DEGREE.dividedBy(60);

 	public static final LinearUnit ARCSECOND = ARCMINUTE.dividedBy(60);

diff --git a/src/org/unitConverter/unit/USCustomary.java b/src/org/unitConverter/unit/USCustomary.java
index f5f9a7f..1c4bcfe 100644
--- a/src/org/unitConverter/unit/USCustomary.java
+++ b/src/org/unitConverter/unit/USCustomary.java
@@ -23,5 +23,113 @@ package org.unitConverter.unit;
  * @since 2019-10-21
  */
 public final class USCustomary {
+	/**
+	 * US Customary units that measure area
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Area {
+		public static final LinearUnit SQUARE_SURVEY_FOOT = Length.SURVEY_FOOT.times(Length.SURVEY_FOOT);
+		public static final LinearUnit SQUARE_CHAIN = Length.SURVEY_CHAIN.times(Length.SURVEY_CHAIN);
+		public static final LinearUnit ACRE = Length.SURVEY_CHAIN.times(Length.SURVEY_FURLONG);
+		public static final LinearUnit SECTION = Length.SURVEY_MILE.times(Length.SURVEY_MILE);
+		public static final LinearUnit SURVEY_TOWNSHIP = SECTION.times(36);
+	}
+
+	/**
+	 * US Customary units that measure length
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-10-28
+	 */
+	public static final class Length {
+		public static final LinearUnit FOOT = BritishImperial.Length.FOOT;
+		public static final LinearUnit INCH = BritishImperial.Length.INCH;
+		public static final LinearUnit HAND = INCH.times(4);
+		public static final LinearUnit PICA = INCH.dividedBy(6);
+		public static final LinearUnit POINT = PICA.dividedBy(12);
+		public static final LinearUnit YARD = BritishImperial.Length.YARD;
+		public static final LinearUnit MILE = BritishImperial.Length.MILE;
+
+		public static final LinearUnit SURVEY_FOOT = SI.METRE.times(1200.0 / 3937.0);
+		public static final LinearUnit SURVEY_LINK = SURVEY_FOOT.times(33.0 / 50.0);
+		public static final LinearUnit SURVEY_ROD = SURVEY_FOOT.times(16.5);
+		public static final LinearUnit SURVEY_CHAIN = SURVEY_ROD.times(4);
+		public static final LinearUnit SURVEY_FURLONG = SURVEY_CHAIN.times(10);
+		public static final LinearUnit SURVEY_MILE = SURVEY_FURLONG.times(8);
+		public static final LinearUnit SURVEY_LEAGUE = SURVEY_MILE.times(3);
+
+		public static final LinearUnit NAUTICAL_MILE = BritishImperial.Length.NAUTICAL_MILE;
+		public static final LinearUnit FATHOM = YARD.times(2);
+		public static final LinearUnit CABLE = FATHOM.times(120);
+	}
+
+	/**
+	 * mass units
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Mass {
+		public static final LinearUnit GRAIN = BritishImperial.Mass.GRAIN;
+		public static final LinearUnit DRAM = BritishImperial.Mass.DRACHM;
+		public static final LinearUnit OUNCE = BritishImperial.Mass.OUNCE;
+		public static final LinearUnit POUND = BritishImperial.Mass.POUND;
+		public static final LinearUnit HUNDREDWEIGHT = POUND.times(100);
+		public static final LinearUnit SHORT_TON = HUNDREDWEIGHT.times(20);
+
+		// troy system for precious metals
+		public static final LinearUnit PENNYWEIGHT = GRAIN.times(24);
+		public static final LinearUnit TROY_OUNCE = PENNYWEIGHT.times(20);
+		public static final LinearUnit TROY_POUND = TROY_OUNCE.times(12);
+	}
+
+	/**
+	 * Volume units
+	 * 
+	 * @author Adrien Hopkins
+	 * @since 2019-11-08
+	 */
+	public static final class Volume {
+		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 MINIM = SI.LITRE.withPrefix(SI.MICRO).times(61.611519921875);
+		public static final LinearUnit FLUID_DRAM = MINIM.times(60);
+		public static final LinearUnit TEASPOON = MINIM.times(80);
+		public static final LinearUnit TABLESPOON = TEASPOON.times(3);
+		public static final LinearUnit FLUID_OUNCE = TABLESPOON.times(2);
+		public static final LinearUnit SHOT = TABLESPOON.times(3);
+		public static final LinearUnit GILL = FLUID_OUNCE.times(4);
+		public static final LinearUnit CUP = GILL.times(2);
+		public static final LinearUnit PINT = CUP.times(2);
+		public static final LinearUnit QUART = PINT.times(2);
+		public static final LinearUnit GALLON = QUART.times(4);
+		public static final LinearUnit BARREL = GALLON.times(31.5);
+		public static final LinearUnit OIL_BARREL = GALLON.times(42);
+		public static final LinearUnit HOGSHEAD = GALLON.times(63);
+
+		public static final LinearUnit DRY_PINT = SI.LITRE.times(0.5506104713575);
+		public static final LinearUnit DRY_QUART = DRY_PINT.times(2);
+		public static final LinearUnit DRY_GALLON = DRY_QUART.times(4);
+		public static final LinearUnit PECK = DRY_GALLON.times(2);
+		public static final LinearUnit BUSHEL = PECK.times(4);
+		public static final LinearUnit DRY_BARREL = CUBIC_INCH.times(7056);
+	}
+
+	public static final LinearUnit OUNCE_FORCE = BritishImperial.OUNCE_FORCE;
+	public static final LinearUnit POUND_FORCE = BritishImperial.POUND_FORCE;
+
+	public static final LinearUnit BRITISH_THERMAL_UNIT = BritishImperial.BRITISH_THERMAL_UNIT;
+	public static final LinearUnit CALORIE = BritishImperial.CALORIE;
+	public static final LinearUnit KILOCALORIE = BritishImperial.KILOCALORIE;
+	public static final LinearUnit FOOT_POUND = POUND_FORCE.times(Length.FOOT);
+
+	public static final LinearUnit HORSEPOWER = Length.FOOT.times(POUND_FORCE).dividedBy(SI.MINUTE).times(33000);
+	public static final LinearUnit POUND_PER_SQUARE_INCH = POUND_FORCE.dividedBy(Length.INCH.toExponent(2));
+
 	public static final Unit FAHRENHEIT = BritishImperial.FAHRENHEIT;
 }