[default setting changed, recArgCmp AWise instead of Linear
martin.hofmann@uni-bamberg.de**20090925064757] hunk ./src/Data/GlobalConfig.hs 29
-    , scr_cmpRecArg :: RecArgComp
+    , scr_cmpRecArg  :: RecArgComp
hunk ./src/Data/GlobalConfig.hs 39
-defaultSCR = SCR False False False False False DEBUG (-1) Linear [] [] defaultPredicates ""
+defaultSCR = SCR
+    { scr_debug      = False
+    , scr_simplify   = False
+    , scr_enhanced   = False
+    , scr_dumpLog    = False
+    , scr_verbose    = False
+    , scr_verbosity  = DEBUG
+    , scr_maxLoops   = (-1)
+    , scr_cmpRecArg  = AWise
+    , scr_tgts       = []
+    , scr_bgks       = []
+    , scr_preds      = defaultPredicates
+    , scr_ctxFile    = ""
+    }
+    
hunk ./src/Rating/Rateable.hs 8
+import Data.CallDependencies
hunk ./src/Rating/Rateable.hs 21
-type RatingData = (Int,Int,Int,Float,Int)   
+type RatingData = (Int,Int,Int,Int,Int,Float)   
hunk ./src/Rating/Rateable.hs 43
+         numClosedPartitions  = numberOfClosedPartitions h
hunk ./src/Rating/Rateable.hs 47
-         numFVarPerRule  = on (/) fromIntegral numFreeVars numOpenRules
-     in ( numPartitions
-        , numOpenRules
-        , numFreeVars
-        , numFVarPerRule
-        , numTotalRules
+         numCycles = cycles . callings $ h
+         numFVarPerRule  = if (numOpenRules == 0) then 0.0 else on (/) fromIntegral numFreeVars numOpenRules
+     in ( --numPartitions + numCycles + numOpenRules,
+          numPartitions,
+          numCycles,
+          numOpenRules,
+          numFreeVars,
+          numTotalRules,
+          numFVarPerRule
hunk ./src/Rating/Rateable.hs 60
-numberOfOpenRules = S.size.open 
+numberOfOpenRules = S.size.openRules 
hunk ./src/Rating/Rateable.hs 66
+
hunk ./src/Rating/Rateable.hs 79
+        
+numberOfClosedPartitions :: Hypo -> Int
+numberOfClosedPartitions = length . (foldl' leastPatterns []) . (filter (not . hasHO)) . S.toList . closedRules 
+    where
+    leastPatterns [] p = [p]
+    leastPatterns (p1:ps) p2
+        | matchLhss p1 p2 = p1:ps
+        | matchLhss p2 p1 = p2:ps
+        | otherwise       = p1:(leastPatterns ps p2)
hunk ./src/UI/Help.hs 74
-    indent 5 (fill 20 (text "recArgComp=<mode>") <> 
+    indent 5 (fill 20 (text "recArgCmp=<mode>") <> 
hunk ./src/UI/Help.hs 81
-                           " use \"AWise\". Given two left-hand sides " ++
+                           " use \"AWise\" [default]. Given two left-hand sides " ++
hunk ./src/UI/UIStarter.hs 89
-    , cmpRecArg = Linear
+    , cmpRecArg = AWise