Limpio de basura todo el codigo

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index ddd6aef86a89e989fb5b7bd200b99bebb4f13be8..fa1415253f979ef07453d44358a123aefa06f14d 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -27,18 +27,11 @@ int _compare(const void *d1, const void *d2) {
 
 int __compare(const void *d1, const void *d2) {
        t_BlockSortData *s1, *s2;
-       char i;
 
        s1 = (t_BlockSortData *)d1;
        s2 = (t_BlockSortData *)d2;
 
-       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;
+       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)
@@ -73,15 +66,6 @@ void ordenar_array(char *data, t_BlockSort *bs)
        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;
@@ -92,7 +76,6 @@ int generar_salida(char *data, t_BlockSort *bs, char *salida)
 
        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;
        }
@@ -117,18 +100,6 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido)
        bs->len = l;
 }
 
-void print_v(t_BlockSortDecode *d, size_t len)
-{
-       size_t i;
-       
-       for(i=0; i<len; i++)
-               printf("(%ld)", d[i].sig);
-       printf("\n");
-       for(i=0; i<len; i++)
-               printf("(%d)", d[i].c);
-       printf("\n");
-}
-
 void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
 {
        Uint32 i, current;
@@ -141,11 +112,7 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
                in[i].sig = i;
        }
 
-       /*printf("Antes de QSort\n");
-       print_v(in, len);*/
        qsort(in, len, sizeof(t_BlockSortDecode), _compare);
-       /*printf("Despues de QSort\n");
-       print_v(in, len);*/
        
        current = k;
        i=0;
@@ -154,8 +121,6 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
                current = in[current].sig;
        } while (current != k);
        free(in);
-
-       if (i < len) printf("Noo %ld != %ld\n", i, len);
 }
 
 t_BlockSort *bs_create(Uint32 len)