[Fragments propagated to HypoSpace
martin.hofmann@uni-bamberg.de**20081117090224] hunk ./src/Data/Fragments.hs 5
-    RuleFrag, name, frag, covr, opos, isOpen,
-    RuleFrags, insert, delete
+    RuleFrag, name, frag, asFrag, covr, opos, isOpen,
+    RuleFrags, insert, delete,
+    fold
hunk ./src/Data/Fragments.hs 11
-import Data.Rules (Rule) 
+import Data.Rules (Rule, Rateable(..)) 
hunk ./src/Data/Fragments.hs 43
+instance Rateable RuleFrag where
+    rate = rate.frag
hunk ./src/Data/HypoSpace.hs 7
-    
+   
hunk ./src/Data/HypoSpace.hs 11
-import qualified Data.Rules as R (fold)
+
hunk ./src/Data/HypoSpace.hs 13
+import qualified Data.Rules as R (fold, map)
+
+import Data.Fragments (RuleFrag)
+
hunk ./src/Data/HypoSpace.hs 18
-import Data.Hypotheses (Hypo, hypo, updateRule, fold, Hypos, openRs, closedRs, allRs)
+import Data.Hypotheses (Hypo, hypo, fold, Hypos, open, clsd, modify)
+
hunk ./src/Data/HypoSpace.hs 22
+import Data.Fragments (asFrag)
+import qualified Data.Fragments as F
+
hunk ./src/Data/HypoSpace.hs 33
-import Debug.Trace                        
+import Terms            
hunk ./src/Data/HypoSpace.hs 52
-    { rateHyposMap :: !(M.Map RatingData Hypos) -- 
-    , ruleHyposMap :: !(M.Map Rule Hypos)
-    , hypoRateMap  :: !(M.Map Hypo RatingData)
+    { rateHyposMap :: (M.Map RatingData Hypos) -- 
+    , ruleHyposMap :: (M.Map RuleFrag Hypos)
+    , hypoRateMap  :: (M.Map Hypo RatingData)
hunk ./src/Data/HypoSpace.hs 69
-    { rateHyposMap  = M.alter (Hs.insert h) (rate h) pri
-    , ruleHyposMap  = R.fold (M.alter (Hs.insert h)) rhm (allRs h)
+    { rateHyposMap  = M.alter (Hs.insert h) (rate h) pri 
+    , ruleHyposMap  = F.fold (M.alter (Hs.insert h)) rhm (open h)  
hunk ./src/Data/HypoSpace.hs 82
-    , ruleHyposMap = R.fold (M.alter (Hs.delete h)) rhm (allRs h)
+    , ruleHyposMap = F.fold (M.alter (Hs.delete h)) rhm (open h)
hunk ./src/Data/HypoSpace.hs 91
-update :: Rule -> Rule -> HSpace -> HSpace
+update :: RuleFrag -> RuleFrag -> HSpace -> HSpace
hunk ./src/Data/HypoSpace.hs 101
-    modifiedHs = Hs.map (updateRule ro rn) affectedHs
+    modifiedHs = Hs.map (modify ro rn) affectedHs
hunk ./src/Data/HypoSpace.hs 175
-               
-rule1 = rule 1 "a"
-rule2 = rule 2 "b"
-rule3 = rule 3 "c"
-rule4 = rule 4 "d"
-rule5 = rule 5 "e"
-rule6 = rule 6 "f"
-rule7 = rule 7 "g"
-rule8 = rule 8 "h"
-rule9 = rule 9 "i"
-rule10 = rule 10 "j"
-
-rule1' = rule 1 "aaaaaaaaa"
-rule2' = rule 2 "bbbbbbbbbbbbbbbbbbbb"
-rule3' = rule 3 "ccc"
-rule4' = rule 4 "ddd"
-rule5' = rule 5 "eeeeeeeeeeeeeeee"
-rule6' = rule 6 "fff"
-rule7' = rule 7 "ggg"
-rule8' = rule 8 "hhh"
-rule9' = rule 9 "iii"
-rule10' = rule 10 "jjj"
-
-rules1o = rules [rule1,rule2,rule3]
-rules1c = rules [rule4,rule5]
-rules1ao = rules [rule1]
-rules1ac = rules [rule4,rule5]
-rules1bo = rules [rule1,rule2,rule3]
-rules1bc = rules [rule4,rule5]
-rules1co = rules [rule6]
-rules1cc = rules [rule4,rule5]
-rules2o = rules [rule6,rule7,rule8]
-rules2c = rules [rule9,rule10]
-rules3o = rules [rule1,rule6,rule8]
-rules3c = rules [rule4,rule10]
-rules4o = rules [rule9,rule2,rule3]
-rules4c = rules [rule9,rule5]
-
-
-hypo1 = hypo rules1o rules1c
-hypo1a = hypo rules1ao rules1ac
-hypo1b = hypo rules1bo rules1bc
-hypo1c = hypo rules1co rules1cc
-hypo2 = hypo rules2o rules2c
-hypo3 = hypo rules3o rules3c
-hypo4 = hypo rules4o rules4c
-
-hsp = initHSpace
-hsp1 = insert hypo1 hsp
-hsp1a = insert hypo1c hsp1
-hsp2 = insert hypo2 hsp1
-
-hsp3 = insert hypo3 hsp2
-hsp4 = insert hypo4 hsp3
-hsp5 = insert hypo1b hsp4
-hsp6 = insert hypo1c hsp5
-               
+--               
+--rule1 = rule 1 "a"
+--rule2 = rule 2 "b"
+--rule3 = rule 3 "c"
+--rule4 = rule 4 "d"
+--rule5 = rule 5 "e"
+--rule6 = rule 6 "f"
+--rule7 = rule 7 "g"
+--rule8 = rule 8 "h"
+--rule9 = rule 9 "i"
+--rule10 = rule 10 "j"
+--
+--rule1' = rule 1 "aaaaaaaaa"
+--rule2' = rule 2 "bbbbbbbbbbbbbbbbbbbb"
+--rule3' = rule 3 "ccc"
+--rule4' = rule 4 "ddd"
+--rule5' = rule 5 "eeeeeeeeeeeeeeee"
+--rule6' = rule 6 "fff"
+--rule7' = rule 7 "ggg"
+--rule8' = rule 8 "hhh"
+--rule9' = rule 9 "iii"
+--rule10' = rule 10 "jjj"
+--
+--rules1o = rules [rule1,rule2,rule3]
+--rules1c = rules [rule4,rule5]
+--rules1ao = rules [rule1]
+--rules1ac = rules [rule4,rule5]
+--rules1bo = rules [rule1,rule2,rule3]
+--rules1bc = rules [rule4,rule5]
+--rules1co = rules [rule6]
+--rules1cc = rules [rule4,rule5]
+--rules2o = rules [rule6,rule7,rule8]
+--rules2c = rules [rule9,rule10]
+--rules3o = rules [rule1,rule6,rule8]
+--rules3c = rules [rule4,rule10]
+--rules4o = rules [rule9,rule2,rule3]
+--rules4c = rules [rule9,rule5]
+--
+--
+--hypo1 = hypo (R.map (asFrag (mkName "")) rules1o) -- rules1c
+--hypo1a = hypo rules1ao rules1ac
+--hypo1b = hypo rules1bo rules1bc
+--hypo1c = hypo rules1co rules1cc
+--hypo2 = hypo rules2o rules2c
+--hypo3 = hypo rules3o rules3c
+--hypo4 = hypo rules4o rules4c
+--
+--hsp = initHSpace
+--hsp1 = insert hypo1 hsp
+--hsp1a = insert hypo1c hsp1
+--hsp2 = insert hypo2 hsp1
+--
+--hsp3 = insert hypo3 hsp2
+--hsp4 = insert hypo4 hsp3
+--hsp5 = insert hypo1b hsp4
+--hsp6 = insert hypo1c hsp5
+--               
hunk ./src/Data/Hypotheses.hs 6
+    open, clsd,
hunk ./src/Data/Hypotheses.hs 30
-import qualified Data.Fragments as F
+import qualified Data.Fragments as F 
hunk ./src/Data/Hypotheses.hs 38
-data Hypo  = HH { open   :: RuleFrags
+data Hypo  = HH { open :: RuleFrags
hunk ./src/Data/Hypotheses.hs 54
---instance Rateable Hypo where
---    rate h       = foldr (\r d -> (rate(fst r))+d) 0 (open h)
+instance Rateable Hypo where
+    rate h       = F.fold (\r d -> (rate r) + d) 0 (open h)