DESCOMPRIME !!!!!!!!!!!!!!!!!!

[z.facultad/75.06/jacu.git] / src / mtf / mtf.c

diff --git a/src/mtf/mtf.c b/src/mtf/mtf.c
index c906f47d159eb6aae67e4a3a99e01558f1d1f156..6326b5e0cecb4a23e8e87d533d959719a896958b 100644 (file)
--- a/src/mtf/mtf.c
+++ b/src/mtf/mtf.c
@@ -16,31 +16,37 @@ void print_z(char *z, int len)
        fprintf(stderr, "\n");
 }
 
-int *jacu_mtf(char *datos, int len)
+char *jacu_mtf(char *datos, int len, char **_z, int *z_len)
 {
        char *z;
-       int *pos;
+       char *pos;
        int i, size;
        
-       pos = (int*)malloc(len*sizeof(int));
+       pos = (char *)malloc(len*sizeof(char));
        z = jacu_buscar_z(datos, len, &size);
+       (*_z) = jacu_buscar_z(datos, len, &size);
+
        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);
+               printf("pos de %c = %d\n", datos[i], pos[i]);
                if (pos[i] != 0) 
-                       pop_front(z,pos[i]);
+                       pop_front(z, pos[i]);
        }
+
+       /*(*_z) = z;*/
+       (*z_len) = size;
        return pos;
 }
 
-char *jacu_mtf_inv(char *z, int *pos, int len)
+char *jacu_mtf_inv(char *z, char *pos, int len)
 {
        char *datos;
        int i;
        
        datos = (char*)malloc(sizeof(char)*len);
        for(i=0; i<len; i++){
-               datos[i] = z[pos[i]];
-               pop_front(z,pos[i]);
+               datos[i] = z[(size_t)pos[i]];
+               pop_front(z, pos[i]);
        }
        return datos;
 }