added Domain.MAX

Author: amogorkon

fuzzy/classes.py

@@ -121,6 +121,11 @@ def MIN(self, x):
         and calculate the min from that.
         """
         return min(f(x) for f in self._sets.values())
+    
+    def MAX(self, x):
+        """Standard way to get the max over all membership funcs.
+        """
+        return max(f(x) for f in self._sets.values())
 
 class Set:
     """
@@ -283,12 +288,10 @@ def plot(self):
         plt.plot(R, V)
 
     def array(self):
-        # arange may not be ideal for this
         if self.domain is None:
             raise FuzzyWarning("No domain assigned.")
-        return fromiter((self.func(x) for x in arange(self.domain.low,
-                                                     self.domain.high,
-                                                     self.domain.res)), float)
+        return fromiter((self.func(x) for x in self.domain.range()),
+                        float)
 
     def __repr__(self):
         """

test_fuzzy_functionality.py

@@ -3,22 +3,39 @@
 Functional test of the fuzzylogic lib 'fuzzy'.
 """
 
-import unittest
+from unittest import TestCase, skip
 
-from fuzzy.classes import Domain, Set, Rule
-from fuzzy.functions import R, S
+from fuzzy.classes import Domain, Set
+from fuzzy.rules import scale
+from fuzzy.functions import R, S, bounded_linear
 
-class TestTop(unittest.TestCase):
+class TestTop(TestCase):
     def setUp(self):
-        """
-        Lucy tells her robot that it is good to heat when it's cold and not when it's hot."""
+        """Lucy tells her robot that it is good to heat when it's cold and not when it's hot."""
         self.temp = Domain('temperature', -100, 100)  # in Celsius
         self.temp.cold = Set(S(0, 15))
         self.temp.hot = Set(R(10, 30))
         self.temp.warm = ~self.temp.cold & ~self.temp.hot
 
     def test_temp(self):
         assert(self.temp(6) == {'cold': 0.6, 'hot': 0, 'warm': 0.4})
+
+class Test_Meal(TestCase):
+    def setUp(self):
+        """Tom is surveying restaurants. 
+        He doesn't need fancy logic but rather uses a simple approach with weights.
+        He went into a small, dirty bar that served some delicious drink and food.
+        """
+        self.R = Domain("rating", 1, 10, res=0.1)
+        self.R.norm = Set(bounded_linear(1, 10))
+        self.weights = weights = {"beverage": 0.3, 
+                                  "atmosphere": 0.2, 
+                                   "arrangement":0.2,
+                                   "taste": 0.3}
+        self.ratings = {"beverage": self.R.MIN(7),
+                       "atmosphere": self.R.MIN(3),
+                       "arrangement": self.R.MIN(2),
+                       "taste": self.R.MIN(9)}
 
 if __name__ == '__main__':
     unittest.main()