BUGFIX al MTF. Se estaba guardando el Z final y no el inicial y eso hacia cagadas.

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

diff --git a/src/jacu.c b/src/jacu.c
index 45b314cd12595c370bbce74f558143f6855d4b1c..dd1848594c3646e6695129682e62212cad2d4ef4 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -1,86 +1,272 @@
 
 

-#include "statichuff/statichuff.h"

 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"

+#include "zerogrouping/zerogrouping.h"
+#include "statichuff/statichuff.h"
+#include "vfile/vfile.h"
+#include "vfile/common.h"

 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 

+long get_file_size(const char* filename);
+

 int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;
 int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;

+       int zflag = 0;

        int tflag = 0;
        int tflag = 0;

+       int qflag = 0;

        long int volumesize = 0;
        long int volumesize = 0;

+       size_t pagesize = 32768; /* 32KB */

        int ch;
        t_BlockSort *bs;
                        
        int ch;
        t_BlockSort *bs;
                        

-       while ((ch = getopt(argc, argv, "cdt:")) != -1) { 
+       while ((ch = getopt(argc, argv, "cdzt:q:")) != -1) { 

                 
                switch (ch) { 
                        case 'c': cflag = 1; 
                                          break;
                 
                switch (ch) { 
                        case 'c': cflag = 1; 
                                          break;

-                       
+

                        case 'd': dflag = 1; 
                                          break; 
                        case 'd': dflag = 1; 
                                          break; 

-                       
-                       case 't': tflag = 1; 
-                                         volumesize = atoi(optarg);                                      
+
+                       case 'z': zflag = 1; 

                                          break; 
                                          break; 

-                       
-                       default: fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
+
+                       case 't': tflag = 1; 
+                               volumesize = atol(optarg);
+                               break; 
+
+                       case 'q': qflag = 1; 
+                               switch (atoi(optarg))
+                               {
+                                       case 0: pagesize = 1024; /* 1K */
+                                               break;
+                                       case 1: pagesize = 2048; /* 2K */
+                                               break;
+                                       case 2: pagesize = 4096; /* 4K */
+                                               break;
+                                       case 3: pagesize = 8192; /* 8K */
+                                               break;
+                                       case 4: pagesize = 16384; /* 16K */
+                                               break;
+                                       case 5: pagesize = 32768; /* 32K */
+                                               break;
+                                       case 6: pagesize = 65536; /* 64K */
+                                               break;
+                                       case 7: pagesize = 131072; /* 128K */
+                                               break;
+                                       case 8: pagesize = 262144; /* 256K */
+                                               break;
+                                       case 9: pagesize = 524288; /* 512K */
+                                               break;
+                                       default: pagesize = 0; /* error */
+                               }
+                               break; 
+
+                       default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]); 

                                         return(2);
                }
        }
                
        if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
                fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
                                         return(2);
                }
        }
                
        if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
                fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 

-               if ((tflag == 1) && (volumesize <= 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n");
-               return (2);             
+               return (3);
+       }
+       if ((tflag) && (volumesize <= 0l)) {
+               fprintf(stderr,"Error: The volume size must be a non-zero value\n");
+               return (4);
+       }
+       if ((qflag) && (pagesize <= 1u)) {
+               fprintf(stderr,"Error: El nivel de compresión debe ser entre 0 (menor) y 9 (mayor).\n");
+               return (5);

        }
                
        if (cflag == 1) {
                /* Comprimo */
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
        }
                
        if (cflag == 1) {
                /* Comprimo */
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;

-               unsigned long int len, i, j, total, k;
-               int *mtf;
+               Uint32 i, j, total, k;
+               char *mtf;

                char *salida, *data, c;
                char *salida, *data, c;

-               len = 4096;
-               data = malloc(sizeof(char)*len);
-               salida = malloc(sizeof(char)*(len));
-               bs = bs_create(len);
+               char *z;
+               int z_len;
+
+               data = malloc(sizeof(char)*pagesize);
+               /* Reservo lugar tambien para guardar el k y el tamaño  */
+               salida = malloc(sizeof(char)*pagesize+sizeof(Uint32)*2);
+               bs = bs_create(pagesize);
+

                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");
                fp = fopen(argv[optind], "rb");
                fp_out = fopen("tmp.comp", "wb");

+

                c = fgetc(fp);
                total = 0;
                while (!feof(fp)) {
                        i = 0;
                c = fgetc(fp);
                total = 0;
                while (!feof(fp)) {
                        i = 0;

-                       while ((!feof(fp)) && (i < len)) {
+                       while ((!feof(fp)) && (i < pagesize)) {

                                data[i++] = c;
                                c = fgetc(fp);
                                total++;
                        }
                                data[i++] = c;
                                c = fgetc(fp);
                                total++;
                        }

+

                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);
                        /* Hago el BS */
                        bs_solve(data, salida, bs, &k, i);

-                       /* Le aplico el MTF */
-                       mtf = jacu_mtf(salida, i);
-                       for(j=0; j<i; j++)
-                               fputc(mtf[j], fp_out);
+
+                       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("]\n");
+
+                       }
+                       /* Si me lo piden, aplico ZG. */
+                       if (zflag) {
+                               size_t len;
+                               char buff[2];
+                               ZG zg;
+                               zg_init(&zg);
+                               /* TODO HACER LO MISMO QUE EN EL ELSE XXX */
+                               for (j = 0; j < i; ++j)
+                                       if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
+                       } else {
+                               /* Guardo el PageSize */
+                               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 */
+                               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);

                }
                }

+
+               /* Limpiando */

                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);
                fclose(fp);
                fclose(fp_out);
                bs_destroy(bs);

-               i = shuff_encode_file("tmp.comp",argv[optind+1]);
+
+               /* Comprimo con huffman */
+               i = shuff_encode_file("tmp.comp", argv[optind+1], volumesize);
+

                /* borro el temporal */
                /* borro el temporal */

-               unlink("tmp.comp");
+               remove("tmp.comp");
+
+               /* Muestro bpb */
+               printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));

                return i;
        }
        
        if (dflag == 1) { 
                /* Descomprimo */
                return i;
        }
        
        if (dflag == 1) { 
                /* Descomprimo */

-               return shuff_decode_file(argv[optind],argv[optind+1]);
+               FILE *fp_out;
+               FILE *fp_in;
+               Uint32 block_size, k;
+               char *block, *mtf, *orig;
+               char *z;
+               int z_len;
+
+               shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
+               fp_in = fopen("tmp.comp", "rb");
+               fp_out = fopen(argv[optind+1], "wb");
+
+               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) {
+                               block = malloc(block_size*sizeof(char)+sizeof(Uint32));
+                               orig = malloc(block_size*sizeof(char));
+                               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*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, mtf, sizeof(Uint32));
+
+                               printf("Restored : k=%ld\n", k);
+                               PERR("BS_Restore");
+                               bs_restore(orig, block+sizeof(Uint32), k, block_size);
+
+                               PERR("Saving Data");
+                               fwrite(orig, block_size, sizeof(char), fp_out);
+                               free(block);
+                               free(orig);
+                               free(mtf);
+                       }
+               }
+               fclose(fp_in);
+               fclose(fp_out);

        }
        }

-               
+

        return 0;
 }
        return 0;
 }

+
+long get_file_size(const char* filename)
+{
+       FILE* file;
+       long  file_size;
+
+       if (!(file = fopen(filename, "ab"))) return -1;
+       file_size = ftell(file);
+       fclose(file);
+       return file_size;
+}
+