Listo Huffman Canonico, con dos nuevos parametros s y m se permite grabar una tabla...

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 6231d057474e73f99e583ffcd23f2285cff3a55b..d8bd093547ffefba5c796aaa24ccfd5331b56fcb 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -6,7 +6,7 @@
 
 typedef struct _bs_decode_t_ {
        char c;
 
 typedef struct _bs_decode_t_ {
        char c;

-       Uint32 pos;
+       Uint32 sig;

 } t_BlockSortDecode;
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j);
 } t_BlockSortDecode;
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j);


@@ -17,16 +17,28 @@ int _compare(const void *d1, const void *d2) {
        s1 = (t_BlockSortDecode *)d1;
        s2 = (t_BlockSortDecode *)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;
        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;
 
 
        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)
 }
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)


@@ -42,6 +54,7 @@ char es_menor(char *data, t_BlockSort *bs, int i, int j)
        }
 
        /* Son iguales! */
        }
 
        /* Son iguales! */

+       /* Hack */

        return 0;
 }
 
        return 0;
 }
 


@@ -114,7 +127,7 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
 
        for(i=0; i<len; i++) {
                in[i].c = c[i];
 
        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);
        }
 
        qsort(in, len, sizeof(t_BlockSortDecode), _compare);


@@ -123,9 +136,11 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
        i=0;
        do {
                dst[i++] = in[current].c;
        i=0;
        do {
                dst[i++] = in[current].c;

-               current = in[current].pos;
+               current = in[current].sig;

        } while (current != k);
        free(in);
        } while (current != k);
        free(in);

+
+       if (i < len) printf("Noo %ld != %ld\n", i, len);

 }
 
 t_BlockSort *bs_create(Uint32 len)
 }
 
 t_BlockSort *bs_create(Uint32 len)