[only code cleaning (I hope so!)
martin.hofmann@uni-bamberg.de**20100316091855] hunk ./src/Igor2/Data/Hypotheses.hs 72
-    h = HH S.empty M.empty noCalls eRD
-    eRD = mkRatingData (-1)(-1)(-1)(-1)([],(0/0))
+    h   = HH S.empty M.empty noCalls emptyRatingData
hunk ./src/Igor2/Data/Hypotheses.hs 75
-isFinished = S.null . open
+isFinished    = S.null . open
hunk ./src/Igor2/Data/Hypotheses.hs 81
-openRules h = (S.map crul(open h))
+openRules h   = (S.map crul(open h))
hunk ./src/Igor2/Data/Hypotheses.hs 84
-allRules h = S.union (closedRules h) (openRules h)
+allRules h    = S.union (closedRules h) (openRules h)
hunk ./src/Igor2/Data/Hypotheses.hs 89
-    ins m e = M.alter (insertM (crul e)) (star e) m
-    star = mkName . ('*':) . show . name
+    ins m e   = M.alter (insertM (crul e)) (star e) m
+    star      = mkName . ('*':) . show . name
hunk ./src/Igor2/Data/Hypotheses.hs 97
-simplifiedBindings :: (MonadPlus m, MonadError e m) => Hypo -> C m (CallDep, [(Name,Rules)])
+simplifiedBindings :: (MonadPlus m, MonadError e m) => 
+                     Hypo -> C m (CallDep, [(Name,Rules)])
hunk ./src/Igor2/Data/Hypotheses.hs 104
-        -- get those functions which are th outer most in the call graph
+        -- get those functions which are the outer most in the call graph
hunk ./src/Igor2/Data/Hypotheses.hs 108
-                       (foldM inject bnds is) >>= sbnds (blckl++nis) (foldl (flip annexFun) cd is)
-                       -- add the non-injectables to the blacklist, update the 
-                       -- CallDep and inject the injectables in all other bindings  
-    isInjectable bnds n = let fbnds = lookup n bnds in
-        (not $ "*" `isPrefixOf` (show n))
-        &&
-        (maybe False id (liftM ((==1).S.size) fbnds))
+                       (foldM inject bnds is) >>= 
+                         sbnds (blckl++nis) (foldl (flip annexFun) cd is)
+            -- add the non-injectables to the blacklist, update the 
+            -- CallDep and inject the injectables in all other bindings  
+            
+    isInjectable bnds n = let fbnds = lookup n bnds in and $ 
+        [ not $ "*" `isPrefixOf` (show n)
+        -- true if function is not unfinished  
+        , maybe False id (liftM ((==1).S.size) fbnds)
hunk ./src/Igor2/Data/Hypotheses.hs 120
-        &&
-        (maybe False (not . (any hasHO) . S.toList) fbnds)
+        , maybe False (not . (any hasHO) . S.toList) fbnds
hunk ./src/Igor2/Data/Hypotheses.hs 122
-        &&
-        (not $ any hasHO $ filter (flip doesCallTo n) $ concatMap (S.toList . snd) $ bnds)
-        -- True if any function which calls the function with name at hand is not a HO
+        , not $ any hasHO $ filter (flip doesCallTo n) $ 
+          concatMap (S.toList . snd) $ bnds
+        -- True if any function which calls the function with name at 
+        -- hand is not a HO
+        ]
hunk ./src/Igor2/Data/Hypotheses.hs 141
-developH ::  (MonadPlus m, MonadError e m) => 
-        CovrRule ->      -- the CovrRule that was changed
-        Hypo ->          -- the hypothese to develop
-        (CovrRules       -- the CovrRules resulting from the change
-        ,[Call]) ->      -- a list of Calls  
-        C m Hypo          -- the resulting hypothese in the C Monad
+developH :: (MonadPlus m, MonadError e m) => 
+           CovrRule           -> -- the CovrRule that was changed
+           Hypo               -> -- the hypothese to develop
+           (CovrRules,[Call]) -> -- ( the CovrRules resulting from the change
+                                -- , a list of Calls )
+           C m Hypo             -- the resulting hypothese in the C Monad
hunk ./src/Igor2/Data/Hypotheses.hs 151
---    error $ "CHECK " ++ "\n" ++ (showp h) ++ "\n" ++ (showp h') ++ (showp (cdps' :: (Maybe CallDep)))
---    maybe (return Nothing)(\c -> liftM Just $ updateRating h{callings = c}) $ foldM tryAddCall cdps calls
-    
hunk ./src/Igor2/Data/Hypotheses.hs 168
-unsafeModify :: 
-        CovrRule    -- ^replace/update old rule
-     -> CovrRules    -- ^with new rules
-     -> Hypo    -- ^in hypothese
-     -> Hypo
+unsafeModify :: CovrRule    -- ^replace/update old rule
+             -> CovrRules   -- ^with new rules
+             -> Hypo        -- ^in hypothese
+             -> Hypo
hunk ./src/Igor2/Data/Hypotheses.hs 191
-      numPartitions <- numberOfPartitions h
-      numClosedPartitions <- numberOfClosedPartitions h
-      heu <- heuristic h
-      let numOpenRules = numberOfOpenRules h
-      let numFreeVars = numberOfFreeVars h
-      let numTotalRules = numberOfTotalRules h  
+      numPartitions        <- numberOfPartitions h
+      numClosedPartitions  <- numberOfClosedPartitions h
+      heu                  <- heuristic h
+      let numOpenRules     = numberOfOpenRules h
+      let numFreeVars      = numberOfFreeVars h
+      let numTotalRules    = numberOfTotalRules h  
hunk ./src/Igor2/Data/Hypotheses.hs 199
-      let numCycles = cycles . callings $ h         
-      let numFVarPerRule  = 
+      let numCycles        = cycles . callings $ h         
+      let numFVarPerRule   = 
hunk ./src/Igor2/Data/Hypotheses.hs 203
-      return ( mkRatingData
+      return ( ratingData
hunk ./src/Igor2/Data/Hypotheses.hs 243
-        leastPatterns [] p = return [p]
+        leastPatterns [] p       = return [p]
hunk ./src/Igor2/Data/Hypotheses.hs 255
-    (cd,bs) <- simplifiedBindings h
+    (cd,bs)   <- simplifiedBindings h
hunk ./src/Igor2/Data/Hypotheses.hs 257
-    let numFs  = length bs
-    let numRs  = length allRs
-    numPs <- numberOfPartitions h         
+    let numFs = length bs
+    let numRs = length allRs
+    numPs     <- numberOfPartitions h         
hunk ./src/Igor2/Data/Rateable.hs 4
-    Rateable(..), RatingData, mkRatingData
+    Rateable(..), RatingData, ratingData, emptyRatingData
hunk ./src/Igor2/Data/Rateable.hs 30
-mkRatingData = RD
+ratingData = RD
+
+emptyRatingData = ratingData (-1)(-1)(-1)(-1)([],(0/0))        