X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/a9564429c158d89dfc16a0ba3f2df2993de1d12f..8f161fb90db32293100c689806720acde9844b00:/otros/mtf/mtf.c?ds=sidebyside

diff --git a/otros/mtf/mtf.c b/otros/mtf/mtf.c
index e8b9f05..993b9da 100644
--- a/otros/mtf/mtf.c
+++ b/otros/mtf/mtf.c
@@ -1,7 +1,7 @@
 #include "mtf.h"
 
 /****privadas*****/
-int no_pertenece(char *z, char c);
+int no_pertenece(char *z, char c, int len);
 
 void pop_front(char *z, int pos);
 
@@ -12,10 +12,19 @@ void print_z(char *z, int len)
 {
 	int i;
 	for(i=0; i<len; i++)
-		printf("%c", z[i]);
-	printf("\n");
+		fprintf(stderr, "%c", z[i]);
+	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)
 {
@@ -23,15 +32,20 @@ int *jacu_mtf(char *datos, int len)
 	int *pos;
 	int i, size;
 	
-	pos = (int*)malloc(len);
+	pos = (int*)malloc(len*sizeof(int));
 	z = jacu_buscar_z(datos, len, &size);
-	printf("Z original = ");
+	fprintf(stderr, "Z original = ");
 	print_z(z, size);
-	printf("SIZE = %d\n", size);
-	z[0]='A';z[1]='B';z[2]='C';z[3]='D';z[4]='R';
+	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]);
-		printf("vino %c emiti: %d\n",datos[i], pos[i]);
+		fprintf(stderr, "vino %c emiti: %d\n",datos[i], pos[i]);
 		if (pos[i] != 0) 
 			pop_front(z,pos[i]);
 		print_z(z, size);
@@ -45,13 +59,13 @@ char *jacu_buscar_z(char* datos, int len, int *size)
 	char *z;
 	int i, j=0;
 	
-	z = (char*)malloc(1);
-	if (z==NULL) return NULL;
+	z = NULL; /*(char*)malloc(1);*/
+	/*if (z==NULL) return NULL;*/
 	for(i=0; i<len; i++){
-		if( no_pertenece(z, datos[i]) ){
-			realloc(z, j*sizeof(char));
-			z[j]=datos[i];
+		if( no_pertenece(z, datos[i], j) == -1 ){
 			j++;
+			z = realloc(z, j*sizeof(char));
+			z[j-1]=datos[i];
 			*size = j;
 		}
 	}
@@ -59,12 +73,13 @@ char *jacu_buscar_z(char* datos, int len, int *size)
 }
 	
 
-int no_pertenece(char *z, char c)
+int no_pertenece(char *z, char c, int len)
 {
 	int i;
 	
-	for(i=0; i<255; i++)
-		if ( z[i] == c )
+	/* XXX Z NO TIENE 255 POSICIONES XXX */
+	for(i=0; i<len; i++)
+		if (z[i] == c)
 			return 0;
 	return -1;
 }
@@ -83,6 +98,8 @@ void pop_front(char *z, int pos)
 int get_pos(char *z, int len, char c)
 {
 	int pos;
+	if (z==NULL) return -1;
+
 	for(pos=0; pos<len; pos++)
 		if ( z[pos] == c )
 			return pos;