Commit 6f20618e authored by qlobbe's avatar qlobbe

fix the beta in F(beta)

parent 6d28e4a9
Pipeline #874 failed with stage
...@@ -145,7 +145,7 @@ defaultConfig = ...@@ -145,7 +145,7 @@ defaultConfig =
, phyloProximity = WeightedLogJaccard 10 , phyloProximity = WeightedLogJaccard 10
, seaElevation = Constante 0.6 1 , seaElevation = Constante 0.6 1
, phyloSynchrony = ByProximityThreshold 0.5 10 SiblingBranches MergeAllGroups , phyloSynchrony = ByProximityThreshold 0.5 10 SiblingBranches MergeAllGroups
, phyloQuality = Quality 0.1 1 , phyloQuality = Quality 100 1
, timeUnit = Year 3 1 5 , timeUnit = Year 3 1 5
, clique = MaxClique 0 , clique = MaxClique 0
, exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2] , exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2]
......
...@@ -252,8 +252,8 @@ fScore beta x bk bx = ...@@ -252,8 +252,8 @@ fScore beta x bk bx =
/ (fromIntegral $ length $ filter (\g -> elem x $ g ^. phylo_groupNgrams) $ concat bx)) / (fromIntegral $ length $ filter (\g -> elem x $ g ^. phylo_groupNgrams) $ concat bx))
accuracy = ( (fromIntegral $ length $ filter (\g -> elem x $ g ^. phylo_groupNgrams) bk) accuracy = ( (fromIntegral $ length $ filter (\g -> elem x $ g ^. phylo_groupNgrams) bk)
/ (fromIntegral $ length bk)) / (fromIntegral $ length bk))
in ((1 + (1 / beta) ** 2) * accuracy * recall) in ((1 + beta ** 2) * accuracy * recall)
/ ((((1 / beta) ** 2) * accuracy + recall)) / (((beta ** 2) * recall + accuracy))
wk :: [PhyloGroup] -> Double wk :: [PhyloGroup] -> Double
......
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