From f47ce6202d2bb6425638a9142bbbebd7d44fb64f Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Wed, 2 Oct 2013 21:38:43 -0400 Subject: use an external iterator so that we can skip over anything in range of an errorw --- kmer_utils.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'kmer_utils.c') diff --git a/kmer_utils.c b/kmer_utils.c index f63caef..f4f8d2f 100644 --- a/kmer_utils.c +++ b/kmer_utils.c @@ -1,6 +1,8 @@ +#include "kmer_total_count.h" + // convert a string of k-mer size base-4 values into a // base-10 index -long num_to_index(const char *str, const int kmer, const long error_pos) { +unsigned long num_to_index(const char *str, const int kmer, const long error_pos) { int i = 0; unsigned long out = 0; @@ -8,8 +10,13 @@ long num_to_index(const char *str, const int kmer, const long error_pos) { for(i = kmer - 1; i >= 0; i--){ - if(str[i] >> 2) - return error_pos; + if(str[i] >> 2) { + #ifndef SHARED + position += i; + #endif + return error_pos; + } + out += str[i] * multiply; multiply = multiply << 2; -- cgit v1.2.1