From 4d7935d7b902691e1fbd944fe40077c9be203940 Mon Sep 17 00:00:00 2001 From: Haibao Tang Date: Tue, 4 Sep 2018 09:19:08 -0700 Subject: [PATCH] [cluster] Make passRatio a bit more stringent --- cluster.go | 5 +++-- partition.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster.go b/cluster.go index e413f7c..7baf942 100644 --- a/cluster.go +++ b/cluster.go @@ -254,8 +254,9 @@ func (r *Partitioner) setClusters(clusterID []int) { // linkage.cID, r.clusters[linkage.cID]) // } - passRatio := len(linkages) == 1 || (linkages[0].avgLinkage > 0 && linkages[1].avgLinkage == 0) || - linkages[0].avgLinkage/linkages[1].avgLinkage >= NonInformativeRatio + passRatio := linkages[0].avgLinkage >= NonInformativeRatio && + (len(linkages) == 1 || linkages[1].avgLinkage == 0 || + linkages[0].avgLinkage/linkages[1].avgLinkage >= NonInformativeRatio) if !passRatio { nFailRatio++ continue diff --git a/partition.go b/partition.go index ecb84eb..67a4889 100644 --- a/partition.go +++ b/partition.go @@ -73,7 +73,7 @@ func (r *Partitioner) getRE() string { // This reads in the `counts_RE.txt` file generated by extract() func (r *Partitioner) skipContigsWithFewREs() { RE := r.getRE() - MinREs := 32 + MinREs := 8 switch len(RE) { case 4: MinREs = 32 // 32 * (4 ** 4) = 8Kb @@ -82,7 +82,7 @@ func (r *Partitioner) skipContigsWithFewREs() { case 6: MinREs = 8 // 8 * (4 ** 6) = 32Kb default: - MinREs = 10 // We normally only use RE between 4 to 6 base cutter, but just in case + MinREs = 8 // We normally only use RE between 4 to 6 base cutter, but just in case } log.Noticef("skipContigsWithFewREs with MinREs = %d (RE = %s)", MinREs, RE) nShort := 0