X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/22942d33dcdd7cc185b9ad198fc1c35159f154ea..cb53166758c12a09e9911769ce89c94cee4cc0f0:/src/statichuff/statichuff.c

diff --git a/src/statichuff/statichuff.c b/src/statichuff/statichuff.c
index 2e2764a..000f0ba 100644
--- a/src/statichuff/statichuff.c
+++ b/src/statichuff/statichuff.c
@@ -70,15 +70,17 @@ int shuff_scanfreq_chunk(HUFF_STATE *chunkshuff, char* chunk, int chunksize)
 	int i = 0;
 	unsigned char symbol = 0;	
 		
-	/* Contamos las frecuencias del chunk*/	
-	for (i = 0; i < chunksize; ++i) {				
-		symbol = chunk[i];		
-		chunkshuff->freqtable[symbol] += 1;
-		chunkshuff->sumfreq += 1;
+	/* Contamos las frecuencias del chunk a menos que se use un canonico */	
+	if (!chunkshuff->canonic) {
+		for (i = 0; i < chunksize; ++i) {				
+			symbol = chunk[i];		
+			chunkshuff->freqtable[symbol] += 1;
+			chunkshuff->sumfreq += 1;
 				
-		/* Si llegue al tope de freq acumulada, halve em */
-		if (chunkshuff->sumfreq == 14930352) 
-			chunkshuff->sumfreq = shuff_rescalefreq(chunkshuff->freqtable);
+			/* Si llegue al tope de freq acumulada, halve em */
+			if (chunkshuff->sumfreq == 14930352) 
+				chunkshuff->sumfreq = shuff_rescalefreq(chunkshuff->freqtable);
+		}
 	}
 	
 	/* Dumpeamos el chunk en el temporal homero */
@@ -273,7 +275,8 @@ int shuff_encode_file(HUFF_STATE *shuff)
 	SHUFFCODE *codetable = (SHUFFCODE*)malloc(sizeof(SHUFFCODE)*256);
 	
 	/* Veo si debo armar una freqtable o si esta preloaded */
-	if (!shuff->preloadfreq) if (!shuff_scanfreq(shuff->sourcefile,shuff->freqtable)) return 0;
+	if ((!shuff->canonic) && (!shuff->bychunk)) 
+		if (!shuff_scanfreq(shuff->sourcefile,shuff->freqtable)) return 0;
 	
 	/* Genero el arbol de huffman */
 	shuff->codetree = shuff_buildtree(shuff->freqtable);
@@ -396,7 +399,7 @@ HUFF_STATE *shuff_init_decoder(char *inputfile, char *outputfile)
 	/* Levanto cuantos bytes debo decodificar y la freqtable */
 	if ((shuff->decoderfp = vfopen(shuff->sourcefile,"r",0)) == NULL) return NULL;	
 	vfread(&(shuff->bytesleft),sizeof(unsigned long int),1,shuff->decoderfp);
-	vfread(shuff->freqtable,sizeof(unsigned long int),256,shuff->decoderfp);		
+	vfread(shuff->freqtable,sizeof(t_freq),256,shuff->decoderfp);		
 	/* Armo el arbol de huffman que uso para decodificar */
 	shuff->codetree = shuff_buildtree(shuff->freqtable);
 	
@@ -418,7 +421,7 @@ HUFF_STATE *shuff_init_encoder_byfile(char *inputfile, char *outputfile, long vo
 	strcpy(fshuff->targetfile,outputfile);
 	fshuff->volsize = volsize;
 	fshuff->bychunk = 0;
-	fshuff->preloadfreq = 0;	
+	fshuff->canonic = 0;	
 	fshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);
 	for (i = 0; i < 256; ++i) fshuff->freqtable[i] = 0;	
 	fshuff->sumfreq = 0;		
@@ -442,7 +445,7 @@ HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
 	strcat(cshuff->sourcefile,"~");	
 	cshuff->volsize = volsize;
 	cshuff->bychunk = 1;
-	cshuff->preloadfreq = 1;		
+	cshuff->canonic = 0;
 	cshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);	
 	for (i = 0; i < 256; ++i) cshuff->freqtable[i] = 0;	
 	cshuff->sumfreq = 0;	
@@ -454,6 +457,45 @@ HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
 	return cshuff;
 }
 
+int shuff_loadmodel(HUFF_STATE *shuff, char *modelfile) {
+
+	FILE *fp;
+	
+	if ((shuff) && (shuff->freqtable) && (modelfile)) {
+		/* Cargo el modelo de disco */
+		if ((fp = fopen(modelfile,"r")) == NULL) return 0;
+		if (fread(shuff->freqtable,sizeof(t_freq),256,fp) != 256) return 0;
+		shuff->canonic = 1;
+		if (fp) fclose(fp);		
+		return 1;
+	}	
+	return 0;	
+}
+
+int shuff_savemodel(HUFF_STATE *shuff) {
+
+	FILE *fp;
+	char *auxfilename;
+	char *stopchar;
+	
+	if ((shuff) && (shuff->targetfile) && (shuff->freqtable)) {
+		/* Preparo el nombre del archivo con la tabla */
+		auxfilename = (char*)malloc(strlen(shuff->targetfile)+1);		
+		stopchar = strrchr(shuff->targetfile,'.');		
+		strncpy(auxfilename,shuff->targetfile,stopchar - shuff->targetfile);
+		auxfilename[stopchar - shuff->targetfile] = 0;
+		strcat(auxfilename,".ftb");
+		
+		/* Lo creamos y dumpeamos la tabla de frecuencias (modelo) */
+		if ((fp = fopen(auxfilename,"w")) == NULL) return 0;
+		fwrite(shuff->freqtable,sizeof(t_freq),256,fp);
+		if (fp) fclose(fp);
+				
+		return 1;
+	}	
+	return 0;
+}
+
 void shuff_deinit_encoder(HUFF_STATE *shuff)
 {
 	/* Libero mallocs y cierro archivos */