Commit 63ca3e92 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/314-node-phylo-change-the-default-value-of-findancestors-to-false' into dev
parents 7c2e9bd9 d814b7c5
...@@ -25,7 +25,7 @@ phyloConfig = PhyloConfig { ...@@ -25,7 +25,7 @@ phyloConfig = PhyloConfig {
, similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2} , similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2}
, seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1} , seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1}
, defaultMode = True , defaultMode = True
, findAncestors = True , findAncestors = False
, phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups} , phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups}
, phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3} , phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3}
, timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5} , timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5}
......
...@@ -33,7 +33,7 @@ phyloConfig outdir = PhyloConfig { ...@@ -33,7 +33,7 @@ phyloConfig outdir = PhyloConfig {
, similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2} , similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2}
, seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1} , seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1}
, defaultMode = True , defaultMode = True
, findAncestors = True , findAncestors = False
, phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups} , phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups}
, phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3} , phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3}
, timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5} , timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5}
......
...@@ -233,7 +233,7 @@ defaultConfig = ...@@ -233,7 +233,7 @@ defaultConfig =
, similarity = WeightedLogJaccard 0.5 2 , similarity = WeightedLogJaccard 0.5 2
, seaElevation = Constante 0.1 0.1 , seaElevation = Constante 0.1 0.1
, defaultMode = False , defaultMode = False
, findAncestors = True , findAncestors = False
, phyloSynchrony = ByProximityThreshold 0.6 0 AllBranches MergeAllGroups , phyloSynchrony = ByProximityThreshold 0.6 0 AllBranches MergeAllGroups
, phyloQuality = Quality 0.5 3 , phyloQuality = Quality 0.5 3
, timeUnit = Year 3 1 5 , timeUnit = Year 3 1 5
......
...@@ -28,7 +28,7 @@ phyloConfig = PhyloConfig { ...@@ -28,7 +28,7 @@ phyloConfig = PhyloConfig {
, similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2} , similarity = WeightedLogJaccard {_wlj_sensibility = 0.5, _wlj_minSharedNgrams = 2}
, seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1} , seaElevation = Constante {_cons_start = 0.1, _cons_gap = 0.1}
, defaultMode = True , defaultMode = True
, findAncestors = True , findAncestors = False
, phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups} , phyloSynchrony = ByProximityThreshold {_bpt_threshold = 0.5, _bpt_sensibility = 0.0, _bpt_scope = AllBranches, _bpt_strategy = MergeAllGroups}
, phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3} , phyloQuality = Quality {_qua_granularity = 0.8, _qua_minBranch = 3}
, timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5} , timeUnit = Year {_year_period = 3, _year_step = 1, _year_matchingFrame = 5}
......
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