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 / statichuff.c

diff --git a/src/statichuff/statichuff.c b/src/statichuff/statichuff.c
index 000f0bab7f1c0820f1555f75e420c2d172e19d32..f339ef0558b67c93b54905a7514f223516a343a6 100644 (file)
--- a/src/statichuff/statichuff.c
+++ b/src/statichuff/statichuff.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+/** Coloca un bit en un buffer statico */

 void putbit(char bit, char restart, char flush, VFILE *fp)
 {
        static unsigned long int bits_buffer = 0;
 void putbit(char bit, char restart, char flush, VFILE *fp)
 {
        static unsigned long int bits_buffer = 0;


@@ -35,6 +36,7 @@ void putbit(char bit, char restart, char flush, VFILE *fp)
        return;
 }
 
        return;
 }
 

+/** Realiza la copia de los datos de un nodo de huffman a otro */

 void shuff_cpynode(SHUFFNODE *node1, SHUFFNODE *node2)
 {
        node1->symbol = node2->symbol;
 void shuff_cpynode(SHUFFNODE *node1, SHUFFNODE *node2)
 {
        node1->symbol = node2->symbol;


@@ -43,6 +45,7 @@ void shuff_cpynode(SHUFFNODE *node1, SHUFFNODE *node2)
        node1->rchild = node2->rchild;  
 }
 
        node1->rchild = node2->rchild;  
 }
 

+/** Realiza una comparacion de dos nodos de huffman */

 int shuff_compnode(const void *node1, const void *node2)
 {      
        if (((SHUFFNODE*)node1)->freq < ((SHUFFNODE*)node2)->freq) return 1;
 int shuff_compnode(const void *node1, const void *node2)
 {      
        if (((SHUFFNODE*)node1)->freq < ((SHUFFNODE*)node2)->freq) return 1;


@@ -50,6 +53,23 @@ int shuff_compnode(const void *node1, const void *node2)
        return 0;
 }
 
        return 0;
 }
 

+/** Destruye un arbol de huffman recursivamente */
+void shuff_destroy_tree(SHUFFNODE *node) {
+       /* Si llegue a una hoja, destruyo y vuelvo */
+       if (node->symbol < 256) {
+               free(node);
+               return;
+       }
+       else {
+               /* Desciendo por izq, luego por derecha y luego libero */
+               shuff_destroy_tree(node->lchild);
+               shuff_destroy_tree(node->rchild);
+               free(node);
+               return;
+       }
+}
+
+/** Reescala las frecuencias de huffman a la mitad */

 int shuff_rescalefreq(t_freq *freqtable)
 { 
        int i;
 int shuff_rescalefreq(t_freq *freqtable)
 { 
        int i;


@@ -64,13 +84,14 @@ int shuff_rescalefreq(t_freq *freqtable)
        return totalfreq;
 }
 
        return totalfreq;
 }
 

