Commit 729de971 authored by qlobbe's avatar qlobbe

fix temporal matching

parent 66d2af28
Pipeline #601 failed with stage
...@@ -127,7 +127,7 @@ defaultConfig = ...@@ -127,7 +127,7 @@ defaultConfig =
, phyloLevel = 2 , phyloLevel = 2
, phyloProximity = WeightedLogJaccard 10 0 0.1 , phyloProximity = WeightedLogJaccard 10 0 0.1
, phyloSynchrony = ByProximityDistribution 0 , phyloSynchrony = ByProximityDistribution 0
, phyloQuality = Quality 0.3 1 , phyloQuality = Quality 1 1
, timeUnit = Year 3 1 5 , timeUnit = Year 3 1 5
, contextualUnit = Fis 1 5 , contextualUnit = Fis 1 5
, exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2] , exportLabel = [BranchLabel MostInclusive 2, GroupLabel MostEmergentInclusive 2]
......
...@@ -129,8 +129,8 @@ makePairs' ego candidates periods pointers fil thr prox docs = ...@@ -129,8 +129,8 @@ makePairs' ego candidates periods pointers fil thr prox docs =
True -> [] True -> []
False -> toLazyPairs pointers fil thr prox lastPrd False -> toLazyPairs pointers fil thr prox lastPrd
-- | at least on of the pair candidates should be from the last added period -- | at least on of the pair candidates should be from the last added period
$ filter (\(g,g') -> ((g ^. phylo_groupPeriod) == lastPrd) -- $ filter (\(g,g') -> ((g ^. phylo_groupPeriod) == lastPrd)
|| ((g' ^. phylo_groupPeriod) == lastPrd)) -- || ((g' ^. phylo_groupPeriod) == lastPrd))
$ listToKeys $ listToKeys
$ filter (\g -> (g ^. phylo_groupPeriod == lastPrd) $ filter (\g -> (g ^. phylo_groupPeriod == lastPrd)
|| ((toProximity docs prox ego ego g) >= thr)) candidates || ((toProximity docs prox ego ego g) >= thr)) candidates
......
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