Algunas mejoras, comentarios y arreglos

diff --git a/src/Makefile b/src/Makefile
index fd18b1e416fe5fb0bbd416304b0c0b10d11a50f9..a046cdeeb42e2c53a90d35d3558f4a8df1f2c0ce 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,13 +47,11 @@ clean:
 
 jacu.o: statichuff/statichuff.h /usr/include/stdio.h /usr/include/features.h
 jacu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 
 jacu.o: statichuff/statichuff.h /usr/include/stdio.h /usr/include/features.h
 jacu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h

-jacu.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stddef.h

 jacu.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
 jacu.o: /usr/include/bits/typesizes.h /usr/include/libio.h
 jacu.o: /usr/include/_G_config.h /usr/include/wchar.h
 jacu.o: /usr/include/bits/wchar.h /usr/include/gconv.h
 jacu.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
 jacu.o: /usr/include/bits/typesizes.h /usr/include/libio.h
 jacu.o: /usr/include/_G_config.h /usr/include/wchar.h
 jacu.o: /usr/include/bits/wchar.h /usr/include/gconv.h

-jacu.o: /usr/lib/gcc-lib/i486-linux/3.3.4/include/stdarg.h

 jacu.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 jacu.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
 jacu.o: /usr/include/bits/confname.h blocksorting/bs.h /usr/include/string.h
 jacu.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 jacu.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
 jacu.o: /usr/include/bits/confname.h blocksorting/bs.h /usr/include/string.h

-jacu.o: /usr/include/stdlib.h mtf/mtf.h
+jacu.o: /usr/include/stdlib.h mtf/mtf.h vfile/vfile.h

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 64ea8ab45c50c764c84683e947d679847334a53f..9463b433401793f92ec978484180e3d5942e0590 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -100,8 +100,8 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsign
        (*k) = generar_salida(in, bs, out);
 
        /* Guardo el k y el tamaño en el array */
        (*k) = generar_salida(in, bs, out);
 
        /* Guardo el k y el tamaño en el array */

-       memcpy(out, k, sizeof(unsigned long int));
-       memcpy(out+sizeof(unsigned long int), &leido, sizeof(unsigned long int));
+       memcpy(out, &leido, sizeof(unsigned long int));
+       memcpy(out+sizeof(unsigned long int), k, sizeof(unsigned long int));

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

diff --git a/src/jacu.c b/src/jacu.c
index 8e748122f4e123061de97246fabb8d3aa1a18b23..21f31c53b9d0c20784837a29bd50d8b6c12afa7e 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -58,14 +58,16 @@ int main(int argc, char* argv[])
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
                unsigned long int i, j, total, k;
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
                unsigned long int i, j, total, k;

-               int *mtf;
+               char *mtf;

                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);
                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);

-               /* Reservo lugar tambien para guardar el k */
+               /* Reservo lugar tambien para guardar el k y el tamaño  */

                salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
                bs = bs_create(pagesize);
                salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
                bs = bs_create(pagesize);

+

                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);
                total = 0;
                while (!feof(fp)) {
                c = fgetc(fp);
                total = 0;
                while (!feof(fp)) {


@@ -75,17 +77,25 @@ int main(int argc, char* argv[])
                                c = fgetc(fp);
                                total++;
                        }
                                c = fgetc(fp);
                                total++;
                        }

+

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

-                       /* Le aplico el MTF */
-                       mtf = jacu_mtf(salida, i+sizeof(unsigned long int)*2);
+
+                       /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
+                       mtf = jacu_mtf(salida+sizeof(unsigned long int), i+sizeof(unsigned long int));

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

+                       free(mtf);

                }
                }

+
+               /* Limpiando */

                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);

+
+               /* Comprimo con huffman */

                i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
                i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);

+

                /* borro el temporal */
                unlink("tmp.comp");
                return i;
                /* borro el temporal */
                unlink("tmp.comp");
                return i;

diff --git a/src/mtf/mtf.c b/src/mtf/mtf.c
index c906f47d159eb6aae67e4a3a99e01558f1d1f156..e88981736638ecd4d66084d4f2523931aa05925b 100644 (file)
--- a/src/mtf/mtf.c
+++ b/src/mtf/mtf.c
@@ -16,13 +16,13 @@ void print_z(char *z, int len)
        fprintf(stderr, "\n");
 }
 
        fprintf(stderr, "\n");
 }
 

-int *jacu_mtf(char *datos, int len)
+char *jacu_mtf(char *datos, int len)

 {
        char *z;
        int *pos;
        int i, size;
        
 {
        char *z;
        int *pos;
        int i, size;
        

-       pos = (int*)malloc(len*sizeof(int));
+       pos = (char *)malloc(len*sizeof(char));

        z = jacu_buscar_z(datos, len, &size);
        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);
        z = jacu_buscar_z(datos, len, &size);
        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);

diff --git a/src/mtf/mtf.h b/src/mtf/mtf.h
index 65820efc6d79d2c43e1a1cc83b3f3bc270ffbe6a..7b0e05839244090c7d078e03f7191adb9c281472 100644 (file)
--- a/src/mtf/mtf.h
+++ b/src/mtf/mtf.h
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-int *jacu_mtf(char *datos, int len);
+char *jacu_mtf(char *datos, int len);

 
 char *jacu_mtf_inv(char *z, int *pos, int len);
 
 
 char *jacu_mtf_inv(char *z, int *pos, int len);