changed names of constructor functions

Author: luckyluke66

fuzzySets.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               fuzzySets
-version:            1.0.0
+version:            1.0.1
 category:           Math
 license:            BSD-3-Clause
 author:             Lukas Balog <lukasbalog66@gmail.com>

src/Fuzzy/Relations/LRelation.hs

@@ -12,7 +12,7 @@ module Fuzzy.Relations.LRelation (
     mkEmptyRel,
     mkSingletonRel,
     mkUniversalRel, 
-    toPairs
+    toList
 ) where
 
 import Lattices.ResiduatedLattice
@@ -121,5 +121,5 @@ mkUniversalRel u = LRelation (const top) (listToUniverse u)
 
 
 -- | Return relation as a list of pairs
-toPairs :: (ResiduatedLattice l, Eq a) => LRelation a l -> [((a, a), l)]
-toPairs (LRelation f u) = [(x, f x) | x <- u]
+toList :: (ResiduatedLattice l, Eq a) => LRelation a l -> [((a, a), l)]
+toList (LRelation f u) = [(x, f x) | x <- u]

src/Fuzzy/Sets/LSet.hs

@@ -7,7 +7,7 @@ module Fuzzy.Sets.LSet(
     FuzzySet(member, universe),
     fromPairs,
     fromFunction,
-    toPairs,
+    toList,
     mkEmptySet,
     mkSingletonSet,
     mkUniversalSet
@@ -31,7 +31,7 @@ data (ResiduatedLattice l) => LSet a l = LSet
 
 instance (Eq a, Show a, Show l, ResiduatedLattice l) => Show (LSet a l) where
     show :: LSet a l -> String
-    show set = "FuzzySet { " ++ show (toPairs set) ++ " }"
+    show set = "FuzzySet { " ++ show (toList set) ++ " }"
 
 
 instance (ResiduatedLattice l, Eq a) => FuzzySet (LSet a l) a l where
@@ -57,24 +57,24 @@ fromPairs xs = LSet f u
 
 >>> let f x = if x == 1 then 0.8 else 0.3
 >>> let set = fromFunction f [1, 2, 3] :: LSet Int UILukasiewicz
->>> toPairs set
+>>> toList set
 [(1,0.8),(2,0.3),(3,0.3)]
 -}
 fromFunction :: (ResiduatedLattice l) => (a -> l) -> [a] -> LSet a l
 fromFunction = LSet
 
 
 -- | Convert fuzzy set to list of pairs 
-toPairs :: (ResiduatedLattice l, Eq a) => LSet a l -> [(a, l)]
-toPairs (LSet f universe) = [(u, f u) | u <- universe]
+toList :: (ResiduatedLattice l, Eq a) => LSet a l -> [(a, l)]
+toList(LSet f universe) = [(u, f u) | u <- universe]
 
 
 {- | Construct an empty fuzzy set
 
 ==== __Examples__
 
 >>> let emptySet = mkEmptySet :: LSet Int UILukasiewicz
->>> toPairs emptySet
+>>> toList emptySet
 []
 -}
 mkEmptySet :: (ResiduatedLattice l) => LSet a l
@@ -85,7 +85,7 @@ mkEmptySet = LSet (const bot) []
 ==== __Examples__
 
 >>> let singletonSet = mkSingletonSet [1, 2, 3] (2, 0.8) :: LSet Int UILukasiewicz
->>> toPairs singletonSet
+>>> toList singletonSet
 [(1,0.0),(2,0.8),(3,0.0)]
 -}
 mkSingletonSet :: (ResiduatedLattice l, Eq a) => [a] -> (a, l) -> LSet a l
@@ -101,7 +101,7 @@ mkSingletonSet u (x, l) = LSet f u
 ==== __Examples__
 
 >>> let universalSet = mkUniversalSet [1, 2, 3] :: LSet Int UILukasiewicz
->>> toPairs universalSet
+>>> toList universalSet
 [(1,1.0),(2,1.0),(3,1.0)]
 -}
 mkUniversalSet :: (ResiduatedLattice l, Eq a) => [a] -> LSet a l

