little more testing..

Author: amogorkon

.cache/v/cache/lastfailed

@@ -1 +1,3 @@
-{}
+{
+  "test_fuzzy_units.py::test_alpha": true
+}

Showcase.ipynb

@@ -38,16 +38,20 @@ def f(x):
         return x
     return f
 
-def inv(func):
-    """Invert the given function within the unit-interval.
+def inv(func=None):
+    """Invert the given function or value within the unit-interval.
     >>> f = inv(constant(0))
     >>> f(0.7)
     0.3
     """
 
-    def f(x):
+    def f_func(x):
         return 1 - func(x)
-    return f
+    
+    def f_value(x):
+        return 1 - x
+    
+    return f_func if func is not None else f_value
 
 
 def constant(c):
@@ -57,16 +61,13 @@ def constant(c):
     1
     """
 
-    if not(0 <= c <= 1):
-        raise ValueError
-
     def f(x):
         return c
     return f
 
 
-def alpha(func, ceiling=1, floor=0):
-    """Function to clip other functions.
+def alpha(func=None, floor=0, ceiling=1):
+    """Function to clip functions or values.
     This is used to either cut off the upper or lower part of a graph.
 
     >>> s = singleton(2)
@@ -83,12 +84,19 @@ def alpha(func, ceiling=1, floor=0):
     if ceiling < floor:
         raise ValueError('ceiling must not be less than floor.')
 
-    def f(x):
+    def f_func(x):
         if func(x) >= ceiling:
             return ceiling
         if func(x) <= floor:
             return floor
-    return f
+    
+    def f_value(x):
+        if x >= ceiling:
+            return ceiling
+        if x <= floor:
+            return floor
+        
+    return f_value if func is None else f_func
 
 
 def singleton(p, non_p_m=0, p_m=1):

fuzzy/functions.py

@@ -9,15 +9,34 @@ def test_noop(x):
     f = fun.noop()
     assert f(x) == x
 
-@given(st.floats(min_value=0, max_value=1))
+@given(st.floats(allow_nan=False, allow_infinity=False))
 def test_invert(x):
+    f = fun.inv()
+    assert f(x) == 1 - x
+    
     n = fun.noop()
     f = fun.inv(n)
     assert f(x) == 1 - x
+    
 
 
-@given(st.floats(min_value=0, max_value=1), 
-       st.floats(min_value=0, max_value=1))
+@given(st.floats(allow_nan=False, allow_infinity=False), 
+       st.floats(allow_nan=False, allow_infinity=False))
 def test_constant(c, r):
     f = fun.constant(c)
-    assert f(r) == c
+    assert f(r) == c
+
+    
+@given(st.floats(min_value=0, max_value=1),
+       st.floats(min_value=0, max_value=1),
+       st.floats(allow_nan=False))
+def test_alpha(lower, upper, x):
+    if lower >= upper:
+        return
+    f = fun.alpha(floor=lower, ceiling=upper)
+    if x <= lower:
+        assert f(x) == lower
+    if x >= upper:
+        assert f(x) == upper
+    else:
+        assert f(x) == x