[log-file changes, prettify, extended Ratingdata
martin.hofmann@uni-bamberg.de**20091028151704] hunk ./src/Data/Hypotheses.hs 69
-	pretty h@(HH o c cs) = text "Hypo" <+> 
-                         (align $ vcat $ ((pretty . rate $ h)<> colon) : (map (pretty) (rules2decs . allBindings $ h)))
+	pretty h = let (cds,bnds) = simplifiedBindings h
+               in  text "Hypo" <+> ( align . vcat $ ((pretty . rate $ h) <> colon) :
+                                             (map pretty $ rules2decs bnds) )
hunk ./src/Data/Hypotheses.hs 320
-                  fracs = map divide [(numRs,numFs) -- functions per rule
-                                     ,(numRs,numPs) -- partitions per rule
+                  fracs = map divide [(numFs,numRs) -- rules per function
+                                     ,(numPs,numRs) -- rules per partition
hunk ./src/Data/Hypotheses.hs 325
-              in ((sum fracs)/fromIntegral(length fracs))
+              in (fracs , ((sum fracs)/fromIntegral(length fracs)))
hunk ./src/Rating/Rateable.hs 20
-data RatingData = RD Int Int Int Int Float deriving (Eq,Show)
+data RatingData = RD Int Int Int Int ([Float],Float) deriving (Eq,Show)
hunk ./src/SynthesisEngine.hs 100
-                     else llogNO (text "First Hypos finished: reduce" <+>
-                                  text "SearchSpace and finish tier!") >>
+                     else llogNO (linebreak <>
+                                  text "FIRST HYPOS FINISHED: reduce" <+>
+                                  text "SearchSpace and finish tier!" <>
+                                  linebreak) >>
hunk ./src/SynthesisEngine.hs 111
-       else llogNO (text "Tier finished: eject finished hypos and continue.") >>
+       else llogNO (linebreak <> 
+                    text "TIER FINISHED: eject finished hypos and continue." <>
+                    linebreak) >>
+            llogNO (pretty ejcts) >>
hunk ./src/SynthesisEngine.hs 122
-exhausted = llogNO(linebreak <> text "SEARCHSPACE EXHAUSTED - - STOP") >>
+exhausted = llogNO(linebreak <> text "SEARCHSPACE EXHAUSTED - - STOP" <> linebreak) >>