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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 21e1ff664e6b18fb6ce39e890a24c775e4b74c6b..7f8cb83e1f4e8e147f5ab1cbc54fe9a003fc04ee 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -1,5 +1,6 @@
 
 #include "bs.h"
 
 #include "bs.h"

+#include <stdlib.h>

 
 /* Block Sorting Optimizado en memoria! */
 
 
 /* Block Sorting Optimizado en memoria! */
 


@@ -93,6 +94,9 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsign
        ordenar_array(in, bs);
        (*k) = generar_salida(in, bs, out);
 
        ordenar_array(in, bs);
        (*k) = generar_salida(in, bs, out);
 

+       /* Guardo el k en el array */
+       memcpy(out+leido, k, sizeof(unsigned long int));
+

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

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;