testing, removed cache/

Author: amogorkon

.cache/v/cache/lastfailed

@@ -1,5 +1,6 @@
 .hypothesis
-.cache
+.cache/*
 __pycache__
 .ipynb_checkpoints/
 _config.yml
+DEV*

.gitignore

@@ -8,8 +8,12 @@ do: #Set.plot SHOULD always plot the full set range
 ---
 do: MUST fix #Domain._sets (should be either set OR dict)
 until: 2017-3-1
+requires: Set.plot testcase 
 ---
 do: check tests
-every: day
+after: 2017-3-1
+repeat: dayly
+until: end of year
 ---
-do: SHOULD find examples for truth functions
+do: SHOULD find examples for truth functions
+---

Showcase.ipynb

@@ -109,18 +109,11 @@ def f(x):
     return f
 
 
-def linear(a=0, b=0):
+def linear(m:float=0, b:float=0) -> callable:
     """A textbook linear function with y-axis section and gradient.
-    f(x) = a*x + b
+    f(x) = m*x + b
     BUT CLIPPED.
 
-    variables
-    --------
-    b: float
-        y-axis section for f(0)
-    a: float
-        gradient - if a == 0, the function is constant
-
     >>> f = linear(1, -1)
     >>> f(-2)   # should be -3 but clipped
     0
@@ -135,13 +128,14 @@ def linear(a=0, b=0):
     >>> f(3)    # should be 2 but clipped
     1
     """
-    def f(x):
-        m = a * x + b
-        if m < 0:
+    def f(x) -> float:
+        y = m * x + b
+        if y <= 0:
             return 0
-        if m > 1:
+        elif y >= 1:
             return 1
-        return m
+        else:
+            return y
     return f
 
 

TODO-fuzzy

@@ -1,36 +1,58 @@
 
 from hypothesis import given, strategies as st, assume
 from math import isclose
+from unittest import TestCase
 
 from fuzzy import functions as fun
-    
-@given(st.floats(allow_nan=False, allow_infinity=False))
-def test_noop(x):
-    f = fun.noop()
-    assert f(x) == x
-
-@given(st.floats(allow_nan=False, allow_infinity=False))
-def test_inv(x):
-    assume(0 <= x <= 1)
-    f = fun.inv(fun.noop())
-    assert isclose(f(f(x)), x, abs_tol=1e-16)
-    
-@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
 
+class Test_Functions(TestCase):
+    @given(st.floats(allow_nan=False, allow_infinity=False))
+    def test_noop(self, x):
+        f = fun.noop()
+        assert f(x) == x
+
+    @given(st.floats(allow_nan=False, allow_infinity=False))
+    def test_inv(self, x):
+        assume(0 <= x <= 1)
+        f = fun.inv(fun.noop())
+        assert isclose(f(f(x)), x, abs_tol=1e-16)
+
+    @given(st.floats(allow_nan=False, allow_infinity=False), 
+           st.floats(allow_nan=False, allow_infinity=False))
+    def test_constant(self, c, r):
+        f = fun.constant(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(self, lower, upper, x):
+        assume(lower < upper)
+        f = fun.alpha(lower, upper, fun.noop())
+        if x <= lower:
+            assert f(x) == lower
+        elif x >= upper:
+            assert f(x) == upper
+        else:
+            assert f(x) == x
+
+    @given(st.floats(), 
+           st.floats(min_value=0, max_value=1),
+           st.floats(min_value=0, max_value=1),
+           st.floats(),
+
+          )
+    def test_singleton(self, p, non_p_m, p_m, x):
+        assume(0 <= non_p_m <= 1)
+        assume(0 <= p_m <= 1)
+        f = fun.singleton(p, non_p_m, p_m)
+        assert f(x) == (p_m if x == p else non_p_m)
+    
 
-@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):
-    assume(lower < upper)
-    f = fun.alpha(lower, upper, fun.noop())
-    if x <= lower:
-        assert f(x) == lower
-    elif x >= upper:
-        assert f(x) == upper
-    else:
-        assert f(x) == x
+    @given(st.floats(allow_nan=False),
+          st.floats(allow_nan=False),
+          st.floats(allow_nan=False))
+    def test_linear(self, m, b, x):
+        f = fun.linear(m, b)
+        assert 0 <= f(x) <= 1