summaryrefslogtreecommitdiff
path: root/src/main/java/sevenUnits/unit/UnitDatabase.java
diff options
context:
space:
mode:
authorAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-26 07:52:45 -0500
committerAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-26 08:04:32 -0500
commit1cb69cfdcb18bbafdbc792174697732e7cf359e7 (patch)
tree01db8e4ac3ee6d46b2f2e60ae07fc94425e55787 /src/main/java/sevenUnits/unit/UnitDatabase.java
parent2d6b85fb9e56b4afa7fd2f3cc26518d5d3125c2c (diff)
Added units and dimensions to the design document
Diffstat (limited to 'src/main/java/sevenUnits/unit/UnitDatabase.java')
-rw-r--r--src/main/java/sevenUnits/unit/UnitDatabase.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index a40f000..b45d9cf 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -1116,7 +1116,7 @@ public final class UnitDatabase {
private static final LinearUnit exponentiateUnits(final LinearUnit base,
final LinearUnit exponentUnit) {
// exponent function - first check if o2 is a number,
- if (exponentUnit.getBase().equals(SI.ONE.getBase())) {
+ if (exponentUnit.getBase().equals(Metric.ONE.getBase())) {
// then check if it is an integer,
final double exponent = exponentUnit.getConversionFactor();
if (DecimalComparison.equals(exponent % 1, 0))
@@ -1142,7 +1142,7 @@ public final class UnitDatabase {
private static final LinearUnitValue exponentiateUnitValues(
final LinearUnitValue base, final LinearUnitValue exponentValue) {
// exponent function - first check if o2 is a number,
- if (exponentValue.canConvertTo(SI.ONE)) {
+ if (exponentValue.canConvertTo(Metric.ONE)) {
// then check if it is an integer,
final double exponent = exponentValue.getValueExact();
if (DecimalComparison.equals(exponent % 1, 0))
@@ -1676,7 +1676,7 @@ public final class UnitDatabase {
final BigDecimal number = new BigDecimal(name);
final double uncertainty = Math.pow(10, -number.scale());
- return LinearUnitValue.of(SI.ONE,
+ return LinearUnitValue.of(Metric.ONE,
UncertainDouble.of(number.doubleValue(), uncertainty));
} catch (final NumberFormatException e) {
return LinearUnitValue.getExact(this.getLinearUnit(name), 1);
@@ -1786,7 +1786,7 @@ public final class UnitDatabase {
public Unit getUnit(final String name) {
try {
final double value = Double.parseDouble(name);
- return SI.ONE.times(value);
+ return Metric.ONE.times(value);
} catch (final NumberFormatException e) {
final Unit unit = this.units.get(name);
if (unit == null)