Allow fractional exponents

1 files changed, 14 insertions, 29 deletions

diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 05c31c4..514b27d 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -44,7 +44,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import sevenUnits.utils.ConditionalExistenceCollections;
-import sevenUnits.utils.DecimalComparison;
 import sevenUnits.utils.ExpressionParser;
 import sevenUnits.utils.NameSymbol;
 import sevenUnits.utils.ObjectProduct;
@@ -1117,20 +1116,13 @@ public final class UnitDatabase {
 	 */
 	private static final LinearUnit exponentiateUnits(final LinearUnit base,
 			final LinearUnit exponentUnit) {
-		// exponent function - first check if o2 is a number,
-		if (exponentUnit.getBase().equals(Metric.ONE.getBase())) {
-			// then check if it is an integer,
-			final double exponent = exponentUnit.getConversionFactor();
-			if (DecimalComparison.equals(exponent % 1, 0))
-				// then exponentiate
-				return base.toExponent((int) (exponent + 0.5));
-			else
-				// not an integer
-				throw new UnsupportedOperationException(
-						"Decimal exponents are currently not supported.");
-		} else
-			// not a number
-			throw new IllegalArgumentException("Exponents must be numbers.");
+		if (!exponentUnit.getBase().equals(Metric.ONE.getBase()))
+			throw new IllegalArgumentException(String.format(
+					"Tried to exponentiate %s^%s, but exponents must be dimensionless numbers.",
+					base, exponentUnit));
+		
+		final double exponent = exponentUnit.getConversionFactor();
+		return base.toExponentRounded(exponent);
 	}
 	
 	/**
@@ -1143,20 +1135,13 @@ public final class UnitDatabase {
 	 */
 	private static final LinearUnitValue exponentiateUnitValues(
 			final LinearUnitValue base, final LinearUnitValue exponentValue) {
-		// exponent function - first check if o2 is a number,
-		if (exponentValue.canConvertTo(Metric.ONE)) {
-			// then check if it is an integer,
-			final double exponent = exponentValue.getValueExact();
-			if (DecimalComparison.equals(exponent % 1, 0))
-				// then exponentiate
-				return base.toExponent((int) (exponent + 0.5));
-			else
-				// not an integer
-				throw new UnsupportedOperationException(
-						"Decimal exponents are currently not supported.");
-		} else
-			// not a number
-			throw new IllegalArgumentException("Exponents must be numbers.");
+		if (!exponentValue.canConvertTo(Metric.ONE))
+			throw new IllegalArgumentException(String.format(
+					"Tried to exponentiate %s^%s, but exponents must be dimensionless numbers.",
+					base, exponentValue));
+		
+		final double exponent = exponentValue.getValueExact();
+		return base.toExponentRounded(exponent);
 	}
 	
 	/**