Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fuzzySets.cabal
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -47,7 +47,7 @@ library
Utils.Utils

build-depends:
base,
base >=4.14 && < 4.17,

default-extensions:
InstanceSigs
Expand Down
2 changes: 1 addition & 1 deletion src/Fuzzy/Sets/Cardinality.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
3 changes: 1 addition & 2 deletions src/Lattices/ResiduatedLattice.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
--
Expand Down
Loading