fixed test_alpha

Author: amogorkon

.cache/v/cache/lastfailed

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

Showcase.ipynb

@@ -14,15 +14,29 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "image/png": "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\n",
+      "text/plain": [
+       "<matplotlib.figure.Figure at 0x7fef6b03a9b0>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
-    "from fuzzy.classes import Domain\n",
-    "from fuzzy.functions import alpha\n",
-    "\n"
+    "from fuzzy.classes import Domain, Set\n",
+    "from fuzzy.functions import alpha, triangular\n",
+    "\n",
+    "numbers = Domain(\"numbers\", low=0, high=20)\n",
+    "close_to_10 = Set(numbers, alpha(triangular(0, 20), 0.2,0.8))\n",
+    "close_to_10.plot()"
    ]
   },
   {

TODO-fuzzy

@@ -2,3 +2,4 @@ do: build a testcase suite
 ---
 do: review functions
 ---
+do: Set.plot should always plot between 0 and 1

fuzzy/functions.py

@@ -66,7 +66,7 @@ def f(x):
     return f
 
 
-def alpha(func=None, floor=0, ceiling=1):
+def alpha(floor=0, ceiling=1, func=None):
     """Function to clip functions or values.
     This is used to either cut off the upper or lower part of a graph.
 
@@ -77,24 +77,24 @@ def alpha(func=None, floor=0, ceiling=1):
     >>> g(2)
     0.8
     """
-    if not (0 <= ceiling <= 1):
-        raise ValueError('ceiling invalid.')
-    if not (0 <= floor <= 1):
-        raise ValueError('floor invalid.')
-    if ceiling < floor:
-        raise ValueError('ceiling must not be less than floor.')
-
+    if floor >= ceiling:
+        raise UserWarning("floor must be lower than ceiling")
+    
     def f_func(x):
         if func(x) >= ceiling:
             return ceiling
-        if func(x) <= floor:
+        elif func(x) <= floor:
             return floor
+        else:
+            return x
 
     def f_value(x):
         if x >= ceiling:
             return ceiling
-        if x <= floor:
+        elif x <= floor:
             return floor
+        else: 
+            return x
 
     return f_value if func is None else f_func
 

test_fuzzy_units.py

@@ -1,5 +1,5 @@
 
-from hypothesis import given, strategies as st
+from hypothesis import given, strategies as st, assume
 
 from fuzzy import functions as fun
 
@@ -18,8 +18,6 @@ def test_invert(x):
     f = fun.inv(n)
     assert f(x) == 1 - x
 
-
-
 @given(st.floats(allow_nan=False, allow_infinity=False), 
        st.floats(allow_nan=False, allow_infinity=False))
 def test_constant(c, r):
@@ -31,12 +29,12 @@ def test_constant(c, r):
        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)
+    assume(lower < upper)
+        
+    f = fun.alpha(lower, upper)
     if x <= lower:
         assert f(x) == lower
-    if x >= upper:
+    elif x >= upper:
         assert f(x) == upper
     else:
         assert f(x) == x