projects
/
SXSI
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove suprious printing.
[SXSI/libcds.git]
/
src
/
static_bitsequence
/
sdarray.cpp
diff --git
a/src/static_bitsequence/sdarray.cpp
b/src/static_bitsequence/sdarray.cpp
index
30cdf9e
..
d0a4066
100644
(file)
--- a/
src/static_bitsequence/sdarray.cpp
+++ b/
src/static_bitsequence/sdarray.cpp
@@
-265,7
+265,7
@@
int selectd2_construct(selectd2 *select, int n, uchar *buf) {
int i,m;
int nl;
int p,pp;
int i,m;
int nl;
int p,pp;
- int il,is,m
l,ms
;
+ int il,is,m
s,ml
;
int r;
uint *s;
int r;
uint *s;
@@
-302,6
+302,7
@@
int selectd2_construct(selectd2 *select, int n, uchar *buf) {
for(int k=0;k<nl+1;k++) select->p[k]=0;
select->size += (nl+1)*sizeof(uint);
for(int k=0;k<nl+1;k++) select->p[k]=0;
select->size += (nl+1)*sizeof(uint);
+
for (r = 0; r < 2; r++) {
ml = ms = 0;
for (il = 0; il < nl; il++) {
for (r = 0; r < 2; r++) {
ml = ms = 0;
for (il = 0; il < nl; il++) {
@@
-309,7
+310,8
@@
int selectd2_construct(selectd2 *select, int n, uchar *buf) {
select->lp[il] = pp;
i = min((il+1)*L-1,m-1);
p = s[i];
select->lp[il] = pp;
i = min((il+1)*L-1,m-1);
p = s[i];
- //printf("%d ",p-pp);
+ // printf("p-pp=%d, LL=%d\n",p-pp, LL);
+
if (p - pp >= LL) {
if (r == 1) {
for (is = 0; is < L; is++) {
if (p - pp >= LL) {
if (r == 1) {
for (is = 0; is < L; is++) {
@@
-317,6
+319,7
@@
int selectd2_construct(selectd2 *select, int n, uchar *buf) {
select->sl[ml*L+is] = s[il*L+is];
}
}
select->sl[ml*L+is] = s[il*L+is];
}
}
+
select->p[il] = -((ml<<logL)+1);
ml++;
}
select->p[il] = -((ml<<logL)+1);
ml++;
}
@@
-331,6
+334,7
@@
int selectd2_construct(selectd2 *select, int n, uchar *buf) {
ms++;
}
}
ms++;
}
}
+
if (r == 0) {
select->sl = new uint[ml*L+1];
for(int k=0;k<ml*L+1;k++) select->sl[k]=0;
if (r == 0) {
select->sl = new uint[ml*L+1];
for(int k=0;k<ml*L+1;k++) select->sl[k]=0;