Implemented rounding and duplicate-removal settings into the new GUI

4 files changed, 28 insertions, 14 deletions

diff --git a/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
index 55e1546..e10bab4 100644
--- a/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
+++ b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
@@ -488,7 +488,7 @@ final class SevenUnitsGUI {
 			case SIGNIFICANT_DIGITS:
 				return this.getRoundedString(value.asUnitValue());
 			case SCIENTIFIC:
-				return value.toString(showUncertainty);
+				return value.toString(showUncertainty, RoundingMode.HALF_EVEN);
 			default:
 				throw new AssertionError("Invalid switch condition.");
 			}
diff --git a/src/main/java/sevenUnits/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java
index a50e1f5..f91d30b 100644
--- a/src/main/java/sevenUnits/unit/LinearUnitValue.java
+++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java
@@ -16,6 +16,7 @@
  */
 package sevenUnits.unit;
 
+import java.math.RoundingMode;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -300,7 +301,7 @@ public final class LinearUnitValue {
 	
 	@Override
 	public String toString() {
-		return this.toString(!this.value.isExact());
+		return this.toString(!this.value.isExact(), RoundingMode.HALF_EVEN);
 	}
 	
 	/**
@@ -315,7 +316,8 @@ public final class LinearUnitValue {
 	 * 
 	 * @since 2020-07-26
 	 */
-	public String toString(final boolean showUncertainty) {
+	public String toString(final boolean showUncertainty,
+			RoundingMode roundingMode) {
 		final Optional<String> primaryName = this.unit.getPrimaryName();
 		final Optional<String> symbol = this.unit.getSymbol();
 		final String chosenName = symbol.orElse(primaryName.orElse(null));
@@ -325,10 +327,10 @@ public final class LinearUnitValue {
 		// get rounded strings
 		// if showUncertainty is true, add brackets around the string
 		final String valueString = (showUncertainty ? "(" : "")
-				+ this.value.toString(showUncertainty)
+				+ this.value.toString(showUncertainty, roundingMode)
 				+ (showUncertainty ? ")" : "");
 		final String baseValueString = (showUncertainty ? "(" : "")
-				+ baseValue.toString(showUncertainty)
+				+ baseValue.toString(showUncertainty, roundingMode)
 				+ (showUncertainty ? ")" : "");
 		
 		// create string
diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 7b02ac7..a4f0c44 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -19,7 +19,6 @@ package sevenUnits.unit;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.AbstractSet;
@@ -1705,11 +1704,8 @@ public final class UnitDatabase {
 	LinearUnitValue getLinearUnitValue(final String name) {
 		try {
 			// try to parse it as a number - otherwise it is not a number!
-			final BigDecimal number = new BigDecimal(name);
-			
-			final double uncertainty = Math.pow(10, -number.scale());
 			return LinearUnitValue.of(Metric.ONE,
-					UncertainDouble.of(number.doubleValue(), uncertainty));
+					UncertainDouble.fromRoundedString(name));
 		} catch (final NumberFormatException e) {
 			return LinearUnitValue.getExact(this.getLinearUnit(name), 1);
 		}
diff --git a/src/main/java/sevenUnits/utils/UncertainDouble.java b/src/main/java/sevenUnits/utils/UncertainDouble.java
index fe41104..ac523b3 100644
--- a/src/main/java/sevenUnits/utils/UncertainDouble.java
+++ b/src/main/java/sevenUnits/utils/UncertainDouble.java
@@ -46,6 +46,21 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
 			+ "(?:\\s*(?:±|\\+-)\\s*" + NUMBER_REGEX + ")?");
 	
 	/**
+	 * Gets an UncertainDouble from a double string. The uncertainty of the
+	 * double will be one of the lowest decimal place of the number. For example,
+	 * "12345.678" will become 12345.678 ± 0.001.
+	 * 
+	 * @throws NumberFormatException if the argument is not a number
+	 *
+	 * @since 2022-04-18
+	 */
+	public static final UncertainDouble fromRoundedString(String s) {
+		final BigDecimal value = new BigDecimal(s);
+		final double uncertainty = Math.pow(10, -value.scale());
+		return UncertainDouble.of(value.doubleValue(), uncertainty);
+	}
+	
+	/**
 	 * Parses a string in the form of {@link UncertainDouble#toString(boolean)}
 	 * and returns the corresponding {@code UncertainDouble} instance.
 	 * <p>
@@ -348,7 +363,7 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
 	 */
 	@Override
 	public final String toString() {
-		return this.toString(!this.isExact());
+		return this.toString(!this.isExact(), RoundingMode.HALF_EVEN);
 	}
 	
 	/**
@@ -379,7 +394,8 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
 	 * 
 	 * @since 2020-09-07
 	 */
-	public final String toString(boolean showUncertainty) {
+	public final String toString(boolean showUncertainty,
+			RoundingMode roundingMode) {
 		String valueString, uncertaintyString;
 		
 		// generate the string representation of value and uncertainty
@@ -394,9 +410,9 @@ public final class UncertainDouble implements Comparable<UncertainDouble> {
 			
 			final int displayScale = this.getDisplayScale();
 			final BigDecimal roundedUncertainty = bigUncertainty
-					.setScale(displayScale, RoundingMode.HALF_EVEN);
+					.setScale(displayScale, roundingMode);
 			final BigDecimal roundedValue = bigValue.setScale(displayScale,
-					RoundingMode.HALF_EVEN);
+					roundingMode);
 			
 			valueString = roundedValue.toString();
 			uncertaintyString = roundedUncertainty.toString();