Bugfixes, saco algunos prints ... algunos md5 no me dan bien :-/

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 0aff024908b0e4d3eddd8c2f88f55d8603fd9feb..5c9be2a74934e71769595f960617569ec41f25a6 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -102,7 +102,6 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido)
        /* Guardo el k y el tamaño en el array */
        memcpy(out, &leido, sizeof(Uint32));
        memcpy(out+sizeof(Uint32), k, sizeof(Uint32));
        /* Guardo el k y el tamaño en el array */
        memcpy(out, &leido, sizeof(Uint32));
        memcpy(out+sizeof(Uint32), k, sizeof(Uint32));

-       printf("%ld -> %ld\n", *k, *(Uint32 *)(out+sizeof(Uint32)));

        bs->len = l;
 }
 
        bs->len = l;
 }
 


@@ -124,11 +123,8 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
        i=0;
        do {
                dst[i++] = in[current].c;
        i=0;
        do {
                dst[i++] = in[current].c;

-               printf("(%c)", dst[i-1]);

                current = in[current].pos;
                current = in[current].pos;

-               printf("[%d]", current);

        } while (current != k);
        } while (current != k);

-       printf("\n");

        free(in);
 }
 
        free(in);
 }
 

diff --git a/src/jacu.c b/src/jacu.c
index f08e73136edd0389c01e0ea87f2ed4feaf6c20aa..ca93ae6aca2d98747a698fdba327c2d3e6388c95 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -102,20 +102,22 @@ int main(int argc, char* argv[])
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");
 
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");
 

-               c = fgetc(fp);
+               /*c = fgetc(fp);*/

                total = 0;
                while (!feof(fp)) {
                        i = 0;
                        while ((!feof(fp)) && (i < pagesize)) {
                total = 0;
                while (!feof(fp)) {
                        i = 0;
                        while ((!feof(fp)) && (i < pagesize)) {

-                               data[i++] = c;
-                               c = fgetc(fp);
+                               data[i++] = fgetc(fp);

                                total++;
                        }
 
                                total++;
                        }
 

+                       /* Saco un EOF que lee de mas */
+                       if (i<pagesize) i--;
+

                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
 
                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
 

-                       printf("BS k=%ld\n", *(Uint32 *)(salida+sizeof(Uint32)));
+                       /*printf("BS k=%ld\n", *(Uint32 *)(salida+sizeof(Uint32)));

                        printf("PageSize = %ld\n", *(Uint32 *)salida);
 
                        printf("Antes de MTF = %ld [", i);
                        printf("PageSize = %ld\n", *(Uint32 *)salida);
 
                        printf("Antes de MTF = %ld [", i);


@@ -124,10 +126,10 @@ int main(int argc, char* argv[])
                                for(ii=0; ii<(i+sizeof(Uint32)); ii++)
                                        printf("(%c)", salida[ii+sizeof(Uint32)]);
                                printf("]\n");
                                for(ii=0; ii<(i+sizeof(Uint32)); ii++)
                                        printf("(%c)", salida[ii+sizeof(Uint32)]);
                                printf("]\n");

-                       }
+                       }*/

                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);

-
+/*

                        printf("MTF Z (len=%d) = [", z_len);
                        {
                                int ii;
                        printf("MTF Z (len=%d) = [", z_len);
                        {
                                int ii;


@@ -135,7 +137,7 @@ int main(int argc, char* argv[])
                                        printf("(%c)", z[ii]);
                                printf("]\n");
 
                                        printf("(%c)", z[ii]);
                                printf("]\n");
 

-                       }
+                       }*/

                        /* Si me lo piden, aplico ZG. */
                        if (zflag) {
                                size_t len;
                        /* Si me lo piden, aplico ZG. */
                        if (zflag) {
                                size_t len;


@@ -154,19 +156,20 @@ int main(int argc, char* argv[])
                                fwrite(z, z_len, sizeof(char), fp_out);
 
                                /* Guardo la salida del MTF */
                                fwrite(z, z_len, sizeof(char), fp_out);
 
                                /* Guardo la salida del MTF */

-                               printf("Despues de MTF : [");
+                               /*printf("Despues de MTF : [");*/

                                for(j=0; j<(i+sizeof(Uint32)); j++) {
                                        fputc(mtf[j], fp_out);
                                for(j=0; j<(i+sizeof(Uint32)); j++) {
                                        fputc(mtf[j], fp_out);

-                                       putchar('(');
+                       /*              putchar('(');

                                        fputc(mtf[j], stdout);
                                        fputc(mtf[j], stdout);

-                                       putchar(')');
+                                       putchar(')');*/

                                }
                                }

-                               printf("]\n");
+                               /*printf("]\n");*/

                        }
                        free(mtf);
                        free(z);
                }
 
                        }
                        free(mtf);
                        free(z);
                }
 

