Se mueve la lectura del bloque a BS, que ahora le voy a meter una optimizacion para

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index d8bd093547ffefba5c796aaa24ccfd5331b56fcb..93b7bb55c5395bdc082f5ba939c97d988b0938c3 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;
 
 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;
 

-       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)
 }
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)


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

-       /* Hack */

        return 0;
 }
 
        return 0;
 }
 


@@ -74,26 +66,16 @@ 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;
        char *out;
 
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
        Uint32 i, k;
        char *out;
 

-       /* Dejo lugar para guardar el k y el tamaño de este bloque */
-       out = salida + sizeof(Uint32)*2;
+       /* Dejo lugar para guardar el K */
+       out = salida + sizeof(Uint32);

 
        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;
        }


@@ -112,9 +94,8 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido)
        ordenar_array(in, bs);
        (*k) = generar_salida(in, bs, out);
 
        ordenar_array(in, bs);
        (*k) = generar_salida(in, bs, out);
 

-       /* Guardo el k y el tamaño en el array */
-       memcpy(out, &leido, sizeof(Uint32));
-       memcpy(out+sizeof(Uint32), k, sizeof(Uint32));
+       /* Guardo el k y el tamaño en el array */       
+       memcpy(out, k, sizeof(Uint32));

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


@@ -139,8 +120,6 @@ void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)
                current = in[current].sig;
        } while (current != k);
        free(in);
                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)
 }
 
 t_BlockSort *bs_create(Uint32 len)


@@ -161,3 +140,17 @@ void bs_destroy(t_BlockSort *bs)
        free(bs);
 }
 
        free(bs);
 }
 

+int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
+{
+       Uint32 i=0;
+
+       while ((!feof(fp)) && (i < pagesize)) {
+               data[i++] = fgetc(fp);
+       }
+
+       /* Saco un EOF que lee de mas */
+       if (i<pagesize) i--;
+
+       return i;
+}
+