src/Fuzzy/Sets/Properties.hs

@@ -25,7 +25,7 @@ import FuzzySet
 >>> isEmpty emptySet
 True
 
->>> let nonEmptySet = fromPairs [(1, 0.2), (2, 0.0)] :: LSet Int UILukasiewicz
+>>> let nonEmptySet = fromList [(1, 0.2), (2, 0.0)] :: LSet Int UILukasiewicz
 >>> isEmpty nonEmptySet
 False
 -}
@@ -42,7 +42,7 @@ one `u` in 'universe' for which 'member' u is greater than 'bot'.
 >>> isSingleton singletonSet
 True
 
->>> let nonSingletonSet = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let nonSingletonSet = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> isSingleton nonSingletonSet
 False
 -}
@@ -54,11 +54,11 @@ isSingleton set = length (filter (> bot) (truthDegrees set)) == 1
 
 ==== __Examples__
 
->>> let crispSet = fromPairs [(1, 1.0), (2, 0.0)] :: LSet Int UILukasiewicz
+>>> let crispSet = fromList [(1, 1.0), (2, 0.0)] :: LSet Int UILukasiewicz
 >>> isCrisp crispSet
 True
 
->>> let nonCrispSet = fromPairs [(1, 0.5), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let nonCrispSet = fromList [(1, 0.5), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> isCrisp nonCrispSet
 False
 -}
@@ -77,7 +77,7 @@ This means that the fuzzy set equals its universe.
 >>> isUniversal universalSet
 True
 
->>> let nonUniversalSet = fromPairs [(1, 1.0), (2, 0.8)] :: LSet Int UILukasiewicz
+>>> let nonUniversalSet = fromList [(1, 1.0), (2, 0.8)] :: LSet Int UILukasiewicz
 >>> isUniversal nonUniversalSet
 False
 -} 
@@ -96,7 +96,7 @@ height _ = top
 
 {- | Support is a list of all elements with non 'bot' 'member' 
 
->>> let set = fromPairs [(1, 0), (2, 0.8), (3, 0), (4, 0.5), (6, 0)]
+>>> let set = fromList [(1, 0), (2, 0.8), (3, 0), (4, 0.5), (6, 0)]
 [2, 4] 
 -}
 support :: (FuzzySet set a l) => set -> [a]
@@ -110,7 +110,7 @@ In other words it's a list of items with 'member' equal to 'top'
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 1:0), (2, 0.8), (3, 1.0), (4, 0.5), (6, 1.0)]
+>>> let set = fromList [(1, 1:0), (2, 0.8), (3, 1.0), (4, 0.5), (6, 1.0)]
 >>> core set
 [1, 3, 6]
 
@@ -125,8 +125,8 @@ Membership of values from A is smaller than B for every item of universe
 
 ==== __Examples__
 
