From be88c49a5dfcfe0a9e17d96f5facf607e26aa185 Mon Sep 17 00:00:00 2001 From: martinahansen Date: Fri, 5 Dec 2008 05:25:24 +0000 Subject: [PATCH] changed barray from ushort to uint git-svn-id: http://biopieces.googlecode.com/svn/trunk@334 74ccb610-7750-0410-82ae-013aeee3265d --- code_c/Maasha/src/bed2fixedstep.c | 4 ++-- code_c/Maasha/src/bed2tag_contigs.c | 8 ++++---- code_c/Maasha/src/inc/barray.h | 6 +++--- code_c/Maasha/src/lib/barray.c | 8 ++++---- code_c/Maasha/src/test/test_barray.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code_c/Maasha/src/bed2fixedstep.c b/code_c/Maasha/src/bed2fixedstep.c index 3b797ea..bde5142 100644 --- a/code_c/Maasha/src/bed2fixedstep.c +++ b/code_c/Maasha/src/bed2fixedstep.c @@ -50,7 +50,7 @@ int main( int argc, char *argv[] ) hash *chr_hash = NULL; hash_elem *bucket = NULL; barray *ba = NULL; - ushort score = 0; + uint score = 0; size_t i = 0; size_t j = 0; char *chr = NULL; @@ -78,7 +78,7 @@ int main( int argc, char *argv[] ) hash_add( chr_hash, entry->chr, ba ); } - score = ( ushort ) get_score( entry->q_id ); + score = ( uint ) get_score( entry->q_id ); barray_interval_inc( ba, entry->chr_beg, entry->chr_end - 1, score ); } diff --git a/code_c/Maasha/src/bed2tag_contigs.c b/code_c/Maasha/src/bed2tag_contigs.c index 265eb11..38fd25c 100644 --- a/code_c/Maasha/src/bed2tag_contigs.c +++ b/code_c/Maasha/src/bed2tag_contigs.c @@ -70,13 +70,13 @@ int main( int argc, char *argv[] ) hash *chr_hash = NULL; hash_elem *bucket = NULL; barray *ba = NULL; - ushort score = 0; + uint score = 0; size_t i = 0; char *chr = NULL; size_t beg = 0; size_t end = 0; size_t pos = 0; - ushort max = 0; + uint max = 0; size_t id = 0; entry = bed_entry_new( BED_COLS ); @@ -99,10 +99,10 @@ int main( int argc, char *argv[] ) hash_add( chr_hash, entry->chr, ba ); } - score = ( ushort ) get_score( entry->q_id ); + score = ( uint ) get_score( entry->q_id ); if ( score > entry->score && entry->score > 0 ) { - barray_interval_inc( ba, entry->chr_beg, entry->chr_end - 1, ( ushort ) ( score / entry->score ) ); + barray_interval_inc( ba, entry->chr_beg, entry->chr_end - 1, ( uint ) ( score / entry->score ) ); } } diff --git a/code_c/Maasha/src/inc/barray.h b/code_c/Maasha/src/inc/barray.h index 42e7ee6..09b755e 100644 --- a/code_c/Maasha/src/inc/barray.h +++ b/code_c/Maasha/src/inc/barray.h @@ -6,7 +6,7 @@ struct _barray { - ushort *array; /* Unsigned short array. */ + uint *array; /* Unsigned integer array. */ size_t nmemb; /* Number of elements in array. */ size_t end; /* Last position used. */ }; @@ -32,14 +32,14 @@ void barray_print( barray *ba ); /* Increments a given interval of a byte array with a given score. * Resizes the byte array if needed. */ -void barray_interval_inc( barray *ba, size_t beg, size_t end, ushort score ); +void barray_interval_inc( barray *ba, size_t beg, size_t end, uint score ); /* Scan a byte array from a given position * for the next interval of non-zero values. */ bool barray_interval_scan( barray *ba, size_t *pos_pt, size_t *beg_pt, size_t *end_pt ); /* Locate the max value in an interval within a byte array. */ -ushort barray_interval_max( barray *ba, size_t beg, size_t end ); +uint barray_interval_max( barray *ba, size_t beg, size_t end ); /* Deallocates a byte array and set it to NULL. */ void barray_destroy( barray **ba_ppt ); diff --git a/code_c/Maasha/src/lib/barray.c b/code_c/Maasha/src/lib/barray.c index 474e56d..e23962c 100644 --- a/code_c/Maasha/src/lib/barray.c +++ b/code_c/Maasha/src/lib/barray.c @@ -51,7 +51,7 @@ void barray_resize( barray *ba, size_t nmemb_new ) size_t size_old = ba->nmemb * sizeof( ba->array ); size_t size_new = nmemb_new * sizeof( ba->array ); - ba->array = ( ushort * ) mem_resize_zero( ( void * ) ba->array, size_old, size_new ); + ba->array = ( uint * ) mem_resize_zero( ( void * ) ba->array, size_old, size_new ); ba->nmemb = nmemb_new; } @@ -72,7 +72,7 @@ void barray_print( barray *ba ) } -void barray_interval_inc( barray *ba, size_t beg, size_t end, ushort score ) +void barray_interval_inc( barray *ba, size_t beg, size_t end, uint score ) { /* Martin A. Hansen, November 2008. */ @@ -139,14 +139,14 @@ bool barray_interval_scan( barray *ba, size_t *pos_pt, size_t *beg_pt, size_t *e } -ushort barray_interval_max( barray *ba, size_t beg, size_t end ) +uint barray_interval_max( barray *ba, size_t beg, size_t end ) { /* Martin A. Hansen, December 2008. */ /* Locate the max value in an interval within a byte array. */ size_t i = 0; - ushort max = 0; + uint max = 0; for ( i = beg; i <= end; i++ ) { max = MAX( max, ba->array[ i ] ); diff --git a/code_c/Maasha/src/test/test_barray.c b/code_c/Maasha/src/test/test_barray.c index c7d2608..913a0fb 100644 --- a/code_c/Maasha/src/test/test_barray.c +++ b/code_c/Maasha/src/test/test_barray.c @@ -155,7 +155,7 @@ void test_barray_interval_max() size_t pos = 0; size_t beg = 0; size_t end = 0; - ushort max = 0; + uint max = 0; barray *ba = NULL; ba = barray_new( nmemb ); -- 2.39.5