X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/4fbbdce8870aa51feec002671eb0035710d072a8..816b508c140a36259ad9864d1b655b8336e9ac30:/src/jacu.c diff --git a/src/jacu.c b/src/jacu.c index 8c6a210..3d18ed3 100644 --- a/src/jacu.c +++ b/src/jacu.c @@ -2,6 +2,7 @@ #include "statichuff/statichuff.h" #include "blocksorting/bs.h" #include "mtf/mtf.h" +#include "vfile/vfile.h" #include #include #include @@ -57,13 +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; - int *mtf; + char *mtf; char *salida, *data, c; data = malloc(sizeof(char)*pagesize); - salida = malloc(sizeof(char)*(pagesize)); + /* 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); + fp = fopen(argv[optind], "rb"); fp_out = fopen("tmp.comp", "wb"); + c = fgetc(fp); total = 0; while (!feof(fp)) { @@ -73,17 +77,25 @@ int main(int argc, char* argv[]) c = fgetc(fp); total++; } + /* Hago el BS */ bs_solve(data, salida, bs, &k, i); - /* Le aplico el MTF */ - mtf = jacu_mtf(salida, i); + + /* 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 0) { + block = malloc((block_size+sizeof(unsigned long int))*sizeof(char)); + orig = malloc(block_size*sizeof(char)); + vfread(block, block_size, sizeof(char), fp_in); + + mtf = jacu_mtf_inv(block, /*XXX NO LO TENGO XXX */pos, block_size); + + memcpy(&k, block, sizeof(unsigned long int)); + + bs_restore(orig, block+sizeof(unsigned long int), k, block_size); + + fwrite(orig, block_size, sizeof(char), fp_out); + free(block); + free(orig); + free(mtf); + } + } + vfclose(fp_in); + fclose(fp_out); } - + return 0; }