* Guardo el k en el array de salida del BS para que el MTF lo tenga en cuenta.

[z.facultad/75.06/jacu.git] / src / jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index 8c6a2109997c49e7b4d50ccb6ee1e3063bfdcdee..2982b0f47cf26905aad990b3d86d067ae1b8560a 100644 (file)
--- 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 "statichuff/statichuff.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"

+#include "vfile/vfile.h"

 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>


@@ -60,7 +61,8 @@ int main(int argc, char* argv[])
                int *mtf;
                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);
                int *mtf;
                char *salida, *data, c;
                data = malloc(sizeof(char)*pagesize);

-               salida = malloc(sizeof(char)*(pagesize));
+               /* Reservo lugar tambien para guardar el k */
+               salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int));

                bs = bs_create(pagesize);
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");
                bs = bs_create(pagesize);
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");


@@ -76,14 +78,14 @@ int main(int argc, char* argv[])
                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
                        /* Le aplico el MTF */
                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
                        /* Le aplico el MTF */

-                       mtf = jacu_mtf(salida, i);
+                       mtf = jacu_mtf(salida, i+sizeof(unsigned long int));

                        for(j=0; j<i; j++)
                                fputc(mtf[j], fp_out);
                }
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);
                        for(j=0; j<i; j++)
                                fputc(mtf[j], fp_out);
                }
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);

-               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;