Commit 79d33462 authored by qlobbe's avatar qlobbe

add a new trace

parent bbe478a5
Pipeline #860 failed with stage
...@@ -147,7 +147,7 @@ defaultConfig = ...@@ -147,7 +147,7 @@ defaultConfig =
, phyloSynchrony = ByProximityThreshold 0.5 10 SiblingBranches MergeAllGroups , phyloSynchrony = ByProximityThreshold 0.5 10 SiblingBranches MergeAllGroups
, phyloQuality = Quality 0.1 1 , phyloQuality = Quality 0.1 1
, timeUnit = Year 3 1 5 , timeUnit = Year 3 1 5
, clique = Fis 1 5 , clique = MaxClique 0
, exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2] , exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2]
, exportSort = ByHierarchy , exportSort = ByHierarchy
, exportFilter = [ByBranchSize 2] , exportFilter = [ByBranchSize 2]
......
...@@ -108,7 +108,7 @@ config = ...@@ -108,7 +108,7 @@ config =
defaultConfig { phyloName = "Cesar et Cleopatre" defaultConfig { phyloName = "Cesar et Cleopatre"
, phyloLevel = 2 , phyloLevel = 2
, exportFilter = [ByBranchSize 0] , exportFilter = [ByBranchSize 0]
, clique = Fis 0 0 } , clique = MaxClique 0 }
docs :: [Document] docs :: [Document]
......
...@@ -380,7 +380,8 @@ seaLevelMatching proximity beta minBranch frequency thr step depth elevation fra ...@@ -380,7 +380,8 @@ seaLevelMatching proximity beta minBranch frequency thr step depth elevation fra
then branches then branches
else else
-- | break all the possible branches at the current seaLvl level -- | break all the possible branches at the current seaLvl level
let branches' = trace ("↑ level = " <> printf "%.1f" thr <> " branches = " <> show(length branches)) let quality = toPhyloQuality beta frequency (map fst branches)
branches' = trace ("↑ level = " <> printf "%.1f" thr <> " F(β) = " <> printf "%.3f" quality <> " branches = " <> show(length branches))
$ breakBranches proximity beta frequency minBranch thr depth elevation frame docs coocs periods $ breakBranches proximity beta frequency minBranch thr depth elevation frame docs coocs periods
[] (head' "seaLevelMatching" branches) (tail' "seaLevelMatching" branches) [] (head' "seaLevelMatching" branches) (tail' "seaLevelMatching" branches)
frequency' = reduceFrequency frequency (map fst branches') frequency' = reduceFrequency frequency (map fst branches')
......
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