[code cosmetics in HypoSpace.hs
martin.hofmann@uni-bamberg.de**20090126073636] hunk ./src/Data/HypoSpace.hs 70
-	let h = hsp `seq` B.lookupR i (hypoIdBimap hsp)
-	in h `seq` h
+        let h = hsp `seq` B.lookupR i (hypoIdBimap hsp)
+        in h `seq` h
hunk ./src/Data/HypoSpace.hs 75
-	let i = hsp `seq` B.lookup h (hypoIdBimap hsp)
-	in i `seq` i
+        let i = hsp `seq` B.lookup h (hypoIdBimap hsp)
+        in i `seq` i
hunk ./src/Data/HypoSpace.hs 95
-alterRateIdsMap :: (Maybe IDs -> Maybe IDs) 
-                   -- ^alter with function
-                -> Hypo
-                   -- ^at 'Hypo'
-                -> HSpace
-                   -- ^in HypoSpace
-                -> HSpace
-                   -- ^yielding resulting HypoSpace
+alterRateIdsMap :: (Maybe IDs -> Maybe IDs) -- ^alter with function
+                -> Hypo                     -- ^at 'Hypo'
+                -> HSpace                   -- ^in HypoSpace
+                -> HSpace                   -- ^yielding resulting HypoSpace
hunk ./src/Data/HypoSpace.hs 103
-alterRuleIdsMap :: (Maybe IDs -> Maybe IDs)
-                   -- ^alter with function
-                -> Hypo
-                   -- ^at each ruleFrag in Hypo
-                -> HSpace
-                   -- ^in HypoSpace
-                -> HSpace
-                   -- ^yielding resulting HypoSpace
+alterRuleIdsMap :: (Maybe IDs -> Maybe IDs) -- ^alter with function
+                -> Hypo                     -- ^at each ruleFrag in Hypo
+                -> HSpace                   -- ^in HypoSpace
+                -> HSpace                   -- ^yielding resulting HypoSpace
hunk ./src/Data/HypoSpace.hs 113
-                 -> Hypo
-                   -- ^at Hypo
-                 -> HSpace
-                   -- ^in HypoSpace
-                 -> HSpace
-                   -- ^yielding resulting HypoSpace
+                 -> Hypo                  -- ^at Hypo
+                 -> HSpace                -- ^in HypoSpace
+                 -> HSpace                -- ^yielding resulting HypoSpace
hunk ./src/Data/HypoSpace.hs 139
-	| (B.member h (hypoIdBimap hsp)) = hsp
-	| otherwise 					 =
---		trace ("INSERT: " ++ " " ++ (show (M.elems (rateIdsMap hsp))) ++ "\n" ++ (show ((B.keysR.hypoIdBimap) hsp))) 
---	    trace (show (B.member h (hypoIdBimap hsp),B.memberR iD (hypoIdBimap hsp)))
---	    trace (show ((B.lookup h (hypoIdBimap hsp)):: (Maybe Integer)))
---	    trace (show h)
---	    trace (show hsp)
-	    incrementHypoCount $ 
-	    alterRateIdsMap  (mbInsert iD)      h $!
-	    alterRuleIdsMap  (mbInsert iD)      h $!
-	    alterHypoIdBimap (flip B.insert iD) h $!
-	    hsp
+        | (B.member h (hypoIdBimap hsp)) = hsp
+    -- duplicate hypos would not be stored anyway, but this saves a bit of 
+    -- computation and does not generate superfluous IDs 
+        | otherwise                              =
+            incrementHypoCount $                     -- finally
+            alterRateIdsMap  (addToBin iD)      h $! -- third
+            alterRuleIdsMap  (addToBin iD)      h $! -- second
+            alterHypoIdBimap (flip B.insert iD) h $! -- first
+            hsp
hunk ./src/Data/HypoSpace.hs 150
-    mbInsert i is = 
+    addToBin i is = 
hunk ./src/Data/HypoSpace.hs 152
-            Just is' -> Just $ IS.insert i is'
-            Nothing  -> Just $ IS.singleton i 
+            Just is' -> Just $ IS.insert i is' -- put in bin
+            Nothing  -> Just $ IS.singleton i  -- create new bin
hunk ./src/Data/HypoSpace.hs 158
-	--trace ("DELETE: " ++ " " ++ (show (M.elems (rateIdsMap hsp))) ++ "\n" ++ (show ((B.keysR.hypoIdBimap) hsp)))
-    alterRateIdsMap (mbDelete iD) h $!
-    alterRuleIdsMap (mbDelete iD) h $! 
-    alterHypoIdBimap B.delete     h $!
+        --trace ("DELETE: " ++ " " ++ (show (M.elems (rateIdsMap hsp))) ++ "\n" ++ (show ((B.keysR.hypoIdBimap) hsp)))
+    alterRateIdsMap (removeFromBin iD) h $!
+    alterRuleIdsMap (removeFromBin iD) h $! 
+    alterHypoIdBimap B.delete          h $!
hunk ./src/Data/HypoSpace.hs 165
-    mbDelete _ Nothing   = Nothing
-    mbDelete Nothing is  = is 
-    mbDelete (Just i) (Just is) = 
+    removeFromBin _ Nothing          = Nothing -- there is no bin
+    removeFromBin Nothing is         = is      -- nothing to remove
+    removeFromBin (Just i) (Just is) =      
hunk ./src/Data/HypoSpace.hs 169
-        in if IS.null is' 
-             then Nothing
-             else Just is'
+        in if IS.null is'      -- is bin empty after deletion?
+             then Nothing      -- yes, the remove empty bin
+             else Just is'     -- no, return bin
hunk ./src/Data/HypoSpace.hs 182
-	--trace ("AFFECTED: " ++ (show (length affectedHs)))
-	foldl' (\sp h -> replace h (develop h) sp) hsp affectedHs
-	--hsp''
+        foldl' replaceByDeveloped hsp affectedHs
hunk ./src/Data/HypoSpace.hs 184
-    --hsp' = foldl' (flip delete) hsp affectedHs
-    --hsp'' = foldl' (flip insert) hsp' developedHs
-    develop h = catMaybes $ [ developH ro adv h | adv <- advs] 
-    --developedHs = concatMap develop affectedHs
+    replaceByDeveloped = (\sp h -> replace h (develop h) sp)
+    develop h = catMaybes $ [ developH ro adv h | adv <- advs]
hunk ./src/Data/HypoSpace.hs 187
-    	case M.lookup ro (ruleIdsMap hsp) of
-    		Just ids -> mapMaybe (flip getById hsp) (IS.toList ids)
-    		Nothing -> []
+            case M.lookup ro (ruleIdsMap hsp) of
+                    Just ids -> mapMaybe (flip getById hsp) (IS.toList ids)
+                    Nothing -> []
hunk ./src/Data/HypoSpace.hs 195
-
-
-
-
hunk ./src/Data/HypoSpace.hs 202
-	show = show.pretty            
+        show = show.pretty            
hunk ./src/Data/HypoSpace.hs 204
-	pretty hsp = text "HSpace" <$> parens (
-				 indent 2 $ 
-				 text "Rating -> HypoID:" <$> pretty (rateIdsMap hsp) <$> 
-				 text "Rating -> HypoID:" <$> pretty (ruleIdsMap hsp) <$> 
-				 text "ID -> Hypo: <ommitted>" -- <$> pretty (hypoIdBimap hsp)
-				 )        
+        pretty hsp = text "HSpace" <$> 
+                     parens ( indent 2 $ 
+                        text "Rating -> HypoID:" <$> pretty (rateIdsMap hsp) <$> 
+                        text "Rating -> HypoID:" <$> pretty (ruleIdsMap hsp) <$> 
+                        text "ID -> Hypo: <ommitted>" -- <$> pretty (hypoIdBimap hsp)
+                     )        
hunk ./src/Data/Initialiser.hs 19
+import Debug.Trace
hunk ./src/Logging/Logger.hs 15
+    printResult,