summaryrefslogtreecommitdiff
path: root/src/main/java/sevenUnits/unit
diff options
context:
space:
mode:
authorAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-07 15:25:54 -0500
committerAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-07 15:25:54 -0500
commit72eed55d9f834de8302564fbe6dfa3d1d446afb4 (patch)
tree7eebb8177b52fb84463d7b65d8e083f76190ef17 /src/main/java/sevenUnits/unit
parentf214f5623afeaa9e4dafbcc70698284b2a33e695 (diff)
Renamed sevenUnits.math to sevenUnits.utils
Diffstat (limited to 'src/main/java/sevenUnits/unit')
-rw-r--r--src/main/java/sevenUnits/unit/FunctionalUnit.java2
-rw-r--r--src/main/java/sevenUnits/unit/FunctionalUnitlike.java2
-rw-r--r--src/main/java/sevenUnits/unit/LinearUnit.java6
-rw-r--r--src/main/java/sevenUnits/unit/LinearUnitValue.java4
-rw-r--r--src/main/java/sevenUnits/unit/MultiUnit.java2
-rw-r--r--src/main/java/sevenUnits/unit/SI.java2
-rw-r--r--src/main/java/sevenUnits/unit/Unit.java4
-rw-r--r--src/main/java/sevenUnits/unit/UnitDatabase.java10
-rw-r--r--src/main/java/sevenUnits/unit/UnitPrefix.java2
-rw-r--r--src/main/java/sevenUnits/unit/Unitlike.java2
10 files changed, 18 insertions, 18 deletions
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