+               printf("Total Bytes read = %ld\n", total);

                /* Limpiando */
                fclose(fp);
                fclose(fp_out);
                /* Limpiando */
                fclose(fp);
                fclose(fp_out);


@@ -198,55 +201,50 @@ int main(int argc, char* argv[])
 
                while (!feof(fp_in)) {
                        block_size = 0;
 
                while (!feof(fp_in)) {
                        block_size = 0;

-                       PERR("Leo bloque");

                        fread(&block_size, sizeof(Uint32), 1, fp_in);
                        fread(&block_size, sizeof(Uint32), 1, fp_in);

-                       printf("PageSize = %ld\n", block_size);

                        if (block_size > 0) {
                        if (block_size > 0) {

+                               printf("PageSize = %ld\n", block_size);

                                fread(&z_len, sizeof(int), 1, fp_in);
                                z = malloc(sizeof(char)*z_len);
                                fread(z, z_len, sizeof(char), fp_in);
 
                                fread(&z_len, sizeof(int), 1, fp_in);
                                z = malloc(sizeof(char)*z_len);
                                fread(z, z_len, sizeof(char), fp_in);
 

-                               printf("MTF Z (len=%d) = [", z_len);
+                               /*printf("MTF Z (len=%d) = [", z_len);

                                {
                                        int ii;
                                        for(ii=0; ii<z_len; ii++)
                                                printf("(%c)", z[ii]);
                                        printf("]\n");
        
                                {
                                        int ii;
                                        for(ii=0; ii<z_len; ii++)
                                                printf("(%c)", z[ii]);
                                        printf("]\n");
        

-                               }
+                               }*/

                                
                                block = malloc(block_size*sizeof(char)+sizeof(Uint32));
                                orig = malloc(block_size*sizeof(char));
                                fread(block, block_size+sizeof(Uint32), sizeof(char), fp_in);
 
                                
                                block = malloc(block_size*sizeof(char)+sizeof(Uint32));
                                orig = malloc(block_size*sizeof(char));
                                fread(block, block_size+sizeof(Uint32), sizeof(char), fp_in);
 

-                               printf("Antes MTF_inv = [");
+                               /*printf("Antes MTF_inv = [");

                                {
                                        int ii;
                                        for(ii=0; ii<block_size+sizeof(Uint32); ii++)
                                                printf("(%c)", block[ii]);
                                        printf("]\n");
                                {
                                        int ii;
                                        for(ii=0; ii<block_size+sizeof(Uint32); ii++)
                                                printf("(%c)", block[ii]);
                                        printf("]\n");

-                               }
+                               }*/

                                /* Hago el MTF inverso */
                                /* Hago el MTF inverso */

-                               PERR("Haciendo MTF Inv");

                                mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
 
                                mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
 

-                               printf("Luego de MTF Inv= [");
+                               /*printf("Luego de MTF Inv= [");

                                {
                                        int ii;
                                        for(ii=0; ii<block_size+sizeof(Uint32); ii++)
                                                printf("(%c)", mtf[ii]);
                                        printf("]\n");
                                {
                                        int ii;
                                        for(ii=0; ii<block_size+sizeof(Uint32); ii++)
                                                printf("(%c)", mtf[ii]);
                                        printf("]\n");

-                               }
+                               }*/

 
                                /* Luego de hacer el MTF inverso ya puedo recuperar el k */
 
                                /* Luego de hacer el MTF inverso ya puedo recuperar el k */

-                               PERR("Recuperando K");

                                memcpy(&k, mtf, sizeof(Uint32));
 
                                memcpy(&k, mtf, sizeof(Uint32));
 

-                               printf("Restored : k=%ld\n", k);
-                               PERR("BS_Restore");
+                               /*printf("Restored : k=%ld\n", k);*/

                                bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 
                                bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 

-                               PERR("Saving Data");

                                fwrite(orig, block_size, sizeof(char), fp_out);
                                free(block);
                                free(orig);
                                fwrite(orig, block_size, sizeof(char), fp_out);
                                free(block);
                                free(orig);