->>> let setA = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
->>> let setB = fromPairs [(1, 0.3), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let setA = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setB = fromList [(1, 0.3), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> strictSubsethood setA setB
 True
 
@@ -142,12 +142,12 @@ Member of all values from universe in set A is equal to member of all values in
 
 ==== __Examples__
 
->>> let setA = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
->>> let setB = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setA = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setB = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
 >>> strictEquality setA setB
 True
 
->>> let setC = fromPairs [(1, 0.3), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setC = fromList [(1, 0.3), (2, 0.5)] :: LSet Int UILukasiewicz
 >>> strictEquality setA setC
 False
 -}
@@ -160,8 +160,8 @@ If the result is 1, we can conclude that A ⊆ B.
 
 ==== __Examples__
 
->>> let setA = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
->>> let setB = fromPairs [(1, 0.3), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let setA = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setB = fromList [(1, 0.3), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> gradedSubsethood setA setB
 1.0
 
@@ -181,12 +181,12 @@ If the result is 1, the fuzzy sets are equal.
 
 ==== __Examples__
 
->>> let setA = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
->>> let setB = fromPairs [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setA = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setB = fromList [(1, 0.2), (2, 0.5)] :: LSet Int UILukasiewicz
 >>> gradedEquality setA setB
 1.0
 
->>> let setC = fromPairs [(1, 0.3), (2, 0.5)] :: LSet Int UILukasiewicz
+>>> let setC = fromList [(1, 0.3), (2, 0.5)] :: LSet Int UILukasiewicz
 >>> gradedEquality setA setC
 0.9
 -}

src/FuzzySet.hs

@@ -49,7 +49,7 @@ mkUniversalSet = mkFuzzySet (const top)
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 0.1), (2, 0.2), (3. 0.4)]
+>>> let set = fromList [(1, 0.1), (2, 0.2), (3. 0.4)]
 >>> alphaCut 0.15 set 
 [2, 3]
 
@@ -71,16 +71,16 @@ alphaCut alpha set = [x | x <- u, f x >= alpha]
 
 ==== __Examples__
 
->>> let set1 = fromPairs [(1, 0.2), (2, 0.7), (3, 0.1)] :: LSet Int UILukasiewicz 
->>> let set2 = fromPairs [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz 
->>> let set3 = fromPairs [(1, 0.5), (2, 0.1), (4, 0.8)] :: LSet Int UILukasiewicz
->>> toPairs $ union set1 set2
+>>> let set1 = fromList [(1, 0.2), (2, 0.7), (3, 0.1)] :: LSet Int UILukasiewicz 
+>>> let set2 = fromList [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz 
+>>> let set3 = fromList [(1, 0.5), (2, 0.1), (4, 0.8)] :: LSet Int UILukasiewicz
+>>> toList $ union set1 set2
 [(1, 0.3),(2, 0.7), (3, 0.1)]
 
->>> toPairs $ union set1 set3
+>>> toList $ union set1 set3
 [(1, 0.5), (2, 0.7), (3, 0.1), (4, 0.8)]
 
->>> toPairs $ union set1 mkEmptySet
+>>> toList $ union set1 mkEmptySet
 [(1, 0.2), (2, 0.7), (3, 0.1)]
 -}
 union :: (FuzzySet set a l) => set -> set -> set
@@ -99,16 +99,16 @@ unions sets@(set:_) = foldr union (mkUniversalSet (universe set)) sets
 
 ==== __Examples__
 
->>> let set1 = fromPairs [(1, 0.2), (2, 0.7), (3, 0.1)]
->>> let set2 = fromPairs [(1, 0.3), (2, 0.4)]
->>> let set3 = fromPairs [(1, 0.5), (2, 0.1), (4, 0.8)] :: LSet Int UILukasiewicz
->>> toPairs $ intersection set1 set2
+>>> let set1 = fromList [(1, 0.2), (2, 0.7), (3, 0.1)]
+>>> let set2 = fromList [(1, 0.3), (2, 0.4)]
+>>> let set3 = fromList [(1, 0.5), (2, 0.1), (4, 0.8)] :: LSet Int UILukasiewicz
+>>> toList $ intersection set1 set2
 [(1, 0.2), (2, 0.4), (3, 0.0)]
 
->>> toPairs $ intersection set1 set3
+>>> toList $ intersection set1 set3
 [(1, 0.2), (2, 0.1), (3, 0.0), (4, 0.0)]
 
->>> toPairs $ intersection set1 mkEmptySet
+>>> toList $ intersection set1 mkEmptySet
 [(1, 0.0), (2, 0.0), (3, 0.0)]
 -}
 intersection :: (FuzzySet set a l) => set -> set -> set
@@ -125,12 +125,12 @@ intersections = foldr intersection mkEmptySet
 
 ==== __Examples__
 
->>> let set1 = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
->>> toPairs $ complement set1
+>>> let set1 = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> toList $ complement set1
 [(1, 0.8),(2, 0.3)]
 
->>> let set2 = fromPairs [(1, 1), (2, 1)]
->>> toPairs $ complement set2
+>>> let set2 = fromList [(1, 1), (2, 1)]
+>>> toList $ complement set2
 [(1, 0), (2, 0)]
 -}
 complement :: (FuzzySet set a l) => set -> set
@@ -142,9 +142,9 @@ complement set = mkFuzzySet (negation . f)  (universe set)
 
 ==== __Examples__
 
->>> let set1 = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
->>> let set2 = fromPairs [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz
->>> toPairs $ setTnorm set1 set2
+>>> let set1 = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let set2 = fromList [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz
+>>> toList $ setTnorm set1 set2
 [(1,0.2), (2,0.4)]
 -}
 setTnorm :: (FuzzySet set a l) => set -> set -> set
@@ -158,9 +158,9 @@ setTnorm set1 set2 = mkFuzzySet (\x -> f x `tnorm` g x) u
 
 ==== __Examples__
 
->>> let set1 = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
->>> let set2 = fromPairs [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz
->>> toPairs $ setResiduum set1 set2
+>>> let set1 = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let set2 = fromList [(1, 0.3), (2, 0.4)] :: LSet Int UILukasiewicz
+>>> toList $ setResiduum set1 set2
 [(1,1.0), (2,0.7)]
 -} 
 setResiduum :: (FuzzySet set a l) => set -> set -> set
@@ -174,9 +174,9 @@ setResiduum set1 set2 = mkFuzzySet (\x -> f x --> g x) u
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let set = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> let modifiedSet = mapMembership set (\x -> x + 1)
->>> toPairs modifiedSet
+>>> toList modifiedSet
 [(1,0.0),(2,0.0),(3,0.2)]
 -}
 mapMembership :: (FuzzySet set a l) => set -> (a -> a) -> set
@@ -190,9 +190,9 @@ mapMembership set g = mkFuzzySet (f . g) u
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 0.2), (2, 0.7), (3, 0.4)] :: LSet Int UILukasiewicz
+>>> let set = fromList [(1, 0.2), (2, 0.7), (3, 0.4)] :: LSet Int UILukasiewicz
 >>> let filteredSet = filterMembership set (\x -> x > 1)
