diff options
Diffstat (limited to 'src/main/java/sevenUnits/unit/Metric.java')
| -rw-r--r-- | src/main/java/sevenUnits/unit/Metric.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/sevenUnits/unit/Metric.java b/src/main/java/sevenUnits/unit/Metric.java index 7ede085..05e82ba 100644 --- a/src/main/java/sevenUnits/unit/Metric.java +++ b/src/main/java/sevenUnits/unit/Metric.java @@ -19,7 +19,6 @@ package sevenUnits.unit; import java.util.Set; import sevenUnits.utils.NameSymbol; -import sevenUnits.utils.NamedObjectProduct; import sevenUnits.utils.ObjectProduct; /** @@ -115,29 +114,29 @@ public final class Metric { public static final class Dimensions { public static final ObjectProduct<BaseDimension> EMPTY = ObjectProduct .empty(); - public static final NamedObjectProduct<BaseDimension> LENGTH = ObjectProduct + public static final ObjectProduct<BaseDimension> LENGTH = ObjectProduct .oneOf(BaseDimensions.LENGTH) .withName(NameSymbol.of("Length", "L")); - public static final NamedObjectProduct<BaseDimension> MASS = ObjectProduct + public static final ObjectProduct<BaseDimension> MASS = ObjectProduct .oneOf(BaseDimensions.MASS).withName(NameSymbol.of("Mass", "M")); - public static final NamedObjectProduct<BaseDimension> TIME = ObjectProduct + public static final ObjectProduct<BaseDimension> TIME = ObjectProduct .oneOf(BaseDimensions.TIME).withName(NameSymbol.of("Time", "T")); - public static final NamedObjectProduct<BaseDimension> ELECTRIC_CURRENT = ObjectProduct + public static final ObjectProduct<BaseDimension> ELECTRIC_CURRENT = ObjectProduct .oneOf(BaseDimensions.ELECTRIC_CURRENT) .withName(NameSymbol.of("Current", "I")); - public static final NamedObjectProduct<BaseDimension> TEMPERATURE = ObjectProduct + public static final ObjectProduct<BaseDimension> TEMPERATURE = ObjectProduct .oneOf(BaseDimensions.TEMPERATURE) .withName(NameSymbol.of("Temperature", "\u0398")); - public static final NamedObjectProduct<BaseDimension> QUANTITY = ObjectProduct + public static final ObjectProduct<BaseDimension> QUANTITY = ObjectProduct .oneOf(BaseDimensions.QUANTITY) .withName(NameSymbol.of("Quantity", "N")); - public static final NamedObjectProduct<BaseDimension> LUMINOUS_INTENSITY = ObjectProduct + public static final ObjectProduct<BaseDimension> LUMINOUS_INTENSITY = ObjectProduct .oneOf(BaseDimensions.LUMINOUS_INTENSITY) .withName(NameSymbol.of("Luminous Intensity", "J")); - public static final NamedObjectProduct<BaseDimension> INFORMATION = ObjectProduct + public static final ObjectProduct<BaseDimension> INFORMATION = ObjectProduct .oneOf(BaseDimensions.INFORMATION) .withName(NameSymbol.ofName("Information")); - public static final NamedObjectProduct<BaseDimension> CURRENCY = ObjectProduct + public static final ObjectProduct<BaseDimension> CURRENCY = ObjectProduct .oneOf(BaseDimensions.CURRENCY) .withName(NameSymbol.ofName("Currency")); @@ -146,7 +145,7 @@ public final class Metric { .times(LENGTH); public static final ObjectProduct<BaseDimension> VOLUME = AREA .times(LENGTH); - public static final NamedObjectProduct<BaseDimension> VELOCITY = LENGTH + public static final ObjectProduct<BaseDimension> VELOCITY = LENGTH .dividedBy(TIME).withName(NameSymbol.ofName("Velocity")); public static final ObjectProduct<BaseDimension> ACCELERATION = VELOCITY .dividedBy(TIME); |