Agrego suit de test. Solo ejecutar test_calgary.sh dentro del dir y el laburo

 lo hace todo el script.

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index a1e14a252cb3e476088a2633e704da95c5d4fc80..4ce8a12ff6be768cdd11dd05b035201663713aa3 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -170,13 +170,13 @@ int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
        while ((!feof(fp)) && (i < pagesize)) {
                c = fgetc(fp);
 /*             if (c != '\n')*/
        while ((!feof(fp)) && (i < pagesize)) {
                c = fgetc(fp);
 /*             if (c != '\n')*/

-               if (c == '\0') {
+               if (c == 0x01) {

                        /* Debo encodear el \0 para que no complique */
                        /* Debo encodear el \0 para que no complique */

-                       data[i++] = 0x00;
+                       data[i++] = 0x01;

                        data[i++] = 0xFF;
                }
                if (isupper(c)) {
                        data[i++] = 0xFF;
                }
                if (isupper(c)) {

-                       data[i++] = '\0';
+                       data[i++] = 0x01;

                        data[i++] = tolower(c);
                } else {
                        data[i++] = c;
                        data[i++] = tolower(c);
                } else {
                        data[i++] = c;

diff --git a/src/calgary/calgary.tar.bz2 b/src/calgary/calgary.tar.bz2
new file mode 100644 (file)
index 0000000..e534a67
Binary files /dev/null and b/src/calgary/calgary.tar.bz2 differ

diff --git a/src/calgary/test_calgary.sh b/src/calgary/test_calgary.sh
new file mode 100755 (executable)
index 0000000..8e19d1b
--- /dev/null
+++ b/src/calgary/test_calgary.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+if [ ! -e bib ] ; then
+       echo "Descomprimiendo Calgary Corpus Suite ..."
+       if [ ! -e calgary.tar.bz2 ] ; then
+               echo "NO EXISTE cagary.tar.gz ... abortando"
+       fi
+tar -xjf calgary.tar.bz2
+fi
+
+echo "===================================="
+time ../jacu -c $@ bib bib.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ book1 book1.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ book2 book2.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ geo geo.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ news news.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ obj1 obj1.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ obj2 obj2.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper1 paper1.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper2 paper2.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper3 paper3.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper4 paper4.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper5 paper5.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ paper6 paper6.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ pic pic.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ progc progc.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ progl progl.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ progp progp.z 2> /dev/null
+echo "===================================="
+time ../jacu -c $@ trans trans.z 2> /dev/null
+echo "===================================="
+