projects
/
SXSI
/
XMLTree.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code clean up.
[SXSI/XMLTree.git]
/
libcds
/
src
/
static_bitsequence
/
sdarray.cpp
diff --git
a/libcds/src/static_bitsequence/sdarray.cpp
b/libcds/src/static_bitsequence/sdarray.cpp
index
96810fe
..
2294a0c
100644
(file)
--- a/
libcds/src/static_bitsequence/sdarray.cpp
+++ b/
libcds/src/static_bitsequence/sdarray.cpp
@@
-159,8
+159,11
@@
static const unsigned int _popCount[] = {
};
static unsigned int __selecttbl[8*256];
};
static unsigned int __selecttbl[8*256];
+static int built = 0;
void make___selecttbl(void) {
void make___selecttbl(void) {
+ if(built) return;
+ built = 1;
int i,x,r;
uint buf[1];
int i,x,r;
uint buf[1];
@@
-666,22
+669,24
@@
int selects3_select(selects3 *select, int i) {
if (i == 0) return -1;
d = select->d;
if (i == 0) return -1;
d = select->d;
- if(select->lasti==(uint)i-1) {
+
/*
if(select->lasti==(uint)i-1) {
while(!__getbit2(select->sd1->buf,++select->lasts));
}
else {
select->lasts = selectd2_select(select->sd1,i,1);
}
select->lasti = i;
while(!__getbit2(select->sd1->buf,++select->lasts));
}
else {
select->lasts = selectd2_select(select->sd1,i,1);
}
select->lasti = i;
- //lasts3 = select;
- x = (select->lasts-(i-1)) << d;
+ //lasts3 = select; */
+ x = selectd2_select(select->sd1,i,1) - (i-1);
+ //x = (select->lasts-(i-1)) << d;
+ x <<= d;
x += __getbits(select->low,(i-1)*d,d);
return x;
}
int selects3_selectnext(selects3 *select, int i) {
x += __getbits(select->low,(i-1)*d,d);
return x;
}
int selects3_selectnext(selects3 *select, int i) {
- return selects3_select(select,selects3_rank(select,i)+1);
+
//
return selects3_select(select,selects3_rank(select,i)+1);
int d,x,w,y;
int r,j;
int z,ii;
int d,x,w,y;
int r,j;
int z,ii;
@@
-753,6
+758,7
@@
int selects3_rank(selects3 *select, int i) {
q = select->low;
ii = i>>d;
q = select->low;
ii = i>>d;
+
y = selectd2_select(select->sd0,ii,0)+1;
// selectd2_select2(select->sd0,ii,0,&y1,&y2);
//y1++; y2++;
y = selectd2_select(select->sd0,ii,0)+1;
// selectd2_select2(select->sd0,ii,0,&y1,&y2);
//y1++; y2++;