refactor and cleanup

Author: amogorkon

src/fuzzylogic/functions.py

@@ -39,7 +39,8 @@
 
 
 try:
-    # from numba import njit # still not ready for prime time :(
+    from numba import njit as njit  # ready for prime time?
+
     raise ImportError
 
 except ImportError:
@@ -48,6 +49,8 @@ def njit(func: Membership) -> Membership:
         return func
 
 
+LOW_HIGH = "low must be less than high"
+
 #####################
 # SPECIAL FUNCTIONS #
 #####################
@@ -111,7 +114,6 @@ def alpha(
 
     floor_clip = floor if floor_clip is None else floor_clip
     ceiling_clip = ceiling if ceiling_clip is None else ceiling_clip
-    # assert 0 <= floor_clip <= ceiling_clip <= 1, "%s <= %s"%(floor_clip, ceiling_clip)
 
     def f(x: float) -> float:
         m = func(x)
@@ -254,7 +256,7 @@ def bounded_linear(
     >>> f(4)
     1.0
     """
-    assert low < high, "low must be less than high"
+    assert low < high, LOW_HIGH
     assert c_m > no_m, "core_m must be greater than unsupported_m"
 
     if inverse:
@@ -414,7 +416,7 @@ def sigmoid(L: float, k: float, x0: float = 0) -> Membership:
 
     def f(x: float) -> float:
         if isnan(k * x):
-            # e^(0*inf) = 1
+            # e^(0*inf) == 1
             o = 1.0
         else:
             try:
@@ -464,7 +466,7 @@ def bounded_sigmoid(low: float, high: float, inverse: bool = False) -> Membershi
     >>> round(f(-100000), 2)
     0.0
     """
-    assert low < high, "low must be less than high"
+    assert low < high, LOW_HIGH
 
     if inverse:
         low, high = high, low
@@ -489,7 +491,7 @@ def f(x: float) -> float:
         except OverflowError:
             q = float("inf")
 
-        # e^(inf)*e^(-inf) = 1
+        # e^(inf)*e^(-inf) == 1
         r = p * q
         if isnan(r):
             r = 1
@@ -560,7 +562,7 @@ def triangular_sigmoid(low: float, high: float, c: float | None = None) -> Membe
     >>> round(g(3), 2)
     0.9
     """
-    assert low < high, "low must be less than high"
+    assert low < high, LOW_HIGH
     c = c if c is not None else (low + high) / 2.0
     assert low < c < high, "c must be inbetween"
 

tests/test_units.py

@@ -18,7 +18,7 @@
 common_settings = settings(deadline=None, suppress_health_check=cast(list[HealthCheck], list(HealthCheck)))
 
 
-class Test_Functions(TestCase):
+class TestFunctions(TestCase):
     @common_settings
     @given(st.floats(allow_nan=False))
     def test_noop(self, x: float) -> None:
@@ -250,7 +250,7 @@ def test_bounded_exponential(self, k: float, limit: float, x: float) -> None:
         assert 0 <= f(x) <= limit
 
 
-class Test_Hedges(TestCase):
+class TestHedges(TestCase):
     @common_settings
     @given(st.floats(min_value=0, max_value=1))
     def test_very(self, x: float) -> None:
@@ -273,7 +273,7 @@ def test_plus(self, x: float) -> None:
         assert 0 <= f(x) <= 1
 
 
-class Test_Combinators(TestCase):
+class TestCombinators(TestCase):
     @common_settings
     @given(st.floats(min_value=0, max_value=1))
     def test_MIN(self, x: float) -> None:
@@ -381,7 +381,7 @@ def test_simple_disjoint_sum(self, x: float) -> None:
         assert 0 <= f(x) <= 1
 
 
-class Test_Domain(TestCase):
+class TestDomain(TestCase):
     def test_basics(self) -> None:
         D = Domain("d", 0, 10)
         assert D._name == "d"  # type: ignore
@@ -399,7 +399,7 @@ def test_basics(self) -> None:
         # assert d == D
 
 
-class Test_Set(TestCase):
+class TestSet(TestCase):
     @common_settings
     @given(
         st.floats(allow_nan=False, allow_infinity=False),
@@ -441,7 +441,7 @@ def test_complement(self) -> None:
         assert all(np.isclose(D.s1.array(), D.s2.array()))
 
 
-class Test_Rules(TestCase):
+class TestRules(TestCase):
     @common_settings
     @given(
         st.floats(min_value=0, max_value=1),
@@ -462,7 +462,7 @@ def round_partial(self, x: float, res: float) -> None:
         assert isclose(x, ru.round_partial(x, res))
 
 
-class Test_Truth(TestCase):
+class TestTruth(TestCase):
     @common_settings
     @given(st.floats(min_value=0, max_value=1))
     def test_true_and_false(self, m: float) -> None: