From 50f42a6697a6dedbfd4f0737568e816077010253 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Tue, 26 Nov 2013 10:37:43 -0500 Subject: some spacing changes --- src/c/quikr.h | 3 ++- src/c/quikr_functions.h | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/c/quikr.h b/src/c/quikr.h index 3c0e68f..da78297 100644 --- a/src/c/quikr.h +++ b/src/c/quikr.h @@ -1,9 +1,10 @@ #define MATRIX_REVISION 0 #define pow_four(x) ( (unsigned long long)1 << (x * 2 ) ) - +#define str_eq(s1,s2) (!strcmp ((s1),(s2))) struct matrix { unsigned long long sequences; unsigned int kmer; double *matrix; char **headers; }; + diff --git a/src/c/quikr_functions.h b/src/c/quikr_functions.h index a5d0601..369d68c 100644 --- a/src/c/quikr_functions.h +++ b/src/c/quikr_functions.h @@ -1,5 +1,6 @@ // our malloc checker void check_malloc(void *ptr, char *error); + // count the sequences in a fasta file unsigned long long count_sequences(const char *filename); @@ -8,6 +9,3 @@ void normalize_matrix(double *matrix, int height, int width); // load a sensing matrix struct matrix *load_sensing_matrix(const char *filename, unsigned int target_kmer); - -// add header and normalize count matrix -double *setup_count_matrix(char *filename, unsigned long long kmer, unsigned long long lambda, unsigned long long width); -- cgit v1.2.3