Merge pull request #17 from luckyluke66/bugfixes

Bugfixes

Author: luckyluke66

fuzzySets.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               fuzzySets
-version:            0.1.0.0
+version:            1.0.0
 category:           Math
 license:            BSD-3-Clause
 author:             Lukas Balog <lukasbalog66@gmail.com>
@@ -47,7 +47,7 @@ library
         Utils.Utils
 
     build-depends:    
-        base,
+        base >=4.14 && < 4.17,
 
     default-extensions:
         InstanceSigs

src/Fuzzy/Sets/Cardinality.hs

@@ -97,7 +97,7 @@ The parameters `p`, `r`, and `threshold` control the behavior of the modifier.
 -}
 modifierFunction :: (ResiduatedLattice l) => Double -> Double -> Double -> (l -> l)
 modifierFunction p r threshold a
-    | realToFrac a < threshold = mkLattice $ threshold ** (1 - p) * realToFrac a ** p
+    | realToFrac a < threshold = mkLattice $ threshold ** (1 - p) * (realToFrac a ** p)
     | realToFrac a >= threshold = mkLattice $ 1 - (1 - threshold) ** (1 - r) * (1 - realToFrac a) ** r
 
 

src/Lattices/ResiduatedLattice.hs

@@ -38,7 +38,7 @@ type Nat = Int
 -- a '\/' (a '/\' b) ≡ a
 -- a '/\' (a '\/' b) ≡ a
 -- @
-class (Eq l, Ord l, Num l, Real l, RealFrac l, Fractional l) => BoundedLattice l where
+class RealFrac l => BoundedLattice l where
     -- | meet
     (/\) :: l -> l -> l
     -- | join
@@ -49,7 +49,6 @@ class (Eq l, Ord l, Num l, Real l, RealFrac l, Fractional l) => BoundedLattice l
     bot :: l
     -- | constructor for lattice
     mkLattice :: Double -> l
-    -- proc jsou tam vsechny classy? 
 
 -- | A bounded lattice with additional laws and operations namely --> and tnorm
 --