From 89acd756a2eca5e47911e24b212f68cf7e3528bf Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 14 Feb 2012 09:26:33 +0000 Subject: [PATCH] Formatting, trailing whitespaces. git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/bp@1218 3cdefd35-fc62-479d-8e8d-bae585ffb9ca --- bp-core.c | 7 ++++--- bp-darray.c | 2 +- bp.h | 22 ++++++++++------------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/bp-core.c b/bp-core.c index 7b35966..b01c1d2 100644 --- a/bp-core.c +++ b/bp-core.c @@ -144,7 +144,7 @@ int search_MB_r(bp *b, int i, int td) B = b->B; n = b->n; - il = min((MBid(i) + 1) << logMB,n); + il = min((MBid(i) + 1) << logMB, n); for ( ; i < il; i+=SB) { #if (SB % RRR != 0) d = bp_depth(b,i-1); @@ -172,6 +172,7 @@ int bp_fwd_excess(bp *b,int s, int rel) int m,M; int m_ofs; pb *B; + n = b->n; B = b->B; i = s+1; @@ -442,7 +443,7 @@ int bp_fast_degree(bp *b,int s, int t, int ith) int deg,degtmp; int sm,tm,ss,h; - n = t; + n = t; B = b->B; deg = 0; @@ -582,7 +583,7 @@ int bp_fast_degree(bp *b,int s, int t, int ith) deg += degtmp; if (d == END) return deg; return deg; - + // unexpected (bug) printf("degree: ???\n"); return -99; diff --git a/bp-darray.c b/bp-darray.c index c3c06a6..ff781ec 100644 --- a/bp-darray.c +++ b/bp-darray.c @@ -451,7 +451,7 @@ int bp_darray_select(darray *da, int i,int f) i--; - il = da->p[i>>logL]; + il = da->p[ i >> logL ]; if (il < 0) { il = -il-1; p = da->sl[(il< #include #include "bp-darray.h" #include "bp-utils.h" - #define OP 1 #define CP 0 @@ -21,15 +19,15 @@ extern "C" { #define OPT_LEFT 0 #define OPT_RIGHT 2 -#define OPT_LEAF (1<<0) -#define OPT_INORDER (1<<1) -#define OPT_DEGREE (1<<2) -#define OPT_FAST_PREORDER_SELECT (1<<3) -#define OPT_FAST_LEAF_SELECT (1<<4) -#define OPT_FAST_INORDER_SELECT (1<<5) -#define OPT_FAST_POSTORDER_SELECT (1<<6) -#define OPT_DFUDS_LEAF (1<<7) -#define OPT_FAST_DFUDS_LEAF_SELECT (1<<8) +#define OPT_LEAF (1 << 0) +#define OPT_INORDER (1 << 1) +#define OPT_DEGREE (1 << 2) +#define OPT_FAST_PREORDER_SELECT (1 << 3) +#define OPT_FAST_LEAF_SELECT (1 << 4) +#define OPT_FAST_INORDER_SELECT (1 << 5) +#define OPT_FAST_POSTORDER_SELECT (1 << 6) +#define OPT_DFUDS_LEAF (1 << 7) +#define OPT_FAST_DFUDS_LEAF_SELECT (1 << 8) //#define logSB 9 #define logSB 7 @@ -193,7 +191,7 @@ int bp_postorder_rank(bp *b,int s); /////////////////////////////////////////// static inline int bp_inspect(bp *b, int s) { - return bp_getbit(b->B,s); + return bp_getbit(b->B, s); } static inline int bp_isleaf(bp *b, int s) -- 2.17.1