Update of /cvsroot/mndiff/mndiff
In directory mail:/var2/tmp/cvs-serv3631
Modified Files:
diffcore.c
Log Message:
MNDIFF_FLAG_PROGRESS vs. MNDIFF_FLAG_VERBOSE
Index: diffcore.c
===================================================================
RCS file: /cvsroot/mndiff/mndiff/diffcore.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- diffcore.c 23 Feb 2005 19:38:35 -0000 1.1.1.1
+++ diffcore.c 23 Feb 2005 22:03:00 -0000 1.2
@@ -363,7 +363,7 @@
for(i=0; i<length[0]; i++)
suffix[i]= data[0] + i;
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "sorting suffix array ...\n");
{START_TIMER
sort(suffix, length[0], end[0]);
@@ -385,7 +385,7 @@
link= malloc(sizeof(int) * length[1] * 4 * TRIES);
memset(link, -1, sizeof(int) * length[1] * 4 * TRIES);
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "building likely link table ...\n");
memset(clen, 0, sizeof(int)*(length[0] + length[1]));
@@ -425,7 +425,7 @@
i+= best[TRIES-1][2];
}
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "finding collisions ...\n");
log2_len= log(length[0]-1)/log(2);
assert(1<<(log2_len + 1) >= length[0]);
@@ -482,7 +482,7 @@
#endif
}
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "sorting collisions ...\n");
qsort(link, link_count, sizeof(int)*4, link_cmp);
@@ -491,7 +491,7 @@
memset(clen, 0, sizeof(int)*(length[0] + length[1]));
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "linking least constraining ...\n");
for(j=0; j<link_count; j++){
int best_score= INT_MIN;
@@ -592,7 +592,7 @@
}
}
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "iterative refinement ");
for(pass=0; change; pass++){
change=0;
@@ -724,7 +724,7 @@
}
}
- if(c.flags & MNDIFF_FLAG_PROGRESS)
+ if(c.flags & MNDIFF_FLAG_VERBOSE)
fprintf(stderr, "\n");
free(suffix);
free(c.temp_off[0]);
