Changeset 12774

Timestamp:

03.11.2009 14:25:57 (3 weeks ago)

Author:

maeder

Message:

moved leqClasses

Location:

trunk

Files:

• CASL/ColimSign.hs (modified) (2 diffs)
• CASL/Overload.hs (modified) (4 diffs)
• Common/Lib/Rel.hs (modified) (2 diffs)
• Common/SetColimit.hs (modified) (1 diff)

trunk/CASL/ColimSign.hs

@@ -212 +212 @@
                        names $ Set.toList oSet
        equivF (id1, ot1) (id2, ot2) = (id1 == id2) && leqF sig ot1 ot2
-       parts = leqClasses equivF oSet
+       parts = Rel.leqClasses equivF oSet
        addParts rel equivList =
          foldl (\(r, f) l -> let l1 = map (\x -> Map.findWithDefault (x,n) x $
@@ -389 +389 @@
                        names $ Set.toList pSet
        equivP (id1, pt1) (id2, pt2) = (id1 == id2) && leqP sig pt1 pt2
-       parts = leqClasses equivP pSet
+       parts = Rel.leqClasses equivP pSet
        nmor = Map.findWithDefault (error "buildAtNode") n morMap
        addParts rel equivList =

trunk/CASL/Overload.hs

@@ -30 +30 @@
   , keepMinimals1
   , keepMinimals
-  , leqClasses
   ) where
 
@@ -207 +206 @@
         preds = case mty of
                    Nothing -> map (pSortBy predArgs sign)
-                              $ leqClasses (leqP' sign) preds'
+                              $ Rel.leqClasses (leqP' sign) preds'
                    Just ty -> [[ty] | Set.member ty preds']
     noOpOrPred preds "predicate" mty ide pos nargs
@@ -307 +306 @@
         ops = case mty of
                    Nothing -> map (pSortBy opArgs sign)
-                              $ leqClasses (leqF' sign) ops'
+                              $ Rel.leqClasses (leqF' sign) ops'
                    Just ty -> [[ty] | Set.member ty ops' ||
                                   -- might be known to be total
@@ -473 +472 @@
     and . zipWith (haveCommonSubsorts sign) (predArgs p1) . predArgs
 
--- | Divide a Set (List) into equivalence classes w.r.t. eq
-leqClasses :: Ord a => (a -> a -> Bool) -> Set.Set a -> [[a]]
-leqClasses eq = map Set.toList . Rel.partSet eq
-
 cmpSubsort :: Sign f e -> POrder SORT
 cmpSubsort sign s1 s2 =

trunk/Common/Lib/Rel.hs

@@ -40 +40 @@
     , toSet, fromSet, topSort, nodes, collaps
     , transpose, transReduce, setInsert, setToMap
-    , fromDistinctMap, locallyFiltered, flatSet, partSet
+    , fromDistinctMap, locallyFiltered, flatSet, partSet, leqClasses
     ) where
 
@@ -308 +308 @@
               in Set.insert x (Set.unions es) : ds
 
+-- | Divide a Set (List) into equivalence classes w.r.t. eq
+leqClasses :: Ord a => (a -> a -> Bool) -> Set.Set a -> [[a]]
+leqClasses eq = List.map Set.toList . partSet eq
+
 -- | flattens a list of non-empty sets and uses the minimal element of
 -- each set to represent the set

trunk/Common/SetColimit.hs

@@ -23 +23 @@
  where
 
+import Common.Id
 import Common.Lib.Graph
+import Common.Lib.Rel (leqClasses)
+
 import Data.Graph.Inductive.Graph
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import CASL.Overload(leqClasses)
-import Common.Id
 
 compose :: (Ord a) => Set.Set (a, Int) ->