Test de Calgary sobre JACU vs GZIP vs BZIP2 done, me falta el pic en mi maquina que...

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

diff --git a/src/statichuff/main_bychunk.c b/src/statichuff/main_bychunk.c
index eafe694df01b5682177f52625c9b894406dc42e8..e0f1e2850601f4d4a9f6b436cee2f8046c872023 100644 (file)
--- a/src/statichuff/main_bychunk.c
+++ b/src/statichuff/main_bychunk.c
@@ -10,10 +10,13 @@ int main(int argc, char* argv[])
        int cflag = 0;
        int dflag = 0;
        int tflag = 0;
        int cflag = 0;
        int dflag = 0;
        int tflag = 0;

+       int sflag = 0;
+       int mflag = 0;

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

-       int lastchunk,i,j,ch;
+       int lastchunk,i,j,ch,decoded = 0;
+       char *staticmodel;

                        
                        

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

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


@@ -26,13 +29,20 @@ int main(int argc, char* argv[])
                                          volumesize = atoi(optarg);                                      
                                          break; 
                        
                                          volumesize = atoi(optarg);                                      
                                          break; 
                        

-                       default: fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
+                       case 'm': mflag = 1;
+                                         staticmodel = optarg;
+                                         break; 
+                       
+                       case 's': sflag = 1;                                      
+                                         break;
+                       
+                       default: fprintf(stderr, "Usage: %s [-cds] [-t volsizekb] sourcefile targetfile [-m modeldumpfile]\n", argv[0]); 

                                         return(2);
                }
        }
                
                                         return(2);
                }
        }
                

-       if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
-               fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
+       if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) || (mflag & sflag)) {
+               fprintf(stderr, "Usage: %s [-cds] [-t volsizekb] sourcefile targetfile [-m modeldumpfile]\n", argv[0]); 

                if ((tflag == 1) && (volumesize < 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n");
                return (2);             
        }
                if ((tflag == 1) && (volumesize < 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n");
                return (2);             
        }


@@ -40,6 +50,7 @@ int main(int argc, char* argv[])
        if (cflag == 1) {
                /* Inicio un compresor huffman estatico por chunks */
                if ((shuff = shuff_init_encoder_bychunk(argv[optind+1],volumesize*1024)) == NULL) return 0;
        if (cflag == 1) {
                /* Inicio un compresor huffman estatico por chunks */
                if ((shuff = shuff_init_encoder_bychunk(argv[optind+1],volumesize*1024)) == NULL) return 0;

+               if (mflag == 1) shuff_loadmodel(shuff,staticmodel);

                
                /* Comprimo por chunks */               
                if ((fp = fopen(argv[optind],"rb")) == NULL) return 1;          
                
                /* Comprimo por chunks */               
                if ((fp = fopen(argv[optind],"rb")) == NULL) return 1;          


@@ -56,23 +67,38 @@ int main(int argc, char* argv[])
                        shuff_scanfreq_chunk(shuff,chunk,i);                    
                }
                /* Le indico al huffman que efectivamente comprima los chunks */
                        shuff_scanfreq_chunk(shuff,chunk,i);                    
                }
                /* Le indico al huffman que efectivamente comprima los chunks */

-               shuff_encode_file(shuff);
+               shuff_encode_file(shuff);               
+               if (sflag == 1) shuff_savemodel(shuff);         

                
                

-               /* De init shuffman by chunks */
+               /* De init encoder */

                shuff_deinit_encoder(shuff);
                
                /* Free mem allocated by main */
                shuff_deinit_encoder(shuff);
                
                /* Free mem allocated by main */

-               free(shuff);
-               free(chunk);
+               free(shuff);            

                
                /* Close files opened by main */
                fclose(fp);
        }
        
        if (dflag == 1) { 
                
                /* Close files opened by main */
                fclose(fp);
        }
        
        if (dflag == 1) { 

-               /* Descomprimo */
-               /*return shuff_decode_file(argv[optind],argv[optind+1]);*/              
-       }
+               /* Init decoder */
+               shuff = shuff_init_decoder(argv[optind],NULL);
+               fp = fopen(argv[optind+1],"w");

                
                

+               /* Gimme chunks till last one */
+               while (shuff_decode_chunk(shuff,chunk,4,&decoded))
+                       fwrite(chunk,decoded,1,fp);
+               
+               /* Last chunk written alone */
+               fwrite(chunk,decoded,1,fp);
+               fclose(fp);
+               
+               /* Deinit decoder */
+               shuff_deinit_decoder(shuff);
+               free(shuff);            
+       }
+       
+       /* Free mem */
+       free(chunk);            

        return 0;
 }
        return 0;
 }