X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/af65279c5092544998a7a07b364d021bc8d01908..ade05bc64de4853d99cdc1ea2657845728614f03:/src/jacu.c?ds=inline

diff --git a/src/jacu.c b/src/jacu.c
index d0deb90..ca93ae6 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -102,33 +102,42 @@ int main(int argc, char* argv[])
 		fp = fopen(argv[optind], "rb");
 		fp_out = fopen("tmp.comp", "wb");
 
-		c = fgetc(fp);
+		/*c = fgetc(fp);*/
 		total = 0;
 		while (!feof(fp)) {
 			i = 0;
 			while ((!feof(fp)) && (i < pagesize)) {
-				data[i++] = c;
-				c = fgetc(fp);
+				data[i++] = fgetc(fp);
 				total++;
 			}
 
+			/* Saco un EOF que lee de mas */
+			if (i<pagesize) i--;
+
 			/* Hago el BS */
 			bs_solve(data, salida, bs, &k, i);
 
-			printf("BS k=%ld\n", k);
-			printf("PageSize = %ld\n", i);
+			/*printf("BS k=%ld\n", *(Uint32 *)(salida+sizeof(Uint32)));
+			printf("PageSize = %ld\n", *(Uint32 *)salida);
 
+			printf("Antes de MTF = %ld [", i);
+			{
+				int ii;
+				for(ii=0; ii<(i+sizeof(Uint32)); ii++)
+					printf("(%c)", salida[ii+sizeof(Uint32)]);
+				printf("]\n");
+			}*/
 			/* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
 			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
-
+/*
 			printf("MTF Z (len=%d) = [", z_len);
 			{
 				int ii;
 				for(ii=0; ii<z_len; ii++)
-					printf("%c", z[ii]);
+					printf("(%c)", z[ii]);
 				printf("]\n");
 
-			}
+			}*/
 			/* Si me lo piden, aplico ZG. */
 			if (zflag) {
 				size_t len;
@@ -140,20 +149,27 @@ int main(int argc, char* argv[])
 					if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
 			} else {
 				/* Guardo el PageSize */
-				fwrite(&i, sizeof(Uint32), 1, fp_out);
+				fwrite(salida, sizeof(Uint32), 1, fp_out);
 
 				/* Guardo el Z len y el Z */
 				fwrite(&z_len, sizeof(int), 1, fp_out);
 				fwrite(z, z_len, sizeof(char), fp_out);
 
 				/* Guardo la salida del MTF */
-				for(j=sizeof(Uint32); j<i; j++)
+				/*printf("Despues de MTF : [");*/
+				for(j=0; j<(i+sizeof(Uint32)); j++) {
 					fputc(mtf[j], fp_out);
+			/*		putchar('(');
+					fputc(mtf[j], stdout);
+					putchar(')');*/
+				}
+				/*printf("]\n");*/
 			}
 			free(mtf);
 			free(z);
 		}
 
+		printf("Total Bytes read = %ld\n", total);
 		/* Limpiando */
 		fclose(fp);
 		fclose(fp_out);
@@ -185,39 +201,50 @@ int main(int argc, char* argv[])
 
 		while (!feof(fp_in)) {
 			block_size = 0;
-			PERR("Leo bloque");
 			fread(&block_size, sizeof(Uint32), 1, fp_in);
-			printf("PageSize = %ld\n", block_size);
-			fread(&z_len, sizeof(int), 1, fp_in);
-			z = malloc(sizeof(char)*z_len);
-			fread(z, z_len, sizeof(char), fp_in);
-
-			printf("MTF Z (len=%d) = [", z_len);
-			{
-				int ii;
-				for(ii=0; ii<z_len; ii++)
-					printf("%c", z[ii]);
-				printf("]\n");
-
-			}
 			if (block_size > 0) {
+				printf("PageSize = %ld\n", block_size);
+				fread(&z_len, sizeof(int), 1, fp_in);
+				z = malloc(sizeof(char)*z_len);
+				fread(z, z_len, sizeof(char), fp_in);
+
+				/*printf("MTF Z (len=%d) = [", z_len);
+				{
+					int ii;
+					for(ii=0; ii<z_len; ii++)
+						printf("(%c)", z[ii]);
+					printf("]\n");
+	
+				}*/
+				
 				block = malloc(block_size*sizeof(char)+sizeof(Uint32));
 				orig = malloc(block_size*sizeof(char));
-				fread(block, block_size, sizeof(char), fp_in);
+				fread(block, block_size+sizeof(Uint32), sizeof(char), fp_in);
 
+				/*printf("Antes MTF_inv = [");
+				{
+					int ii;
+					for(ii=0; ii<block_size+sizeof(Uint32); ii++)
+						printf("(%c)", block[ii]);
+					printf("]\n");
+				}*/
 				/* Hago el MTF inverso */
-				PERR("Haciendo MTF Inv");
-				mtf = jacu_mtf_inv(z, block, block_size);
+				mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
+
+				/*printf("Luego de MTF Inv= [");
+				{
+					int ii;
+					for(ii=0; ii<block_size+sizeof(Uint32); ii++)
+						printf("(%c)", mtf[ii]);
+					printf("]\n");
+				}*/
 
 				/* Luego de hacer el MTF inverso ya puedo recuperar el k */
-				PERR("Recuperando K");
-				memcpy(&k, block, sizeof(Uint32));
+				memcpy(&k, mtf, sizeof(Uint32));
 
-				printf("Restored : k=%ld\n", k);
-				PERR("BS_Restore");
-				bs_restore(orig, block+sizeof(Uint32), k, block_size);
+				/*printf("Restored : k=%ld\n", k);*/
+				bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 
-				PERR("Saving Data");
 				fwrite(orig, block_size, sizeof(char), fp_out);
 				free(block);
 				free(orig);