more unit refactors

iTitus · Oct 19, 2021 · ec6bac1 · ec6bac1
1 parent 6310dd1
commit ec6bac1
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 46 deletions.
diff --git a/src/main/java/io/github/ititus/si/NotCommensurableException.java b/src/main/java/io/github/ititus/si/NotCommensurableException.java
@@ -0,0 +1,24 @@
+package io.github.ititus.si;
+
+public class NotCommensurableException extends RuntimeException {
+
+    public NotCommensurableException() {
+        super();
+    }
+
+    public NotCommensurableException(String message) {
+        super(message);
+    }
+
+    public NotCommensurableException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NotCommensurableException(Throwable cause) {
+        super(cause);
+    }
+
+    protected NotCommensurableException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/src/main/java/io/github/ititus/si/unit/AbstractUnit.java b/src/main/java/io/github/ititus/si/unit/AbstractUnit.java
@@ -1,35 +1,25 @@
 package io.github.ititus.si.unit;
 
-import io.github.ititus.si.dimension.Dimension;
 import io.github.ititus.si.quantity.type.QuantityType;
 
-import java.util.Objects;
-
 abstract class AbstractUnit<Q extends QuantityType<Q>> implements Unit<Q> {
 
     private final Q type;
-    private final Dimension dimension;
 
-    protected AbstractUnit(Q type, Dimension dimension) {
+    protected AbstractUnit(Q type) {
         this.type = type;
-        this.dimension = dimension;
     }
 
     @Override
     public Q getType() {
         return type;
     }
 
-    @Override
-    public Dimension getDimension() {
-        return dimension;
-    }
-
     @Override
     public String toString() {
         return getClass().getSimpleName() + "{" +
                 "type=" + type +
-                ", dimension=" + dimension.getString() +
+                ", dimension=" + getDimension().getString() +
                 ", symbol=" + getSymbol() +
                 '}';
     }
@@ -38,16 +28,16 @@ public String toString() {
     public boolean equals(Object o) {
         if (this == o) {
             return true;
-        } else if (!(o instanceof AbstractUnit)) {
+        } else if (!(o instanceof Unit)) {
             return false;
         }
 
-        AbstractUnit<?> that = (AbstractUnit<?>) o;
-        return /*type.equals(that.type) &&*/ dimension.equals(that.dimension);
+        Unit<?> that = (Unit<?>) o;
+        return getDimension().equals(that.getDimension());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(/*type,*/ dimension);
+        return getDimension().hashCode();
     }
 }
diff --git a/src/main/java/io/github/ititus/si/unit/AlternateUnit.java b/src/main/java/io/github/ititus/si/unit/AlternateUnit.java
@@ -1,5 +1,6 @@
 package io.github.ititus.si.unit;
 
+import io.github.ititus.si.NotCommensurableException;
 import io.github.ititus.si.prefix.Prefix;
 import io.github.ititus.si.quantity.type.QuantityType;
 import io.github.ititus.si.quantity.value.QuantityValue;
@@ -13,7 +14,7 @@ final class AlternateUnit<Q extends QuantityType<Q>> extends AbstractUnit<Q> {
     private final String alternateSymbol;
 
     AlternateUnit(Unit<Q> baseUnit, String alternateSymbol) {
-        super(baseUnit.getType(), baseUnit.getDimension());
+        super(baseUnit.getType());
         this.baseUnit = baseUnit;
         this.alternateSymbol = alternateSymbol;
     }
@@ -37,7 +38,9 @@ public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
     @Override
     @SuppressWarnings("unchecked")
     public <T extends QuantityType<T>> Unit<T> as(T type) {
-        if (getType().equals(type)) {
+        if (!isCommensurableWith(type)) {
+            throw new NotCommensurableException();
+        } else if (getType().equals(type)) {
             return (Unit<T>) this;
         }
 

diff --git a/src/main/java/io/github/ititus/si/unit/BaseUnit.java b/src/main/java/io/github/ititus/si/unit/BaseUnit.java
@@ -1,5 +1,6 @@
 package io.github.ititus.si.unit;
 
+import io.github.ititus.si.NotCommensurableException;
 import io.github.ititus.si.prefix.Prefix;
 import io.github.ititus.si.quantity.type.QuantityType;
 import io.github.ititus.si.quantity.value.QuantityValue;
@@ -12,7 +13,7 @@ final class BaseUnit<Q extends QuantityType<Q>> extends AbstractUnit<Q> {
     private final String symbol;
 
     BaseUnit(Q type, String symbol) {
-        super(type, type.getDimension());
+        super(type);
         this.symbol = symbol;
     }
 
@@ -24,7 +25,7 @@ public String getSymbol() {
     @Override
     public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
         if (!isCommensurableWith(unit.getType())) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (equals(unit)) {
             return UnitConverter.IDENTITY;
         }
@@ -36,7 +37,7 @@ public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
     @SuppressWarnings("unchecked")
     public <T extends QuantityType<T>> Unit<T> as(T type) {
         if (!isCommensurableWith(type)) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (getType().equals(type)) {
             return (Unit<T>) this;
         }

diff --git a/src/main/java/io/github/ititus/si/unit/CompoundUnit.java b/src/main/java/io/github/ititus/si/unit/CompoundUnit.java
@@ -1,5 +1,6 @@
 package io.github.ititus.si.unit;
 
+import io.github.ititus.si.NotCommensurableException;
 import io.github.ititus.si.dimension.Dimension;
 import io.github.ititus.si.prefix.Prefix;
 import io.github.ititus.si.quantity.type.QuantityType;
@@ -19,9 +20,11 @@
 final class CompoundUnit<Q extends QuantityType<Q>> extends AbstractUnit<Q> {
 
     private final Map<Unit<?>, Integer> units;
+    private final Dimension dimension;
 
     private CompoundUnit(Q type, Dimension dimension, Map<Unit<?>, Integer> units) {
-        super(type, dimension);
+        super(type);
+        this.dimension = dimension;
         this.units = units;
     }
 
@@ -33,10 +36,8 @@ private static Unit<?> of(Dimension dimension, Map<Unit<?>, Integer> units) {
 
         if (units.isEmpty()) {
             return ONE;
-        }
-
-        if (units.size() == 1) {
-            Map.Entry<Unit<?>, Integer> entry = units.entrySet().stream().findAny().get();
+        } else if (units.size() == 1) {
+            Map.Entry<Unit<?>, Integer> entry = units.entrySet().stream().findAny().orElseThrow();
             if (entry.getValue() == 1) {
                 return entry.getKey();
             }
@@ -100,6 +101,11 @@ static Unit<?> ofRoot(Unit<?> u, int root) {
         return of(u.getDimension().root(root), units);
     }
 
+    @Override
+    public Dimension getDimension() {
+        return dimension;
+    }
+
     @Override
     public String getSymbol() {
         StringBuilder b = new StringBuilder();
@@ -118,7 +124,7 @@ public String getSymbol() {
     @Override
     public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
         if (!isCommensurableWith(unit.getType())) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (equals(unit)) {
             return UnitConverter.IDENTITY;
         }
@@ -154,12 +160,12 @@ public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
     @SuppressWarnings("unchecked")
     public <T extends QuantityType<T>> Unit<T> as(T type) {
         if (!isCommensurableWith(type)) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (getType().equals(type)) {
             return (Unit<T>) this;
         }
 
-        return new CompoundUnit<>(type, getDimension(), units);
+        return new CompoundUnit<>(type, dimension, units);
     }
 
     @Override

diff --git a/src/main/java/io/github/ititus/si/unit/ConvertedUnit.java b/src/main/java/io/github/ititus/si/unit/ConvertedUnit.java
@@ -1,5 +1,6 @@
 package io.github.ititus.si.unit;
 
+import io.github.ititus.si.NotCommensurableException;
 import io.github.ititus.si.prefix.Prefix;
 import io.github.ititus.si.quantity.type.QuantityType;
 import io.github.ititus.si.quantity.value.QuantityValue;
@@ -13,7 +14,7 @@ final class ConvertedUnit<Q extends QuantityType<Q>> extends AbstractUnit<Q> {
     private final UnitConverter converter;
 
     private ConvertedUnit(Unit<Q> baseUnit, UnitConverter converter) {
-        super(baseUnit.getType(), baseUnit.getDimension());
+        super(baseUnit.getType());
         this.baseUnit = baseUnit;
         this.converter = converter;
     }
@@ -34,7 +35,7 @@ public String getSymbol() {
     @Override
     public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
         if (!isCommensurableWith(unit.getType())) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (equals(unit)) {
             return UnitConverter.IDENTITY;
         } else if (baseUnit.equals(unit)) {
@@ -48,7 +49,7 @@ public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
     @SuppressWarnings("unchecked")
     public <T extends QuantityType<T>> Unit<T> as(T type) {
         if (!isCommensurableWith(type)) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (getType().equals(type)) {
             return (Unit<T>) this;
         }

diff --git a/src/main/java/io/github/ititus/si/unit/PrefixUnit.java b/src/main/java/io/github/ititus/si/unit/PrefixUnit.java
@@ -1,6 +1,7 @@
 package io.github.ititus.si.unit;
 
 import io.github.ititus.math.number.BigRational;
+import io.github.ititus.si.NotCommensurableException;
 import io.github.ititus.si.prefix.Prefix;
 import io.github.ititus.si.quantity.type.QuantityType;
 import io.github.ititus.si.quantity.value.QuantityValue;
@@ -14,7 +15,7 @@ final class PrefixUnit<Q extends QuantityType<Q>> extends AbstractUnit<Q> {
     private final Prefix prefix;
 
     PrefixUnit(Unit<Q> baseUnit, Prefix prefix) {
-        super(baseUnit.getType(), baseUnit.getDimension());
+        super(baseUnit.getType());
         this.baseUnit = baseUnit;
         this.prefix = prefix;
     }
@@ -27,7 +28,7 @@ public String getSymbol() {
     @Override
     public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
         if (!isCommensurableWith(unit.getType())) {
-            throw new ClassCastException();
+            throw new NotCommensurableException();
         } else if (equals(unit)) {
             return UnitConverter.IDENTITY;
         }
@@ -51,7 +52,9 @@ public <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit) {
     @Override
     @SuppressWarnings("unchecked")
     public <T extends QuantityType<T>> Unit<T> as(T type) {
-        if (getType().equals(type)) {
+        if (!isCommensurableWith(type)) {
+            throw new NotCommensurableException();
+        } else if (getType().equals(type)) {
             return (Unit<T>) this;
         }
 

diff --git a/src/main/java/io/github/ititus/si/unit/Unit.java b/src/main/java/io/github/ititus/si/unit/Unit.java
@@ -17,7 +17,9 @@ public interface Unit<Q extends QuantityType<Q>> {
 
     Q getType();
 
-    Dimension getDimension();
+    default Dimension getDimension() {
+        return getType().getDimension();
+    }
 
     <T extends QuantityType<T>> UnitConverter getConverterTo(Unit<T> unit);
 

diff --git a/src/main/java/io/github/ititus/si/unit/Units.java b/src/main/java/io/github/ititus/si/unit/Units.java
@@ -1,5 +1,6 @@
 package io.github.ititus.si.unit;
 
+import io.github.ititus.internal.Config;
 import io.github.ititus.si.quantity.type.*;
 
 import static io.github.ititus.math.number.BigRational.of;
@@ -69,6 +70,7 @@ public final class Units {
     // Length
     public static final Unit<Length> KILOMETRE = METRE.prefix(KILO);
     public static final Unit<Length> DECIMETRE = METRE.prefix(DECI);
+    public static final Unit<Length> CENTIMETRE = METRE.prefix(CENTI);
     public static final Unit<Length> MILLIMETRE = METRE.prefix(MILLI);
     public static final Unit<Length> INCH = MILLIMETRE.multiply(ofExp(254, -1)).alternate("in");
     public static final Unit<Length> FOOT = INCH.multiply(12).alternate("ft");
@@ -170,7 +172,7 @@ public final class Units {
     public static final Unit<ElectricCapacitance> FARAD = COULOMB.divide(VOLT).alternate("F").as(ELECTRIC_CAPACITANCE);
 
     // Electric Resistance
-    public static final Unit<ElectricResistance> OHM = VOLT.divide(AMPERE).alternate("\u03A9").as(ELECTRIC_RESISTANCE);
+    public static final Unit<ElectricResistance> OHM = VOLT.divide(AMPERE).alternate(Config.FORCE_ASCII ? "Ohm" : "\u03A9").as(ELECTRIC_RESISTANCE);
 
     // Electric Conductance
     public static final Unit<ElectricConductance> SIEMENS = OHM.inverse().alternate("S").as(ELECTRIC_CONDUCTANCE);

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -29,6 +29,7 @@
     exports io.github.ititus.math.vector;
     exports io.github.ititus.parser;
     exports io.github.ititus.precondition;
+    exports io.github.ititus.si;
     exports io.github.ititus.si.dimension;
     exports io.github.ititus.si.prefix;
     exports io.github.ititus.si.quantity;

diff --git a/...ub/ititus/si/quantity/type/ForceTest.java → ...t/java/io/github/ititus/si/ForceTest.java b/...ub/ititus/si/quantity/type/ForceTest.java → ...t/java/io/github/ititus/si/ForceTest.java
@@ -1,6 +1,7 @@
-package io.github.ititus.si.quantity.type;
+package io.github.ititus.si;
 
 import io.github.ititus.si.quantity.Quantity;
+import io.github.ititus.si.quantity.type.*;
 import org.junit.jupiter.api.Test;
 
 import static io.github.ititus.si.quantity.type.Force.FORCE;

diff --git a/...b/ititus/si/quantity/type/LengthTest.java → .../java/io/github/ititus/si/LengthTest.java b/...b/ititus/si/quantity/type/LengthTest.java → .../java/io/github/ititus/si/LengthTest.java
@@ -1,6 +1,7 @@
-package io.github.ititus.si.quantity.type;
+package io.github.ititus.si;
 
 import io.github.ititus.si.quantity.Quantity;
+import io.github.ititus.si.quantity.type.Length;
 import org.junit.jupiter.api.Test;
 
 import static io.github.ititus.assertions.Assertions.assertThat;

diff --git a/...hub/ititus/si/quantity/type/MassTest.java → ...st/java/io/github/ititus/si/MassTest.java b/...hub/ititus/si/quantity/type/MassTest.java → ...st/java/io/github/ititus/si/MassTest.java
@@ -1,6 +1,7 @@
-package io.github.ititus.si.quantity.type;
+package io.github.ititus.si;
 
 import io.github.ititus.si.quantity.Quantity;
+import io.github.ititus.si.quantity.type.Mass;
 import org.junit.jupiter.api.Test;
 
 import static io.github.ititus.assertions.Assertions.assertThat;

diff --git a/...tus/si/quantity/type/TemperatureTest.java → .../io/github/ititus/si/TemperatureTest.java b/...tus/si/quantity/type/TemperatureTest.java → .../io/github/ititus/si/TemperatureTest.java
@@ -1,6 +1,7 @@
-package io.github.ititus.si.quantity.type;
+package io.github.ititus.si;
 
 import io.github.ititus.si.quantity.Quantity;
+import io.github.ititus.si.quantity.type.Temperature;
 import org.junit.jupiter.api.Test;
 
 import static io.github.ititus.assertions.Assertions.assertThat;

diff --git a/...hub/ititus/si/quantity/type/TimeTest.java → ...st/java/io/github/ititus/si/TimeTest.java b/...hub/ititus/si/quantity/type/TimeTest.java → ...st/java/io/github/ititus/si/TimeTest.java
@@ -1,14 +1,13 @@
-package io.github.ititus.si.quantity.type;
+package io.github.ititus.si;
 
 import io.github.ititus.si.quantity.Quantity;
+import io.github.ititus.si.quantity.type.Time;
 import org.junit.jupiter.api.Test;
 
 import static io.github.ititus.assertions.Assertions.assertThat;
-import static io.github.ititus.math.number.BigRational.ofExp;
-import static io.github.ititus.si.prefix.MetricPrefix.NANO;
 import static io.github.ititus.si.quantity.value.QuantityValue.of;
-import static io.github.ititus.si.unit.Units.*;
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.github.ititus.si.unit.Units.MINUTE;
+import static io.github.ititus.si.unit.Units.SECOND;
 import static org.assertj.core.data.Percentage.withPercentage;
 
 class TimeTest {