From a966676c629f7f14fcbba82a9ada5e2cbeca8314 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Tue, 26 Nov 2019 15:20:04 -0500 Subject: Updated the documentation of existing classes. --- src/org/unitConverter/unit/SI.java | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/org/unitConverter/unit/SI.java') diff --git a/src/org/unitConverter/unit/SI.java b/src/org/unitConverter/unit/SI.java index 45a81e2..19d63e6 100644 --- a/src/org/unitConverter/unit/SI.java +++ b/src/org/unitConverter/unit/SI.java @@ -17,6 +17,7 @@ package org.unitConverter.unit; import org.unitConverter.math.ObjectProduct; +import org.unitConverter.unit.Unit.NameSymbol; /** * All of the units, prefixes and dimensions that are used by the SI, as well as some outside the SI. @@ -115,9 +116,9 @@ public final class SI { public static final ObjectProduct REFLACTIVE_PERMEABILITY = EMPTY.times(EMPTY); public static final ObjectProduct ANGLE = LENGTH.dividedBy(LENGTH); public static final ObjectProduct SOLID_ANGLE = AREA.dividedBy(AREA); + // derived dimensions with named SI units public static final ObjectProduct FREQUENCY = EMPTY.dividedBy(TIME); - public static final ObjectProduct FORCE = MASS.times(ACCELERATION); public static final ObjectProduct ENERGY = FORCE.times(LENGTH); public static final ObjectProduct POWER = ENERGY.dividedBy(TIME); @@ -142,15 +143,18 @@ public final class SI { /// The units of the SI public static final LinearUnit ONE = LinearUnit.valueOf(ObjectProduct.empty(), 1); - public static final LinearUnit METRE = BaseUnits.METRE.asLinearUnit(); - public static final LinearUnit KILOGRAM = BaseUnits.KILOGRAM.asLinearUnit(); - public static final LinearUnit SECOND = BaseUnits.SECOND.asLinearUnit(); - public static final LinearUnit AMPERE = BaseUnits.AMPERE.asLinearUnit(); - public static final LinearUnit KELVIN = BaseUnits.KELVIN.asLinearUnit(); - public static final LinearUnit MOLE = BaseUnits.MOLE.asLinearUnit(); - public static final LinearUnit CANDELA = BaseUnits.CANDELA.asLinearUnit(); - public static final LinearUnit BIT = BaseUnits.BIT.asLinearUnit(); - public static final LinearUnit DOLLAR = BaseUnits.DOLLAR.asLinearUnit(); + public static final LinearUnit METRE = BaseUnits.METRE.asLinearUnit() + .withName(NameSymbol.of("metre", "m", "meter")); + public static final LinearUnit KILOGRAM = BaseUnits.KILOGRAM.asLinearUnit() + .withName(NameSymbol.of("kilogram", "kg")); + public static final LinearUnit SECOND = BaseUnits.SECOND.asLinearUnit() + .withName(NameSymbol.of("second", "s", "sec")); + public static final LinearUnit AMPERE = BaseUnits.AMPERE.asLinearUnit().withName(NameSymbol.of("ampere", "A")); + public static final LinearUnit KELVIN = BaseUnits.KELVIN.asLinearUnit().withName(NameSymbol.of("kelvin", "K")); + public static final LinearUnit MOLE = BaseUnits.MOLE.asLinearUnit().withName(NameSymbol.of("mole", "mol")); + public static final LinearUnit CANDELA = BaseUnits.CANDELA.asLinearUnit().withName(NameSymbol.of("candela", "cd")); + public static final LinearUnit BIT = BaseUnits.BIT.asLinearUnit().withName(NameSymbol.of("bit", "b")); + public static final LinearUnit DOLLAR = BaseUnits.DOLLAR.asLinearUnit().withName(NameSymbol.of("dollar", "$")); // Non-base units public static final LinearUnit RADIAN = METRE.dividedBy(METRE); -- cgit v1.2.3