Renamed sevenUnits.math to sevenUnits.utils

17 files changed, 29 insertions, 28 deletions

diff --git a/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
index fb498da..e1eb2f4 100644
--- a/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
+++ b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
@@ -65,8 +65,6 @@ import javax.swing.WindowConstants;
 import javax.swing.border.TitledBorder;
 
 import sevenUnits.ProgramInfo;
-import sevenUnits.math.ConditionalExistenceCollections;
-import sevenUnits.math.ObjectProduct;
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.BritishImperial;
 import sevenUnits.unit.LinearUnit;
@@ -77,6 +75,8 @@ import sevenUnits.unit.Unit;
 import sevenUnits.unit.UnitDatabase;
 import sevenUnits.unit.UnitPrefix;
 import sevenUnits.unit.UnitValue;
+import sevenUnits.utils.ConditionalExistenceCollections;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * @author Adrien Hopkins
diff --git a/src/main/java/sevenUnits/unit/FunctionalUnit.java b/src/main/java/sevenUnits/unit/FunctionalUnit.java
index 7bacc9d..df457e4 100644
--- a/src/main/java/sevenUnits/unit/FunctionalUnit.java
+++ b/src/main/java/sevenUnits/unit/FunctionalUnit.java
@@ -19,7 +19,7 @@ package sevenUnits.unit;
 import java.util.Objects;
 import java.util.function.DoubleUnaryOperator;
 
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * A unit that uses functional objects to convert to and from its base.
diff --git a/src/main/java/sevenUnits/unit/FunctionalUnitlike.java b/src/main/java/sevenUnits/unit/FunctionalUnitlike.java
index 61503e8..2ee9e19 100644
--- a/src/main/java/sevenUnits/unit/FunctionalUnitlike.java
+++ b/src/main/java/sevenUnits/unit/FunctionalUnitlike.java
@@ -19,7 +19,7 @@ package sevenUnits.unit;
 import java.util.function.DoubleFunction;
 import java.util.function.ToDoubleFunction;
 
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * A unitlike form that converts using two conversion functions.
diff --git a/src/main/java/sevenUnits/unit/LinearUnit.java b/src/main/java/sevenUnits/unit/LinearUnit.java
index 7c46443..25c2e2e 100644
--- a/src/main/java/sevenUnits/unit/LinearUnit.java
+++ b/src/main/java/sevenUnits/unit/LinearUnit.java
@@ -18,9 +18,9 @@ package sevenUnits.unit;
 
 import java.util.Objects;
 
