testing bounded_linear and fix

Author: amogorkon

Showcase.ipynb

@@ -124,31 +124,6 @@
     "      Publisher: Prentice Hall\n",
     "      Pub. Date: June 07, 1993"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 19,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [
-    {
-     "ename": "TypeError",
-     "evalue": "linear() got an unexpected keyword argument 'm'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-19-2adc44ca0e1a>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mfuzzy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mfunctions\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mlinear\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0mlinear\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mm\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m2e217\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mb\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mfloat\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"-inf\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m: linear() got an unexpected keyword argument 'm'"
-     ]
-    }
-   ],
-   "source": [
-    "from fuzzy.functions import linear\n",
-    "\n",
-    "f= linear(m=2e217, b=float(\"-inf\"))"
-   ]
   }
  ],
  "metadata": {

fuzzy/functions.py

@@ -177,8 +177,8 @@ def bounded_linear(low_bound, high_bound, core_m=1, unsupported_m=0):
     >>> f(4)
     1.0
     """
-    if high_bound <= low_bound:
-        raise ValueError('high must not be less than low.')
+    assert high_bound > low_bound, 'high must not be less than low.'
+    assert core_m != unsupported_m, "core_m must differ from unsupported_m"
 
     gradient = (core_m - unsupported_m) / (high_bound - low_bound)
 

test_fuzzy_units.py

@@ -6,7 +6,7 @@
 from fuzzy import functions as fun
 
 class Test_Functions(TestCase):
-    @given(st.floats(allow_nan=False, allow_infinity=False))
+    @given(st.floats(allow_nan=False))
     def test_noop(self, x):
         f = fun.noop()
         assert f(x) == x
@@ -19,15 +19,16 @@ def test_inv(self, x):
 
     @given(st.floats(allow_nan=False, allow_infinity=False), 
            st.floats(allow_nan=False, allow_infinity=False))
-    def test_constant(self, c, r):
+    def test_constant(self, x, c):
         f = fun.constant(c)
-        assert f(r) == c
+        assert f(x) == 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):
+    @given(st.floats(allow_nan=False),
+            st.floats(min_value=0, max_value=1),
+            st.floats(min_value=0, max_value=1),
+           )
+    def test_alpha(self, x, lower, upper):
         assume(lower < upper)
         f = fun.alpha(lower, upper, fun.noop())
         if x <= lower:
@@ -37,22 +38,31 @@ def test_alpha(self, lower, upper, x):
         else:
             assert f(x) == x
 
-    @given(st.floats(), 
-           st.floats(min_value=0, max_value=1),
-           st.floats(min_value=0, max_value=1),
+    @given(st.floats(),
            st.floats(),
-
-          )
-    def test_singleton(self, p, non_p_m, p_m, x):
+           st.floats(min_value=0, max_value=1),
+           st.floats(min_value=0, max_value=1))
+    def test_singleton(self, x, p, non_p_m, p_m):
         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(allow_nan=False),
-          st.floats(allow_nan=False),
-          st.floats(allow_nan=False))
-    def test_linear(self, m, b, x):
+    @given(st.floats(allow_nan=False, allow_infinity=False),
+          st.floats(allow_nan=False, allow_infinity=False),
+          st.floats(allow_nan=False, allow_infinity=False))
+    def test_linear(self, x, m, b):
         f = fun.linear(m, b)
-        assert 0 <= f(x) <= 1
+        assert (0 <= f(x) <= 1)
+        
+    @given(st.floats(allow_nan=False),
+      st.floats(allow_nan=False, allow_infinity=False),
+      st.floats(allow_nan=False, allow_infinity=False),
+      st.floats(min_value=0, max_value=1),
+      st.floats(min_value=0, max_value=1))
+    def test_bounded_linear(self, x, low_bound, high_bound, core_m, unsupported_m):
+        assume(low_bound < high_bound)
+        assume(core_m != unsupported_m)
+        f = fun.bounded_linear(low_bound, high_bound, core_m, unsupported_m)
+        assert (0 <= f(x) <= 1)