Fixed leak en MTF

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

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index b95b74b7612300475790dbe2ac61909b3bbf5769..a1e14a252cb3e476088a2633e704da95c5d4fc80 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -1,12 +1,13 @@
 
 #include "bs.h"
 #include <stdlib.h>
 
 #include "bs.h"
 #include <stdlib.h>

+#include <ctype.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;

-       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 +18,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 +32,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,26 +67,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++)
-               printf("%c", data[(pos+i)%len]);
-       printf("\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;
        }


@@ -99,10 +95,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));
-       printf("%ld -> %ld\n", *k, *(Uint32 *)(out+sizeof(Uint32)));
+       /* Guardo el k y el tamaño en el array */       
+       memcpy(out, k, sizeof(Uint32));

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


@@ -115,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);


@@ -124,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);
 }


@@ -147,3 +141,53 @@ void bs_destroy(t_BlockSort *bs)
        free(bs);
 }
 
        free(bs);
 }
 

+
+void bs_EOL(char *data, Uint32 pagesize, Uint32 *j)
+{
+       /* Trato de agregar 4 espacios antes y 4 despues de un \n */
+       int i = (*j);
+
+       /* Verifico poder hacerlo */
+       if ((i+9) >= pagesize) return; /* No pude! */
+       
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+
+       (*j) += 9;
+}
+
+int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
+{
+       Uint32 i=0;
+       char c;
+       while ((!feof(fp)) && (i < pagesize)) {
+               c = fgetc(fp);
+/*             if (c != '\n')*/
+               if (c == '\0') {
+                       /* Debo encodear el \0 para que no complique */
+                       data[i++] = 0x00;
+                       data[i++] = 0xFF;
+               }
+               if (isupper(c)) {
+                       data[i++] = '\0';
+                       data[i++] = tolower(c);
+               } else {
+                       data[i++] = c;
+               }
+/*             else
+                       bs_EOL(data, pagesize, &i);*/
+       }
+
+       /* Saco un EOF que lee de mas */
+       if (i<pagesize) i--;
+
+       return i;
+}
+