->>> toPairs filteredSet
+>>> toList filteredSet
 [(1,0.0),(2,0.7),(3,0.4)]
 -}
 filterMembership :: (FuzzySet set a l) => set -> (a -> Bool) -> set
@@ -207,9 +207,9 @@ filterMembership set pred =  mkFuzzySet h u
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
+>>> let set = fromList [(1, 0.2), (2, 0.7)] :: LSet Int UILukasiewicz
 >>> let modifiedSet = mapU set (\x -> x * 2)
->>> toPairs modifiedSet
+>>> toList modifiedSet
 [(2,0.2),(4,0.7)]
 -}
 mapU :: (FuzzySet set a l) => set -> (a -> a) -> set
@@ -223,9 +223,9 @@ mapU set g = mkFuzzySet f u
 
 ==== __Examples__
 
->>> let set = fromPairs [(1, 0.2), (2, 0.7), (3, 0.4)] :: LSet Int UILukasiewicz
+>>> let set = fromList [(1, 0.2), (2, 0.7), (3, 0.4)] :: LSet Int UILukasiewicz
 >>> let filteredSet = filterU set (\x -> x > 1)
->>> toPairs filteredSet
+>>> toList filteredSet
 [(2,0.7),(3,0.4)]
 -}
 filterU :: (FuzzySet set a l) => set -> (a -> Bool) -> set

src/Lattices/UnitInterval.hs

@@ -6,6 +6,7 @@ module Lattices.UnitInterval(
 ) where
 
 import Lattices.ResiduatedLattice
+import Data.Ord (clamp)
 
 -- | unit interval on real numbers [0,1]
 newtype UnitInterval = UnitInterval Double 
@@ -23,4 +24,4 @@ instance Show UnitInterval where
 
 -- | Unit interval constructor. Ensures values are in bounds
 mkUnitInterval :: Double -> UnitInterval
-mkUnitInterval x = UnitInterval $ max 0 $ min 1 x
+mkUnitInterval x = UnitInterval $ clamp (0, 1) x