Commit 0d131459 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[API][NGRAMS] Occurrences for ngrams elements.

parent dc098b15
...@@ -86,13 +86,14 @@ instance Arbitrary TabType ...@@ -86,13 +86,14 @@ instance Arbitrary TabType
data NgramsElement = data NgramsElement =
NgramsElement { _ne_ngrams :: Text NgramsElement { _ne_ngrams :: Text
, _ne_list :: ListType , _ne_list :: ListType
, _ne_occurrences :: Int
} }
deriving (Ord, Eq, Show, Generic) deriving (Ord, Eq, Show, Generic)
$(deriveJSON (unPrefix "_ne_") ''NgramsElement) $(deriveJSON (unPrefix "_ne_") ''NgramsElement)
instance ToSchema NgramsElement instance ToSchema NgramsElement
instance Arbitrary NgramsElement where instance Arbitrary NgramsElement where
arbitrary = elements [NgramsElement "sport" StopList] arbitrary = elements [NgramsElement "sport" StopList 1]
------------------------------------------------------------------------ ------------------------------------------------------------------------
data NgramsTable = NgramsTable { _ngramsTable :: [Tree NgramsElement] } data NgramsTable = NgramsTable { _ngramsTable :: [Tree NgramsElement] }
...@@ -104,17 +105,17 @@ instance Arbitrary NgramsTable where ...@@ -104,17 +105,17 @@ instance Arbitrary NgramsTable where
-- TODO -- TODO
instance Arbitrary (Tree NgramsElement) where instance Arbitrary (Tree NgramsElement) where
arbitrary = elements [ TreeN (NgramsElement "animal" GraphList) arbitrary = elements [ TreeN (NgramsElement "animal" GraphList 1)
[TreeN (NgramsElement "dog" GraphList) [] [TreeN (NgramsElement "dog" GraphList 3) []
, TreeN (NgramsElement "object" CandidateList) [] , TreeN (NgramsElement "object" CandidateList 2) []
, TreeN (NgramsElement "cat" GraphList) [] , TreeN (NgramsElement "cat" GraphList 1) []
, TreeN (NgramsElement "nothing" StopList) [] , TreeN (NgramsElement "nothing" StopList 4) []
] ]
, TreeN (NgramsElement "plant" GraphList) , TreeN (NgramsElement "plant" GraphList 3)
[TreeN (NgramsElement "flower" GraphList) [] [TreeN (NgramsElement "flower" GraphList 3) []
, TreeN (NgramsElement "moon" CandidateList) [] , TreeN (NgramsElement "moon" CandidateList 1) []
, TreeN (NgramsElement "cat" GraphList) [] , TreeN (NgramsElement "cat" GraphList 2) []
, TreeN (NgramsElement "sky" StopList) [] , TreeN (NgramsElement "sky" StopList 1) []
] ]
] ]
instance ToSchema NgramsTable instance ToSchema NgramsTable
......
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