Correct encoding of ±

2 files changed, 50 insertions, 50 deletions

diff --git a/src/test/java/sevenUnits/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index c93043b..4fb26a3 100644
--- a/src/test/java/sevenUnits/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -42,17 +42,17 @@ import sevenUnits.utils.UncertainDouble;
 class UnitTest {
 	/** A random number generator */
 	private static final Random rng = ThreadLocalRandom.current();
-
+	
 	@Test
 	public void testAdditionAndSubtraction() {
 		final LinearUnit inch = Metric.METRE.times(0.0254)
 				.withName(NameSymbol.of("inch", "in"));
 		final LinearUnit foot = Metric.METRE.times(0.3048)
 				.withName(NameSymbol.of("foot", "ft"));
-
+		
 		assertEquals(inch.plus(foot), Metric.METRE.times(0.3302));
 		assertEquals(foot.minus(inch), Metric.METRE.times(0.2794));
-
+		
 		// test with LinearUnitValue
 		final LinearUnitValue value1 = LinearUnitValue.getExact(Metric.METRE, 15);
 		final LinearUnitValue value2 = LinearUnitValue.getExact(foot, 120);
@@ -60,70 +60,70 @@ class UnitTest {
 				0.5);
 		final LinearUnitValue value4 = LinearUnitValue.getExact(Metric.KILOGRAM,
 				60);
-
+		
 		// make sure addition is done correctly
 		assertEquals(51.576, value1.plus(value2).getValueExact(), 0.001);
 		assertEquals(15.5, value1.plus(value3).getValueExact());
 		assertEquals(52.076, value1.plus(value2).plus(value3).getValueExact(),
 				0.001);
-
+		
 		// make sure addition uses the correct unit, and is still associative
 		// (ignoring floating-point rounding errors)
 		assertEquals(Metric.METRE, value1.plus(value2).getUnit());
 		assertEquals(Metric.METRE, value1.plus(value2).plus(value3).getUnit());
 		assertEquals(foot, value2.plus(value1).getUnit());
 		assertTrue(value1.plus(value2).equals(value2.plus(value1), true));
-
+		
 		// make sure errors happen when they should
 		assertThrows(IllegalArgumentException.class, () -> value1.plus(value4));
 		assertThrows(IllegalArgumentException.class, () -> value1.minus(value4));
 	}
-
+	
 	@Test
 	public void testConversion() {
 		final LinearUnit metre = Metric.METRE;
 		final Unit inch = metre.times(0.0254);
-
+		
 		final UnitValue value = UnitValue.of(inch, 75);
-
+		
 		assertEquals(1.9, inch.convertTo(metre, 75), 0.01);
 		assertEquals(1.9, value.convertTo(metre).getValue(), 0.01);
-
+		
 		// try random stuff
 		for (int i = 0; i < 1000; i++) {
 			// initiate random values
 			final double conversionFactor = UnitTest.rng.nextDouble() * 1000000;
 			final double testValue = UnitTest.rng.nextDouble() * 1000000;
 			final double expected = testValue * conversionFactor;
-
+			
 			// test
 			final Unit unit = Metric.METRE.times(conversionFactor);
 			final double actual = unit.convertToBase(testValue);
-
+			
 			assertEquals(actual, expected,
 					expected * DecimalComparison.DOUBLE_EPSILON);
 		}
 	}
-
+	
 	@Test
 	public void testEquals() {
 		final LinearUnit metre = Metric.METRE;
 		final Unit meter = Metric.BaseUnits.METRE.asLinearUnit();
-
+		
 		assertEquals(metre, meter);
 	}
-
+	
 	@Test
 	public void testIsMetric() {
 		final Unit metre = Metric.METRE;
 		final Unit megasecond = Metric.SECOND.withPrefix(Metric.MEGA);
 		final Unit hour = Metric.HOUR;
-
+		
 		assertTrue(metre.isMetric());
 		assertTrue(megasecond.isMetric());
 		assertFalse(hour.isMetric());
 	}
-
+	
 	@Test
 	public void testMultiplicationAndDivision() {
 		// test unit-times-unit multiplication
@@ -131,29 +131,29 @@ class UnitTest {
 				.times(Metric.METRE.toExponent(2))
 				.dividedBy(Metric.SECOND.toExponent(2));
 		final LinearUnit actualJoule = Metric.JOULE;
-
+		
 		assertEquals(generatedJoule, actualJoule);
-
+		
 		// test multiplication by conversion factors
 		final LinearUnit kilometre = Metric.METRE.times(1000);
 		final LinearUnit hour = Metric.SECOND.times(3600);
 		final LinearUnit generatedKPH = kilometre.dividedBy(hour);
-
+		
 		final LinearUnit actualKPH = Metric.METRE.dividedBy(Metric.SECOND)
 				.dividedBy(3.6);
-
+		
 		assertEquals(generatedKPH, actualKPH);
 	}
-
+	
 	@Test
 	public void testPrefixes() {
 		final LinearUnit generatedKilometre = Metric.METRE
 				.withPrefix(Metric.KILO);
 		final LinearUnit actualKilometre = Metric.METRE.times(1000);
-
+		
 		assertEquals(generatedKilometre, actualKilometre);
 	}
-
+	
 	/**
 	 * Tests converting an uncertain LinearUnitValue to a string.
 	 * 
@@ -163,13 +163,13 @@ class UnitTest {
 	public void testValueToString1() {
 		final LinearUnitValue value = LinearUnitValue.of(Metric.METRE,
 				UncertainDouble.of(10, 0.24));
-
-		assertEquals("(10.0 � 0.2) m", value.toString());
-		assertEquals("(10.0 � 0.2) m",
+		
+		assertEquals("(10.0 ± 0.2) m", value.toString());
+		assertEquals("(10.0 ± 0.2) m",
 				value.toString(true, RoundingMode.HALF_EVEN));
 		assertEquals("10.0 m", value.toString(false, RoundingMode.HALF_EVEN));
 	}
-
+	
 	/**
 	 * Tests converting a certain LinearUnitValue to a string.
 	 * 
@@ -179,13 +179,13 @@ class UnitTest {
 	public void testValueToString2() {
 		final LinearUnitValue value = LinearUnitValue.of(Metric.METRE,
 				UncertainDouble.of(10, 0));
-
+		
 		assertEquals("10.0 m", value.toString());
-		assertEquals("(10.0 � 0.0) m",
+		assertEquals("(10.0 ± 0.0) m",
 				value.toString(true, RoundingMode.HALF_EVEN));
 		assertEquals("10.0 m", value.toString(false, RoundingMode.HALF_EVEN));
 	}
-
+	
 	/**
 	 * Tests converting an unnamed LinearUnitValue to a string.
 	 * 
@@ -196,11 +196,11 @@ class UnitTest {
 		final LinearUnitValue value = LinearUnitValue.of(
 				Metric.METRE.withName(NameSymbol.EMPTY),
 				UncertainDouble.of(10, 0.24));
-
+		
 		assertEquals("10.0 unnamed unit (= 10.0 m)",
 				value.toString(false, RoundingMode.HALF_EVEN));
 	}
-
+	
 	/**
 	 * Tests converting a named UnitValue to a string.
 	 * 
@@ -209,10 +209,10 @@ class UnitTest {
 	@Test
 	public void testValueToString4() {
 		final UnitValue value = UnitValue.of(BritishImperial.FAHRENHEIT, 80);
-
+		
 		assertEquals("80.0 \u00B0F", value.toString());
 	}
-
+	
 	/**
 	 * Tests converting an unnamed UnitValue to a string.
 	 * 
@@ -222,7 +222,7 @@ class UnitTest {
 	public void testValueToString5() {
 		final UnitValue value = UnitValue
 				.of(USCustomary.FAHRENHEIT.withName(NameSymbol.EMPTY), 50);
-
+		
 		assertEquals("50.0 unnamed unit (= 283.15 K)", value.toString());
 	}
 }
diff --git a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
index 36b373b..b251b31 100644
--- a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
+++ b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
@@ -43,36 +43,36 @@ class UncertainDoubleTest {
 		assertTrue(of(2.0, 0.5).compareTo(of(1.0, 0.1)) > 0);
 		assertTrue(of(2.0, 0.5).compareTo(of(3.0, 0.1)) < 0);
 	}
-
+	
 	/**
 	 * Tests the ___exact operations
 	 */
 	@Test
 	final void testExactOperations() {
 		final UncertainDouble x = UncertainDouble.of(Math.PI, 0.1);
-
+		
 		// slightly different because roundoff errors
 		final UncertainDouble x1 = UncertainDouble.of(Math.PI + Math.E - Math.E,
 				0.1);
 		final UncertainDouble x2 = UncertainDouble.of(Math.PI * Math.E / Math.E,
 				0.1);
-
+		
 		// get results
 		final UncertainDouble result1 = x.plusExact(Math.E).minusExact(Math.E);
 		final UncertainDouble result2 = x.timesExact(Math.E)
 				.dividedByExact(Math.E);
-
+		
 		// test that these operations work & don't change uncertainty
 		assertEquals(x1, result1);
 		assertTrue(x.equivalent(result1));
 		assertEquals(x2, result2);
 		assertTrue(x.equivalent(result2));
-
+		
 		// exponents are different
 		assertEquals(Math.pow(Math.PI, Math.E),
 				x.toExponentExact(Math.E).value());
 	}
-
+	
 	/**
 	 * Test for {@link UncertainDouble#fromRoundedString}
 	 * 
@@ -82,29 +82,29 @@ class UncertainDoubleTest {
 	final void testFromRoundedString() {
 		assertEquals(of(12345.678, 0.001), fromRoundedString("12345.678"));
 	}
-
+	
 	/**
 	 * Test for {@link UncertainDouble#fromString}
 	 */
 	@Test
 	final void testFromString() {
 		// valid strings
-		assertEquals(of(2.0, 0.5), fromString("2.0 � 0.5"));
+		assertEquals(of(2.0, 0.5), fromString("2.0 ± 0.5"));
 		assertEquals(of(2.0, 0.5), fromString("2.0 +- 0.5"));
 		assertEquals(of(2.0, 0.0), fromString("2.0"));
-
+		
 		// invalid strings
-		for (final String s : List.of("2.A", "A", "2.0 � .", "� 3.5")) {
+		for (final String s : List.of("2.A", "A", "2.0 ± ", " ± 3.5")) {
 			assertThrows(IllegalArgumentException.class, () -> fromString(s));
 		}
-
+		
 		// back and forth
-		assertEquals("2.0 � 0.5", of(2.0, 0.5).toString());
+		assertEquals("2.0 ± 0.5", of(2.0, 0.5).toString());
 		assertEquals("2.0", of(2.0, 0).toString());
 	}
-
+	
 	@Test
 	final void testHashCode() {
-		assertEquals(of(2.0, 0.5).hashCode(), fromString("2.0 � 0.5").hashCode());
+		assertEquals(of(2.0, 0.5).hashCode(), fromString("2.0 ± 0.5").hashCode());
 	}
 }