summaryrefslogtreecommitdiff
path: root/src/main/java/sevenUnits/unit/LinearUnit.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/sevenUnits/unit/LinearUnit.java')
-rw-r--r--src/main/java/sevenUnits/unit/LinearUnit.java22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/main/java/sevenUnits/unit/LinearUnit.java b/src/main/java/sevenUnits/unit/LinearUnit.java
index 25c2e2e..103b7f6 100644
--- a/src/main/java/sevenUnits/unit/LinearUnit.java
+++ b/src/main/java/sevenUnits/unit/LinearUnit.java
@@ -19,6 +19,7 @@ package sevenUnits.unit;
import java.util.Objects;
import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.NameSymbol;
import sevenUnits.utils.ObjectProduct;
import sevenUnits.utils.UncertainDouble;
@@ -369,6 +370,13 @@ public final class LinearUnit extends Unit {
this.getConversionFactor() * multiplier.getConversionFactor());
}
+ @Override
+ public String toDefinitionString() {
+ return Double.toString(this.conversionFactor)
+ + (this.getBase().equals(ObjectProduct.empty()) ? ""
+ : " " + this.getBase().toString(BaseUnit::getShortName));
+ }
+
/**
* Returns this unit but to an exponent.
*
@@ -382,20 +390,6 @@ public final class LinearUnit extends Unit {
Math.pow(this.conversionFactor, exponent));
}
- /**
- * @return a string providing a definition of this unit
- * @since 2019-10-21
- */
- @Override
- public String toString() {
- return this.getPrimaryName().orElse("Unnamed unit")
- + (this.getSymbol().isPresent()
- ? String.format(" (%s)", this.getSymbol().get())
- : "")
- + ", " + Double.toString(this.conversionFactor) + " * "
- + this.getBase().toString(u -> u.getSymbol().get());
- }
-
@Override
public LinearUnit withName(final NameSymbol ns) {
return valueOf(this.getBase(), this.getConversionFactor(), ns);