+/** Escanea las frecuencias de un chunk de datos */

 int shuff_scanfreq_chunk(HUFF_STATE *chunkshuff, char* chunk, int chunksize)
 {      
        /* Locals */                    
        int i = 0;
        unsigned char symbol = 0;       
                
 int shuff_scanfreq_chunk(HUFF_STATE *chunkshuff, char* chunk, int chunksize)
 {      
        /* Locals */                    
        int i = 0;
        unsigned char symbol = 0;       
                

-       /* Contamos las frecuencias del chunk a menos que se use un canonico */ 
+       /* Contamos las frecuencias del chunk a menos que se use un canonico */                 

        if (!chunkshuff->canonic) {
                for (i = 0; i < chunksize; ++i) {                               
                        symbol = chunk[i];              
        if (!chunkshuff->canonic) {
                for (i = 0; i < chunksize; ++i) {                               
                        symbol = chunk[i];              


@@ -89,6 +110,7 @@ int shuff_scanfreq_chunk(HUFF_STATE *chunkshuff, char* chunk, int chunksize)
        return 1;
 }
 
        return 1;
 }
 

+/** Escanea las frecuencias de un archivo y genera el modelo */

 int shuff_scanfreq(char *inputfile, t_freq *freqtable)
 {
        /* Locals */    
 int shuff_scanfreq(char *inputfile, t_freq *freqtable)
 {
        /* Locals */    


@@ -118,6 +140,7 @@ int shuff_scanfreq(char *inputfile, t_freq *freqtable)
        return 1;
 }
 
        return 1;
 }
 

+/** Genera un input list que sera utilizada para generar el arbol */

 SHUFFNODE *shuff_buildlist(t_freq *freqtable, int *nonzerofreqs)
 {
        int i,j = 0,nonzero = 0;        
 SHUFFNODE *shuff_buildlist(t_freq *freqtable, int *nonzerofreqs)
 {
        int i,j = 0,nonzero = 0;        


@@ -141,6 +164,7 @@ SHUFFNODE *shuff_buildlist(t_freq *freqtable, int *nonzerofreqs)
        return inputlist;
 }
 
        return inputlist;
 }
 

+/** Genera el arbol de huffman en base a la tabla de frecuencias */

 SHUFFNODE *shuff_buildtree(t_freq *ftable)
 {
        SHUFFNODE *lastsymbol;
 SHUFFNODE *shuff_buildtree(t_freq *ftable)
 {
        SHUFFNODE *lastsymbol;


@@ -180,6 +204,7 @@ SHUFFNODE *shuff_buildtree(t_freq *ftable)
        return root;
 }
 
        return root;
 }
 

+/** Imprime los codigos prefijos generados para los symbolos */

 void shuff_printcodes(SHUFFCODE *codetable,t_freq *freqtable)
 {
        int i,j;
 void shuff_printcodes(SHUFFCODE *codetable,t_freq *freqtable)
 {
        int i,j;


@@ -189,7 +214,7 @@ void shuff_printcodes(SHUFFCODE *codetable,t_freq *freqtable)
        for (i = 0; i < 256; ++i) {
                if (codetable[i].codelength > 0) {
                        auxcode = codetable[i].code;                    
        for (i = 0; i < 256; ++i) {
                if (codetable[i].codelength > 0) {
                        auxcode = codetable[i].code;                    

-                       printf("Symbol:%i  Freq: %li  Code:",i,freqtable[i]);
+                       printf("Symbol:%i  Freq: %lu  Code:",i,freqtable[i]);

                        for (j = codetable[i].codelength-1; j >= 0; --j) {
                                auxcode = codetable[i].code;                    
                                auxcode = auxcode >> j;
                        for (j = codetable[i].codelength-1; j >= 0; --j) {
                                auxcode = codetable[i].code;                    
                                auxcode = auxcode >> j;


@@ -201,6 +226,7 @@ void shuff_printcodes(SHUFFCODE *codetable,t_freq *freqtable)
        }
 }
 
        }
 }
 

+/** Inicializa la tabla de codigos prefijos */

 void shuff_zerocodes(SHUFFCODE *table)
 {
        int i;
 void shuff_zerocodes(SHUFFCODE *table)
 {
        int i;


@@ -212,6 +238,7 @@ void shuff_zerocodes(SHUFFCODE *table)
        }
 }
 
        }
 }
 

+/** Genera la tabla de codigos prefijos en base al árbol de huffman */

 void shuff_buildcodes(SHUFFCODE *table, SHUFFNODE *node, int level, int code)
 {
        if (node->symbol < 256) {
 void shuff_buildcodes(SHUFFCODE *table, SHUFFNODE *node, int level, int code)
 {
        if (node->symbol < 256) {


@@ -227,6 +254,7 @@ void shuff_buildcodes(SHUFFCODE *table, SHUFFNODE *node, int level, int code)
        }
 }
 
        }
 }
 

+/** Realiza la compresion / encoding efectivo de un archivo */

 int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
 {
        FILE *fpsource;
 int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
 {
        FILE *fpsource;


@@ -237,7 +265,10 @@ int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
        SHUFFCODE symbolcode;
                
        /* Abrimos el source y el destino */
        SHUFFCODE symbolcode;
                
        /* Abrimos el source y el destino */

-       if (shuff->coderfp != NULL) fclose(shuff->coderfp); /* close bychunk temp file */
+       if (shuff->coderfp != NULL) {
+               fclose(shuff->coderfp); /* close bychunk temp file */
+               shuff->coderfp = NULL;
+       }

        if ((fpsource = fopen(shuff->sourcefile,"r")) == NULL) return 0;
        if ((fpdest = vfopen(shuff->targetfile,"w",shuff->volsize)) == NULL) return 0;
                
        if ((fpsource = fopen(shuff->sourcefile,"r")) == NULL) return 0;
        if ((fpdest = vfopen(shuff->targetfile,"w",shuff->volsize)) == NULL) return 0;
                


@@ -269,6 +300,7 @@ int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
        return 1;       
 }
 
        return 1;       
 }
 

+/** Prepara las estructuras de datos necesarias para una compresion */

 int shuff_encode_file(HUFF_STATE *shuff)
 {
        /* Locals */            
 int shuff_encode_file(HUFF_STATE *shuff)
 {
        /* Locals */            


@@ -295,6 +327,7 @@ int shuff_encode_file(HUFF_STATE *shuff)
        return 1;
 }
 
        return 1;
 }
 

+/** Decodifica una serie de bits en un symbolo y lo devuelve */

 SHUFFNODE *shuff_decode_symbols(SHUFFNODE *entrynode, unsigned long int buffer, 
                                                         int *bitsleft, unsigned short int *symbol)
 {
 SHUFFNODE *shuff_decode_symbols(SHUFFNODE *entrynode, unsigned long int buffer, 
                                                         int *bitsleft, unsigned short int *symbol)
 {


@@ -312,7 +345,8 @@ SHUFFNODE *shuff_decode_symbols(SHUFFNODE *entrynode, unsigned long int buffer,
        else return shuff_decode_symbols(entrynode->rchild,buffer,bitsleft,symbol);
 }
 
        else return shuff_decode_symbols(entrynode->rchild,buffer,bitsleft,symbol);
 }
 

-int shuff_decode_chunk(HUFF_STATE *shuff, char *chunk, int chunksize, int *decodedbytes)
+/** Decodifica chunksize symbolos y los devuelve en un chunk de datos */
+int shuff_decode_chunk(HUFF_STATE *shuff, char *chunk, int chunksize, unsigned long int *decodedbytes)

 {
        SHUFFNODE *currnode = shuff->codetree;  
        unsigned short int decoded_symbol;      
 {
        SHUFFNODE *currnode = shuff->codetree;  
        unsigned short int decoded_symbol;      


@@ -342,6 +376,7 @@ int shuff_decode_chunk(HUFF_STATE *shuff, char *chunk, int chunksize, int *decod
        else return 1;
 }
 
        else return 1;
 }
 

+/** Realiza la descompresión de un archivo comprimido */

 int shuff_decode_file(HUFF_STATE *shuff)
 {      
        SHUFFNODE *currnode;    
 int shuff_decode_file(HUFF_STATE *shuff)
 {      
        SHUFFNODE *currnode;    


@@ -378,6 +413,7 @@ int shuff_decode_file(HUFF_STATE *shuff)
        return 1;
 }
 
        return 1;
 }
 

+/** Inicializa un descompresor de huffman */

 HUFF_STATE *shuff_init_decoder(char *inputfile, char *outputfile)
 {
        /* Locals */
 HUFF_STATE *shuff_init_decoder(char *inputfile, char *outputfile)
 {
        /* Locals */


@@ -406,6 +442,7 @@ HUFF_STATE *shuff_init_decoder(char *inputfile, char *outputfile)
        return shuff;
 }
 
        return shuff;
 }
 

+/** Inicializa compresor de huffman por archivo */

 HUFF_STATE *shuff_init_encoder_byfile(char *inputfile, char *outputfile, long volsize)
 {
        /* Locals */
 HUFF_STATE *shuff_init_encoder_byfile(char *inputfile, char *outputfile, long volsize)
 {
        /* Locals */


@@ -430,6 +467,7 @@ HUFF_STATE *shuff_init_encoder_byfile(char *inputfile, char *outputfile, long vo
        return fshuff;
 }
 
        return fshuff;
 }
 

+/** Inicializa compresor de huffman de a chunks */

 HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
 {
        /* Locals */
 HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
 {
        /* Locals */


@@ -457,6 +495,7 @@ HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
        return cshuff;
 }
 
        return cshuff;
 }
 

+/** Carga un modelo estadistico para huffman */

 int shuff_loadmodel(HUFF_STATE *shuff, char *modelfile) {
 
        FILE *fp;
 int shuff_loadmodel(HUFF_STATE *shuff, char *modelfile) {
 
        FILE *fp;


@@ -472,6 +511,7 @@ int shuff_loadmodel(HUFF_STATE *shuff, char *modelfile) {
        return 0;       
 }
 
        return 0;       
 }
 

+/** Graba un modelo estadístico de huffman */

 int shuff_savemodel(HUFF_STATE *shuff) {
 
        FILE *fp;
 int shuff_savemodel(HUFF_STATE *shuff) {
 
        FILE *fp;


@@ -496,6 +536,7 @@ int shuff_savemodel(HUFF_STATE *shuff) {
        return 0;
 }
 
        return 0;
 }
 

+/** Desinicializa un compresor de huffman */

 void shuff_deinit_encoder(HUFF_STATE *shuff)
 {
        /* Libero mallocs y cierro archivos */
 void shuff_deinit_encoder(HUFF_STATE *shuff)
 {
        /* Libero mallocs y cierro archivos */


@@ -506,8 +547,10 @@ void shuff_deinit_encoder(HUFF_STATE *shuff)
        if (shuff->targetfile) free(shuff->targetfile);                         
        
        /* Destruyo recursivamente el arbol de codigos */
        if (shuff->targetfile) free(shuff->targetfile);                         
        
        /* Destruyo recursivamente el arbol de codigos */

+       if (shuff->codetree) shuff_destroy_tree(shuff->codetree);

 }
 
 }
 

+/** Desinicializa un descompresor de huffman */

 void shuff_deinit_decoder(HUFF_STATE *shuff)
 {
        /* Libero mallocs y cierro archivos */  
 void shuff_deinit_decoder(HUFF_STATE *shuff)
 {
        /* Libero mallocs y cierro archivos */  


@@ -517,4 +560,5 @@ void shuff_deinit_decoder(HUFF_STATE *shuff)
        if (shuff->decoderfp != NULL) vfclose(shuff->decoderfp);
                
        /* Destruyo recursivamente el arbol de codigos */
        if (shuff->decoderfp != NULL) vfclose(shuff->decoderfp);
                
        /* Destruyo recursivamente el arbol de codigos */

+       if (shuff->codetree) shuff_destroy_tree(shuff->codetree);

 }
 }