Operads 0.5 → 0.6

raw patch · 3 files changed

+74/−11 lines, 3 files

Files

• Math/Operad/Map.hs +70/−0
• Math/Operad/OperadGB.hs +2/−9
• Operads.cabal +2/−2

@@ -0,0 +1,70 @@+-- Copyright 2009 Mikael Vejdemo Johansson <mik@stanford.edu>+-- Released under a BSD license++-- | The module 'Math.Operad.Map' is a thin wrapper around 'Data.Map', built to maintain the +-- particular needs of the Operads package.++module Math.Operad.Map where+ +import Prelude hiding (map)                       +import qualified Prelude as P+import qualified Data.Map as M+import Math.Operad.OrderedTree+import Control.Arrow++data (Ord a, Show a, TreeOrdering t) => StoredTree a t = ST [[a]] [Int] (OrderedTree a t) deriving (Show, Read, Eq)++sot :: (Ord a, Show a, TreeOrdering t) => OrderedTree a t -> StoredTree a t+sot pdt = let+    (path,perm) = orderedPathSequence (dt pdt)+  in ST path perm pdt++dot :: (Ord a, Show a, TreeOrdering t) => StoredTree a t -> OrderedTree a t+dot (ST _ _ pdt) = pdt++instance (Ord a, Show a, TreeOrdering t) => Ord (StoredTree a t) where+    compare (ST pathseq pathperm (OT _ o)) (ST pathseq' pathperm' (OT _ _)) = +        comparePathSequence o (pathseq,pathperm) (pathseq', pathperm')+--            where _ = ordering :: t++data (Ord a, Show a, TreeOrdering t) => Map a t v = TM (M.Map (StoredTree a t) v) deriving (Show, Read, Eq, Ord)++filter :: (Ord a, Show a, TreeOrdering t) => (v -> Bool) -> Map a t v -> Map a t v+filter f (TM m) = TM $ M.filter f m++foldWithKey :: (Ord a, Show a, TreeOrdering t) => +               (OrderedTree a t -> v -> b -> b) -> b -> Map a t v -> b+foldWithKey f i (TM m) = M.foldWithKey (\k val acc -> f (dot k) val acc) i m++fromListWith :: (Ord a, Show a, TreeOrdering t) => +                (v -> v -> v) -> [(OrderedTree a t, v)] -> Map a t v+fromListWith f lst = TM $ M.fromListWith f (P.map (first sot) lst)++intersectionWith :: (Ord a, Show a, TreeOrdering t) => +                    (u -> v -> w) -> Map a t u -> Map a t v -> Map a t w+intersectionWith f (TM m) (TM n) = TM $ M.intersectionWith f m n++keys :: (Ord a, Show a, TreeOrdering t) => Map a t v -> [OrderedTree a t]+keys (TM m) = P.map dot . M.keys $ m++map :: (Ord a, Show a, TreeOrdering t) => +       (v -> w) -> Map a t v -> Map a t w+map f (TM m) = TM $ M.map f m++mapKeysWith :: (Ord a, Show a, TreeOrdering t, Ord b, Show b, TreeOrdering s) => +               (v -> v -> v) -> (OrderedTree a t -> OrderedTree b s) -> Map a t v -> Map b s v+mapKeysWith c f (TM m) = TM $ M.mapKeysWith c (sot . f . dot) m++maxViewWithKey :: (Ord a, Show a, TreeOrdering t) => +                  Map a t v -> Maybe ((OrderedTree a t, v), Map a t v)+maxViewWithKey (TM m) = fmap (\((t,v),mmap) -> ((dot t, v), TM mmap)) . M.maxViewWithKey $ m++null :: (Ord a, Show a, TreeOrdering t) => Map a t v -> Bool+null (TM m) = M.null m ++toList :: (Ord a, Show a, TreeOrdering t) => Map a t v -> [(OrderedTree a t, v)]+toList (TM m) = P.map (first dot) (M.toList m)++unionWith :: (Ord a, Show a, TreeOrdering t) => +             (v -> v -> v) -> Map a t v -> Map a t v -> Map a t v+unionWith f (TM m) (TM n) = TM (M.unionWith f m n)

@@ -293,15 +293,8 @@  -- | Verifies that two integer sequences correspond to the same total ordering of the entries. equivalentOrders :: [Int] -> [Int] -> Bool-equivalentOrders ss ts = let-    sLookup :: [(Int,Int)]-    sLookup = zip (sort ss) [1..]-    tLookup :: [(Int,Int)]-    tLookup = zip (sort ts) [1..]-    sOrder = map (fromJust . flip lookup sLookup) ss-    tOrder = map (fromJust . flip lookup tLookup) ts-  in-    sOrder == tOrder+equivalentOrders o1 o2 = if length o1 /= length o2 then False +           else and $ zipWith (==) (zipWith compare o1 (tail o1)) (zipWith compare o2 (tail o2))  -- | Returns True if any of the vertices in the given tree has been tagged. subTreeHasNothing :: (Ord a, Show a) => DecoratedTree (Maybe a) -> Bool

@@ -1,5 +1,5 @@ Name:                   Operads-Version:                0.5+Version:                0.6 Stability:              alpha License:                BSD3 License-file:           LICENSE@@ -157,7 +157,7 @@ Library          Build-Depends:          base, array, mtl, containers         Exposed-Modules:        Math.Operad-        Other-Modules:          Math.Operad.OperadGB, Math.Operad.OrderedTree, Math.Operad.PPrint, Math.Operad.PolyBag, Math.Operad.MapOperad+        Other-Modules:          Math.Operad.OperadGB, Math.Operad.OrderedTree, Math.Operad.PPrint, Math.Operad.PolyBag, Math.Operad.MapOperad Math.Operad.Map         ghc-options:            -Wall         ghc-prof-options:       -auto-all         Extensions:             CPP