-import sevenUnits.math.DecimalComparison;
-import sevenUnits.math.ObjectProduct;
-import sevenUnits.math.UncertainDouble;
+import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.ObjectProduct;
+import sevenUnits.utils.UncertainDouble;
 
 /**
  * A unit that can be expressed as a product of its base and a number. For
diff --git a/src/main/java/sevenUnits/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java
index 687a8b4..ffb9271 100644
--- a/src/main/java/sevenUnits/unit/LinearUnitValue.java
+++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java
@@ -19,8 +19,8 @@ package sevenUnits.unit;
 import java.util.Objects;
 import java.util.Optional;
 
-import sevenUnits.math.DecimalComparison;
-import sevenUnits.math.UncertainDouble;
+import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.UncertainDouble;
 
 /**
  * A possibly uncertain value expressed in a linear unit.
diff --git a/src/main/java/sevenUnits/unit/MultiUnit.java b/src/main/java/sevenUnits/unit/MultiUnit.java
index 014e055..83cdb03 100644
--- a/src/main/java/sevenUnits/unit/MultiUnit.java
+++ b/src/main/java/sevenUnits/unit/MultiUnit.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * A combination of units, like "5 foot + 7 inch". All but the last units should
diff --git a/src/main/java/sevenUnits/unit/SI.java b/src/main/java/sevenUnits/unit/SI.java
index e0e5a54..278fb5e 100644
--- a/src/main/java/sevenUnits/unit/SI.java
+++ b/src/main/java/sevenUnits/unit/SI.java
@@ -18,7 +18,7 @@ package sevenUnits.unit;
 
 import java.util.Set;
 
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * All of the units, prefixes and dimensions that are used by the SI, as well as
diff --git a/src/main/java/sevenUnits/unit/Unit.java b/src/main/java/sevenUnits/unit/Unit.java
index 1e875af..8fcacb8 100644
--- a/src/main/java/sevenUnits/unit/Unit.java
+++ b/src/main/java/sevenUnits/unit/Unit.java
@@ -23,8 +23,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.DoubleUnaryOperator;
 
-import sevenUnits.math.DecimalComparison;
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * A unit that is composed of base units.
diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 1960229..a40f000 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -44,11 +44,11 @@ import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import sevenUnits.math.ConditionalExistenceCollections;
-import sevenUnits.math.DecimalComparison;
-import sevenUnits.math.ExpressionParser;
-import sevenUnits.math.ObjectProduct;
-import sevenUnits.math.UncertainDouble;
+import sevenUnits.utils.ConditionalExistenceCollections;
+import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.ExpressionParser;
+import sevenUnits.utils.ObjectProduct;
+import sevenUnits.utils.UncertainDouble;
 
 /**
  * A database of units, prefixes and dimensions, and their names.
diff --git a/src/main/java/sevenUnits/unit/UnitPrefix.java b/src/main/java/sevenUnits/unit/UnitPrefix.java
index e4a27bd..308f4b0 100644
--- a/src/main/java/sevenUnits/unit/UnitPrefix.java
+++ b/src/main/java/sevenUnits/unit/UnitPrefix.java
@@ -20,7 +20,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
-import sevenUnits.math.DecimalComparison;
+import sevenUnits.utils.DecimalComparison;
 
 /**
  * A prefix that can be applied to a {@code LinearUnit} to multiply it by some value
diff --git a/src/main/java/sevenUnits/unit/Unitlike.java b/src/main/java/sevenUnits/unit/Unitlike.java
index fd361b6..d2dcbbb 100644
--- a/src/main/java/sevenUnits/unit/Unitlike.java
+++ b/src/main/java/sevenUnits/unit/Unitlike.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 import java.util.function.DoubleFunction;
 import java.util.function.ToDoubleFunction;
 
-import sevenUnits.math.ObjectProduct;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * An object that can convert a value between multiple forms (instances of the
diff --git a/src/main/java/sevenUnits/math/ConditionalExistenceCollections.java b/src/main/java/sevenUnits/utils/ConditionalExistenceCollections.java
index 5ce1bd7..2adb579 100644
--- a/src/main/java/sevenUnits/math/ConditionalExistenceCollections.java
+++ b/src/main/java/sevenUnits/utils/ConditionalExistenceCollections.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package sevenUnits.math;
+package sevenUnits.utils;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/src/main/java/sevenUnits/math/DecimalComparison.java b/src/main/java/sevenUnits/utils/DecimalComparison.java
index 24a9b2f..a5cbbaa 100644
--- a/src/main/java/sevenUnits/math/DecimalComparison.java
+++ b/src/main/java/sevenUnits/utils/DecimalComparison.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package sevenUnits.math;
+package sevenUnits.utils;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/sevenUnits/math/ExpressionParser.java b/src/main/java/sevenUnits/utils/ExpressionParser.java
index 5c8183b..1d3d44d 100644
--- a/src/main/java/sevenUnits/math/ExpressionParser.java
+++ b/src/main/java/sevenUnits/utils/ExpressionParser.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package sevenUnits.math;
+package sevenUnits.utils;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/src/main/java/sevenUnits/math/ObjectProduct.java b/src/main/java/sevenUnits/utils/ObjectProduct.java
index db95fd4..1dacb7d 100644
--- a/src/main/java/sevenUnits/math/ObjectProduct.java
+++ b/src/main/java/sevenUnits/utils/ObjectProduct.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package sevenUnits.math;
+package sevenUnits.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/sevenUnits/math/UncertainDouble.java b/src/main/java/sevenUnits/utils/UncertainDouble.java
index b81bb79..8fe4b31 100644
--- a/src/main/java/sevenUnits/math/UncertainDouble.java
+++ b/src/main/java/sevenUnits/utils/UncertainDouble.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package sevenUnits.math;
+package sevenUnits.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/src/main/java/sevenUnits/math/package-info.java b/src/main/java/sevenUnits/utils/package-info.java
index 62f72cd..350c62d 100644
--- a/src/main/java/sevenUnits/math/package-info.java
+++ b/src/main/java/sevenUnits/utils/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019 Adrien Hopkins
+ * Copyright (C) 2018-2020 Adrien Hopkins
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 /**
- * Supplementary classes that are not related to units, but are necessary for their function.
+ * Supplementary classes that are not related to units, but are necessary for
+ * their function.
  * 
  * @author Adrien Hopkins
  * @since 2019-03-14
  * @since v0.2.0
  */
-package sevenUnits.math;
\ No newline at end of file
+package sevenUnits.utils;
\ No newline at end of file