X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=swcsa%2FintIndex%2FpsiGonzalo.c;h=f5e4715edb8b74d294221ea0106150506edd3401;hb=6ba83dea468496a31eb57bdbac9b257a5a191a26;hp=42449a4b5cf03930bf61f42b0023b66b6c9a8a8f;hpb=102e33b134075765e6d4e0c38bc1307568ce5602;p=SXSI%2FTextCollection.git

diff --git a/swcsa/intIndex/psiGonzalo.c b/swcsa/intIndex/psiGonzalo.c
index 42449a4..f5e4715 100644
--- a/swcsa/intIndex/psiGonzalo.c
+++ b/swcsa/intIndex/psiGonzalo.c
@@ -8,8 +8,8 @@ void destroyGonzaloCompressedPsi(GonzaloCompressedPsi *compressedPsi) {
 	
 	//free(compressedPsi->Hlen.s.spos);
 	//free(compressedPsi->Hacc.s.spos);		
-	freeHuff(compressedPsi->Hlen);
-	freeHuff(compressedPsi->Hacc);	
+	freeHuff2(compressedPsi->Hlen);
+	freeHuff2(compressedPsi->Hacc);	
 	free(compressedPsi->cPsi);
 	free(compressedPsi->bposS);
 }
@@ -71,8 +71,8 @@ GonzaloCompressedPsi gonzaloCompressPsi(uint *Psi, uint psiSize, uint T, uint HU
 	Hacc = createHuff (acc,HUFF-1, UNSORTED);
 	Hlen = createHuff (lacc,samplen-2, UNSORTED);
 	totexc = acc[0];
-	pslen = bits(psiSize+1);
-	_bplen = bits(Hacc.total+Hlen.total+(1+links/samplen+totexc)*pslen);
+	pslen = _bits(psiSize+1);
+	_bplen = _bits(Hacc.total+Hlen.total+(1+links/samplen+totexc)*pslen);
 	_bposS = (uint *)malloc ((((1+links/samplen)*_bplen+W-1)/W)*sizeof(uint));
 	_cPsi  = (uint *)malloc (((Hacc.total+Hlen.total+(1+links/samplen+totexc)*pslen+W-1)/W)*sizeof(uint));	
 	
@@ -114,7 +114,7 @@ GonzaloCompressedPsi gonzaloCompressPsi(uint *Psi, uint psiSize, uint T, uint HU
 	// Calculamos o espacio total
 	totalSize = (((1+links/samplen)*_bplen+W-1)/W)*sizeof(uint) +
 		((Hacc.total+Hlen.total+(1+links/samplen+totexc)*pslen+W-1)/W)*sizeof(uint) +
-		5*sizeof(int) + sizeHuff(Hacc) + sizeHuff(Hlen);
+		5*sizeof(int) + sizeHuff2(Hacc) + sizeHuff2(Hlen);
 	printf("\n\tCompressed Psi size = %d bytes\n", totalSize);
 	
 	// Necesario antes de decodificar