Lo robo?

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 6231d057474e73f99e583ffcd23f2285cff3a55b..fa1415253f979ef07453d44358a123aefa06f14d 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,6 +17,11 @@ 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);
 }
 
        return (s1->c - s2->c);
 }
 


@@ -26,7 +31,7 @@ int __compare(const void *d1, const void *d2) {
        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);
+       return  es_menor(s1->bs->data, s1->bs, s1->pos_inicial, s2->pos_inicial);

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


@@ -61,15 +66,6 @@ void ordenar_array(char *data, t_BlockSort *bs)
        qsort(bs->array, bs->len, sizeof(t_BlockSortData), __compare);
 }
 
        qsort(bs->array, bs->len, sizeof(t_BlockSortData), __compare);
 }
 

-void print_(char *data, Uint32 pos, Uint32 len)
-{
-       Uint32 i;
-
-       for(i=0; i<len; i++)
-               fprintf(stderr, "%c", data[(pos+i)%len]);
-       fprintf(stderr, "\n");
-}
-

 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
        Uint32 i, k;
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
        Uint32 i, k;


@@ -80,7 +76,6 @@ int generar_salida(char *data, t_BlockSort *bs, char *salida)
 
        k=-1;
        for(i=0; i<bs->len; i++) {
 
        k=-1;
        for(i=0; i<bs->len; i++) {

-               /* print_(data, bs->array[i].pos_inicial, bs->len); */

                out[i] = data[bs->array[i].pos_final];
                if (bs->array[i].ord == 1) k = i;
        }
                out[i] = data[bs->array[i].pos_final];
                if (bs->array[i].ord == 1) k = i;
        }


@@ -114,7 +109,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,7 +118,7 @@ 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);
 }