arreglos minimos, saco los printf feos

diff --git a/otros/mtf/main.c b/otros/mtf/main.c
index 3ef990eb243b0bbc38f40a6eca3b4a52f2787a05..38652da40c68d2a6851ac25687df420a985478aa 100644 (file)
--- a/otros/mtf/main.c
+++ b/otros/mtf/main.c
@@ -9,7 +9,6 @@ int main(int argc, char *argv[] )
        int *pos;
        int len;
        int i;
        int *pos;
        int len;
        int i;

-

        len = fread(buff, 1, BUFSIZ, stdin);
        buff[len] = '\0';
 
        len = fread(buff, 1, BUFSIZ, stdin);
        buff[len] = '\0';
 


@@ -23,4 +22,3 @@ int main(int argc, char *argv[] )
 
        return 0;
 }
 
        return 0;
 }

-

diff --git a/otros/mtf/mtf.c b/otros/mtf/mtf.c
index 993b9dabe858b01e337e25d1907e376621740ff5..3113161b6dad6aade21452fa9646800a4f61106b 100644 (file)
--- a/otros/mtf/mtf.c
+++ b/otros/mtf/mtf.c
@@ -5,7 +5,7 @@ int no_pertenece(char *z, char c, int len);
 
 void pop_front(char *z, int pos);
 
 
 void pop_front(char *z, int pos);
 

-/*int get_pos(char *z, int len, char c);*/
+int get_pos(char *z, int len, char c);

 /****fin privadas******/
 
 void print_z(char *z, int len)
 /****fin privadas******/
 
 void print_z(char *z, int len)


@@ -16,16 +16,6 @@ void print_z(char *z, int len)
        fprintf(stderr, "\n");
 }
 
        fprintf(stderr, "\n");
 }
 

-int comparar(const void *d1, const void *d2)
-{
-       char *c1, *c2;
-
-       c1 = (char *)d1;
-       c2 = (char *)d2;
-
-       return (*c1) - (*c2);
-}
-

 int *jacu_mtf(char *datos, int len)
 {
        char *z;
 int *jacu_mtf(char *datos, int len)
 {
        char *z;


@@ -34,21 +24,10 @@ int *jacu_mtf(char *datos, int len)
        
        pos = (int*)malloc(len*sizeof(int));
        z = jacu_buscar_z(datos, len, &size);
        
        pos = (int*)malloc(len*sizeof(int));
        z = jacu_buscar_z(datos, len, &size);

-       fprintf(stderr, "Z original = ");
-       print_z(z, size);
-       fprintf(stderr, "SIZE = %d\n", size);
-       /*z[0]='A';z[1]='B';z[2]='C';z[3]='D';z[4]='R';*/
-       /* Ordeno */
-       qsort(z, size, 1, comparar);
-       fprintf(stderr, "Z ordenado = ");
-       print_z(z, size);
-

        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);
        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);

-               fprintf(stderr, "vino %c emiti: %d\n",datos[i], pos[i]);

                if (pos[i] != 0) 
                        pop_front(z,pos[i]);
                if (pos[i] != 0) 
                        pop_front(z,pos[i]);

-               print_z(z, size);

        }
        return pos;
 }
        }
        return pos;
 }


@@ -59,8 +38,7 @@ char *jacu_buscar_z(char* datos, int len, int *size)
        char *z;
        int i, j=0;
        
        char *z;
        int i, j=0;
        

-       z = NULL; /*(char*)malloc(1);*/
-       /*if (z==NULL) return NULL;*/
+       z = NULL; 

        for(i=0; i<len; i++){
                if( no_pertenece(z, datos[i], j) == -1 ){
                        j++;
        for(i=0; i<len; i++){
                if( no_pertenece(z, datos[i], j) == -1 ){
                        j++;

diff --git a/otros/mtf/mtf.h b/otros/mtf/mtf.h
index 7173c6ace102b9cbeade52e9a80a2c158ed67db1..b5963ea6496c4f33fee297e3216e1269b83a4d05 100644 (file)
--- a/otros/mtf/mtf.h
+++ b/otros/mtf/mtf.h
@@ -7,6 +7,4 @@ int *jacu_mtf(char *datos, int len);
 
 char *jacu_buscar_z(char* datos, int len, int *size);
 
 
 char *jacu_buscar_z(char* datos, int len, int *size);
 

-int get_pos(char *z, int len, char c);
-

 #endif
 #endif