From f0541a955b6e4b12d808cffec0874f50a004e8b9 Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Mon, 18 Apr 2022 17:01:54 -0500
Subject: Implemented rounding and duplicate-removal settings into the new GUI

---
 src/main/java/sevenUnits/unit/LinearUnitValue.java | 10 ++++++----
 src/main/java/sevenUnits/unit/UnitDatabase.java    |  6 +-----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/main/java/sevenUnits/unit')

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);
 		}
-- 
cgit v1.2.3