Modifico el main del Jacu para que compile con la nueva API de Huffman por lo que...

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 7f8cb83e1f4e8e147f5ab1cbc54fe9a003fc04ee..d8bd093547ffefba5c796aaa24ccfd5331b56fcb 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -6,7 +6,7 @@
 
 typedef struct _bs_decode_t_ {
        char c;
-       unsigned long int pos;
+       Uint32 sig;
 } t_BlockSortDecode;
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j);
@@ -17,21 +17,33 @@ int _compare(const void *d1, const void *d2) {
        s1 = (t_BlockSortDecode *)d1;
        s2 = (t_BlockSortDecode *)d2;
 
+       /* Hack si es el mismo caracter, dejo como mejor la de menor sig */
+       if (s1->c == s2->c) {
+               return (s1->sig - s2->sig);
+       }
+
        return (s1->c - s2->c);
 }
 
 int __compare(const void *d1, const void *d2) {
        t_BlockSortData *s1, *s2;
+       char i;
 
        s1 = (t_BlockSortData *)d1;
        s2 = (t_BlockSortData *)d2;
 
-       return es_menor(s1->bs->data, s1->bs, s1->pos_inicial, s2->pos_inicial);
+       i = es_menor(s1->bs->data, s1->bs, s1->pos_inicial, s2->pos_inicial);
+
+/*     if (i == 0) {*/
+               /* si ambos strings son iguales, fuerzo a que d1 quede primero */
+               /*return -1;
+       }*/
+       return i;
 }
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)
 {
-       unsigned long int pi, pj, k;
+       Uint32 pi, pj, k;
 
        for(k=0; k<bs->len; k++) {
                pi = (i+k)%bs->len;
@@ -42,6 +54,7 @@ char es_menor(char *data, t_BlockSort *bs, int i, int j)
        }
 
        /* Son iguales! */
+       /* Hack */
        return 0;
 }
 
@@ -61,28 +74,33 @@ void ordenar_array(char *data, t_BlockSort *bs)
        qsort(bs->array, bs->len, sizeof(t_BlockSortData), __compare);
 }
 
-void print_(char *data, unsigned long int pos, unsigned long int len)
+void print_(char *data, Uint32 pos, Uint32 len)
 {
-       unsigned long int i;
+       Uint32 i;
 
        for(i=0; i<len; i++)
-               printf("%c", data[(pos+i)%len]);
-       printf("\n");
+               fprintf(stderr, "%c", data[(pos+i)%len]);
+       fprintf(stderr, "\n");
 }
 
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
-       unsigned long int i, k;
+       Uint32 i, k;
+       char *out;
+
+       /* Dejo lugar para guardar el k y el tamaño de este bloque */
+       out = salida + sizeof(Uint32)*2;
+
        k=-1;
        for(i=0; i<bs->len; i++) {
                /* print_(data, bs->array[i].pos_inicial, bs->len); */
-               salida[i] = data[bs->array[i].pos_final];
+               out[i] = data[bs->array[i].pos_final];
                if (bs->array[i].ord == 1) k = i;
        }
        return k;
 }
 
-void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsigned int leido)
+void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido)
 {
        unsigned int l;
        l = bs->len;
@@ -94,22 +112,22 @@ 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);
 
-       /* Guardo el k en el array */
-       memcpy(out+leido, k, sizeof(unsigned long int));
-
+       /* Guardo el k y el tamaño en el array */
+       memcpy(out, &leido, sizeof(Uint32));
+       memcpy(out+sizeof(Uint32), k, sizeof(Uint32));
        bs->len = l;
 }
 
-void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len)
+void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
 {
-       unsigned long int i, current;
+       Uint32 i, current;
        t_BlockSortDecode *in;
 
        in = malloc(sizeof(t_BlockSortDecode)*len);
 
        for(i=0; i<len; i++) {
                in[i].c = c[i];
-               in[i].pos = i;
+               in[i].sig = i;
        }
 
        qsort(in, len, sizeof(t_BlockSortDecode), _compare);
@@ -118,12 +136,14 @@ void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len)
        i=0;
        do {
                dst[i++] = in[current].c;
-               current = in[current].pos;
+               current = in[current].sig;
        } while (current != k);
        free(in);
+
+       if (i < len) printf("Noo %ld != %ld\n", i, len);
 }
 
-t_BlockSort *bs_create(unsigned long int len)
+t_BlockSort *bs_create(Uint32 len)
 {
        t_BlockSort *tmp;