Commit 9ba4f597 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[CLEAN]

parent b36a041b
...@@ -89,7 +89,6 @@ instance SetListType (HashMap NgramsTerm (GroupedTreeScores a)) where ...@@ -89,7 +89,6 @@ instance SetListType (HashMap NgramsTerm (GroupedTreeScores a)) where
setListType lt = HashMap.map (set gts'_listType lt) setListType lt = HashMap.map (set gts'_listType lt)
------ ------
class HasSize a where class HasSize a where
hasSize :: a -> Integer hasSize :: a -> Integer
...@@ -102,38 +101,11 @@ instance HasSize (Set a) where ...@@ -102,38 +101,11 @@ instance HasSize (Set a) where
instance (HasSize a, Semigroup a) => ViewScore (GroupedTreeScores a) Integer where instance (HasSize a, Semigroup a) => ViewScore (GroupedTreeScores a) Integer where
viewScore = hasSize . viewScores viewScore = hasSize . viewScores
{-
-- TODO clean this instances
instance ViewScore (GroupedTreeScores Double) Double where
viewScore = viewScores
instance ViewScores (GroupedTreeScores Double) Double where
viewScores g = sum $ parent : children
where
parent = view gts'_score g
children = map viewScores $ HashMap.elems $ view gts'_children g
instance ViewScore (GroupedTreeScores (Set NodeId)) Int where
viewScore = Set.size . viewScores
instance ViewScore (GroupedTreeScores (Scored NgramsTerm)) Double where
viewScore = view (gts'_score . scored_genInc)
instance ViewScores (GroupedTreeScores (Set NodeId)) (Set NodeId) where
viewScores g = Set.unions $ parent : children
where
parent = view gts'_score g
children = map viewScores $ HashMap.elems $ view gts'_children g
-}
instance Semigroup a=> ViewScores (GroupedTreeScores a) a where instance Semigroup a=> ViewScores (GroupedTreeScores a) a where
viewScores g = foldl1 (<>) $ parent : children viewScores g = foldl1 (<>) $ parent : children
where where
parent = view gts'_score g parent = view gts'_score g
children = map viewScores $ HashMap.elems $ view gts'_children g children = map viewScores $ HashMap.elems $ view gts'_children g
------ ------
instance HasTerms (HashMap NgramsTerm (GroupedTreeScores a)) where instance HasTerms (HashMap NgramsTerm (GroupedTreeScores a)) where
hasTerms = Set.unions . (map hasTerms) . HashMap.toList hasTerms = Set.unions . (map hasTerms) . HashMap.toList
...@@ -147,11 +119,9 @@ instance HasTerms (NgramsTerm, GroupedTreeScores a) where ...@@ -147,11 +119,9 @@ instance HasTerms (NgramsTerm, GroupedTreeScores a) where
$ view gts'_children g $ view gts'_children g
------ ------
instance ToNgramsElement (HashMap NgramsTerm (GroupedTreeScores a)) where instance ToNgramsElement (HashMap NgramsTerm (GroupedTreeScores a)) where
toNgramsElement = List.concat . (map toNgramsElement) . HashMap.toList toNgramsElement = List.concat . (map toNgramsElement) . HashMap.toList
instance ToNgramsElement (NgramsTerm, GroupedTreeScores a) where instance ToNgramsElement (NgramsTerm, GroupedTreeScores a) where
toNgramsElement (t, gts) = parent : children toNgramsElement (t, gts) = parent : children
where where
...@@ -178,5 +148,3 @@ instance ToNgramsElement (NgramsTerm, GroupedTreeScores a) where ...@@ -178,5 +148,3 @@ instance ToNgramsElement (NgramsTerm, GroupedTreeScores a) where
$ map (childrenWith root t' ) $ map (childrenWith root t' )
$ HashMap.toList $ HashMap.toList
$ view gts'_children gts' $ view gts'_children gts'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment