From 455c85653dc6b135558b142e9176d419e885fd0f Mon Sep 17 00:00:00 2001 From: Kevin Murray Date: Tue, 18 Nov 2014 23:17:29 +1100 Subject: [PATCH] load-in22-count: use new ht.n_unique_kmers method New API feature in ChangeLog on 2014-11-06. Also solves merge conflict (hopefully) modified: scripts/load-into-counting.py --- scripts/load-into-counting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/load-into-counting.py b/scripts/load-into-counting.py index cf1d85a525..e7323ddc2a 100755 --- a/scripts/load-into-counting.py +++ b/scripts/load-into-counting.py @@ -122,11 +122,11 @@ def main(): with open(base + '.info', 'a') as info_fh: print >> info_fh, 'through', filename - n_kmers = htable.n_occupied() + n_kmers = htable.n_unique_kmers() if args.report_total_kmers: - print >> sys.stderr, 'Total number of k-mers:', n_kmers + print >> sys.stderr, 'Total number of unique k-mers:', n_kmers with open(base + '.info', 'a') as info_fp: - print >>info_fp, 'Total number of k-mers:', n_kmers + print >>info_fp, 'Total number of unique k-mers:', n_kmers print >>sys.stderr, 'saving', base htable.save(base)