diff options
author | Calvin Morrison <mutantturkey@gmail.com> | 2013-11-07 17:25:06 -0500 |
---|---|---|
committer | Calvin Morrison <mutantturkey@gmail.com> | 2013-11-07 17:25:06 -0500 |
commit | b508436d6982205508d531ba19c9980570946ae7 (patch) | |
tree | 370577206060fee5d08b784839462aef9c548918 | |
parent | 62343db316259d551ba5924148ef728b9909e6a5 (diff) |
rename to counts per sequence, don't provide frequencies only counts
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | kmer_counts_per_sequence.c (renamed from kmer_frequency_per_sequence.c) | 4 | ||||
-rw-r--r-- | kmer_total_count.c | 1 |
3 files changed, 6 insertions, 7 deletions
@@ -3,7 +3,7 @@ CC = gcc CFLAGS = -O3 -s -mtune=native -Wall -DVERSION=$(VERSION) -Wextra CLIBS = libkmer.a -all: libkmer.o libkmer.so libkmer.a kmer_total_count kmer_frequency_per_sequence +all: libkmer.o libkmer.so libkmer.a kmer_total_count kmer_counts_per_sequence libkmer.o: $(CC) -c kmer_utils.c -o libkmer.o $(CFLAGS) -fPIC -DSHARED=0 @@ -14,8 +14,8 @@ libkmer.a: libkmer.o chmod +x libkmer.a kmer_total_count: libkmer.a $(CC) kmer_total_count.c -o kmer_total_count $(CLIBS) $(CFLAGS) -DSHARED=0 -kmer_frequency_per_sequence: libkmer.a - $(CC) kmer_frequency_per_sequence.c -o kmer_frequency_per_sequence $(CLIBS) $(CFLAGS) +kmer_counts_per_sequence: libkmer.a + $(CC) kmer_counts_per_sequence.c -o kmer_counts_per_sequence $(CLIBS) $(CFLAGS) clean: - rm -vf kmer_total_count kmer_frequency_per_sequence libkmer.so libkmer.a libkmer.o + rm -vf kmer_total_count kmer_counts_per_sequence libkmer.so libkmer.a libkmer.o diff --git a/kmer_frequency_per_sequence.c b/kmer_counts_per_sequence.c index 7b14f6d..d518efc 100644 --- a/kmer_frequency_per_sequence.c +++ b/kmer_counts_per_sequence.c @@ -57,8 +57,8 @@ int main(int argc, char **argv) { total += counts[i]; for(i = 0; i < width - 1; i++) - printf("%.12f\t", (double)counts[i] / total); - printf("%.12f\n", (double)counts[width - 1] / total); + printf("%llu\t", counts[i]); + printf("%llu\n", counts[width - 1]); } } diff --git a/kmer_total_count.c b/kmer_total_count.c index cc9e625..fd8a676 100644 --- a/kmer_total_count.c +++ b/kmer_total_count.c @@ -28,7 +28,6 @@ int main(int argc, char **argv) { // print out our counts arrray // manually unrolled 4 loops to reduce fprintf calls - if(argc == 3) { for(i = 0; i < width; i=i+4) fprintf(stdout, "%llu\n%llu\n%llu\n%llu\n", counts[i], counts[i+1], counts[i+2], counts[i+3]); |