[code cleaning and simplification
martin.hofmann@uni-bamberg.de**20100315155316] hunk ./src/Igor2/Data/HypoSpace.hs 47
-initHSpace r = hypo [r] >>= (pushHypo emptyHSpace)    
+initHSpace r = hypo [r] >>= return . (pushHypo emptyHSpace)    
hunk ./src/Igor2/Data/HypoSpace.hs 49
-pushHypo :: (MonadPlus m, MonadError e m) => HSpace -> Hypo -> C m HSpace
-pushHypo hs h = liftM incCntr $ pushUnsafe hs h
+pushHypo :: HSpace -> Hypo -> HSpace
+pushHypo hs h = incCntr $ pushUnsafe hs h
hunk ./src/Igor2/Data/HypoSpace.hs 52
-pushHypos :: (MonadPlus m, MonadError e m) => [Hypo] -> HSpace -> C m HSpace
-pushHypos h hsp  = foldM pushHypo hsp h
+pushHypos :: [Hypo] -> HSpace -> HSpace
+pushHypos h hsp  = foldl pushHypo hsp h
hunk ./src/Igor2/Data/HypoSpace.hs 73
-pushUnsafe :: (MonadPlus m, MonadError e m) => HSpace -> Hypo -> C m HSpace
-pushUnsafe (HS c hp) h = do rh <- rate h; return $ HS c (H.insert rh h hp)     
+pushUnsafe :: HSpace -> Hypo -> HSpace
+pushUnsafe (HS c hp) h = HS c (H.insert (rating h) h hp)     
hunk ./src/Igor2/Data/Hypotheses.hs 6
-    open, clsd, callings,
+    open, clsd, rating, callings,
hunk ./src/Igor2/Data/Hypotheses.hs 54
-                , rtng :: RatingData
+                , rating :: RatingData
hunk ./src/Igor2/Data/Hypotheses.hs 65
-	pretty h = text "Hypo" <+> pretty (rtng h) <$> 
+	pretty h = text "Hypo" <+> pretty (rating h) <$> 
hunk ./src/Igor2/Data/Hypotheses.hs 178
-updateRating h = do v <- rate h; return h{rtng = v}     
+updateRating h = do v <- rate h; return h{rating = v}     
hunk ./src/Igor2/Data/Hypotheses.hs 248
-               if b1 then return (p1:ps)
-               else if b2 then return (p2:ps)
-                    else liftM (p1:) (leastPatterns ps p2)
+          if b1 then return (p1:ps)
+            else if b2 then return (p2:ps)
+                 else liftM (p1:) (leastPatterns ps p2)
hunk ./src/Igor2/SynthesisEngine.hs 139
-finishTier ejcts cnds hsp = lift4 (pushHypos ejcts hsp) >>= continue cnds
+finishTier ejcts cnds hsp =continue cnds $ (pushHypos ejcts hsp)
hunk ./src/Igor2/SynthesisEngine.hs 141
-continue cnds hsp = do 
-    ahs   <- advance . head $ cnds
-    hsp'  <- lift4 $ (pushHypos (tail cnds) hsp >>= pushHypos ahs)  
-    doLoop hsp' 
-    
+continue (h:hs) hsp = do 
+    newhs   <- advance h
+    doLoop  $ pushHypos (newhs ++ hs) hsp
+        
hunk ./src/Igor2/SynthesisEngine.hs 164
-lift4 = lift . lift . lift . lift
+