Borro .o en subdirectorios en el make clean.

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 21e1ff664e6b18fb6ce39e890a24c775e4b74c6b..0aff024908b0e4d3eddd8c2f88f55d8603fd9feb 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -1,11 +1,12 @@
 
 #include "bs.h"
 
 #include "bs.h"

+#include <stdlib.h>

 
 /* Block Sorting Optimizado en memoria! */
 
 typedef struct _bs_decode_t_ {
        char c;
 
 /* Block Sorting Optimizado en memoria! */
 
 typedef struct _bs_decode_t_ {
        char c;

-       unsigned long int pos;
+       Uint32 pos;

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


@@ -30,7 +31,7 @@ int __compare(const void *d1, const void *d2) {
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)
 {
 
 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;
 
        for(k=0; k<bs->len; k++) {
                pi = (i+k)%bs->len;


@@ -60,9 +61,9 @@ 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, 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]);
 
        for(i=0; i<len; i++)
                printf("%c", data[(pos+i)%len]);


@@ -71,17 +72,22 @@ void print_(char *data, unsigned long int pos, unsigned long int len)
 
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
 
 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); */
        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;
 }
 
                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;
 {
        unsigned int l;
        l = bs->len;


@@ -93,12 +99,16 @@ 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);
 
        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));
+       printf("%ld -> %ld\n", *k, *(Uint32 *)(out+sizeof(Uint32)));

        bs->len = l;
 }
 
        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);
        t_BlockSortDecode *in;
 
        in = malloc(sizeof(t_BlockSortDecode)*len);


@@ -114,12 +124,15 @@ void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len)
        i=0;
        do {
                dst[i++] = in[current].c;
        i=0;
        do {
                dst[i++] = in[current].c;

+               printf("(%c)", dst[i-1]);

                current = in[current].pos;
                current = in[current].pos;

+               printf("[%d]", current);

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

+       printf("\n");

        free(in);
 }
 
        free(in);
 }
 

-t_BlockSort *bs_create(unsigned long int len)
+t_BlockSort *bs_create(Uint32 len)

 {
        t_BlockSort *tmp;
 
 {
        t_BlockSort *tmp;