reorganize fn order; fix init import

fixedpointmath/__init__.py

@@ -10,4 +10,4 @@
 
 from .fixed_point import FixedPoint
 from .fixed_point_integer_math import FixedPointIntegerMath
-from .fixed_point_math import *
+from .fixed_point_math import clip, exp, isclose, maximum, minimum, sqrt

fixedpointmath/fixed_point_math.py

@@ -14,34 +14,6 @@
 # pylint: disable=invalid-name
 
 
-def maximum(x: NUMERIC, y: NUMERIC) -> NUMERIC:
-    """Compare the two inputs and return the greater value.
-
-    If the first argument equals the second, return the first.
-    """
-    if isinstance(x, FixedPoint) and x.is_nan():
-        return x
-    if isinstance(y, FixedPoint) and y.is_nan():
-        return y
-    if x >= y:
-        return x
-    return y
-
-
-def minimum(x: NUMERIC, y: NUMERIC) -> NUMERIC:
-    """Compare the two inputs and return the lesser value.
-
-    If the first argument equals the second, return the first.
-    """
-    if isinstance(x, FixedPoint) and x.is_nan():
-        return x
-    if isinstance(y, FixedPoint) and y.is_nan():
-        return y
-    if x <= y:
-        return x
-    return y
-
-
 def clip(x: NUMERIC, low: NUMERIC, high: NUMERIC) -> NUMERIC:
     """Clip the input, x, to be within (min, max), inclusive"""
     if low > high:
@@ -58,11 +30,6 @@ def exp(x: NUMERIC) -> NUMERIC:
     return type(x)(math.exp(x))
 
 
-def sqrt(x: NUMERIC) -> NUMERIC:
-    """Performs sqrt(x)"""
-    return type(x)(math.sqrt(x))
-
-
 def isclose(a: NUMERIC, b: NUMERIC, abs_tol: NUMERIC = FixedPoint("0.0")) -> bool:
     """Checks `abs(a-b) <= abs_tol`.
     Ignores relative tolerance since FixedPoint should be accurate regardless of scale.
@@ -97,3 +64,36 @@ def isclose(a: NUMERIC, b: NUMERIC, abs_tol: NUMERIC = FixedPoint("0.0")) -> boo
     ):
         raise ValueError("Input abs_tol must be finite.")
     return abs(a - b) <= abs_tol
+
+
+def maximum(x: NUMERIC, y: NUMERIC) -> NUMERIC:
+    """Compare the two inputs and return the greater value.
+
+    If the first argument equals the second, return the first.
+    """
+    if isinstance(x, FixedPoint) and x.is_nan():
+        return x
+    if isinstance(y, FixedPoint) and y.is_nan():
+        return y
+    if x >= y:
+        return x
+    return y
+
+
+def minimum(x: NUMERIC, y: NUMERIC) -> NUMERIC:
+    """Compare the two inputs and return the lesser value.
+
+    If the first argument equals the second, return the first.
+    """
+    if isinstance(x, FixedPoint) and x.is_nan():
+        return x
+    if isinstance(y, FixedPoint) and y.is_nan():
+        return y
+    if x <= y:
+        return x
+    return y
+
+
+def sqrt(x: NUMERIC) -> NUMERIC:
+    """Performs sqrt(x)"""
+    return type(x)(math.sqrt(x))