Fixed object filename clash

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/TextCollection@926 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/swcsa/Makefile b/swcsa/Makefile
index 5719be6..1d07e36 100644 (file)
--- a/swcsa/Makefile
+++ b/swcsa/Makefile
@@ -25,8 +25,14 @@ all: clean wcsa cleanO
 
 wcsa: intIndexPackage buildFacade.o parameters.o hash.o valstring.o MemoryManager.o basics.o \
                bitmap.o huffDec.o huff.o fileInfo.o
-       ar rc $(LIBINTINDEX) parameters.o buildFacade.o hash.o valstring.o MemoryManager.o basics.o \
-               bitmap.o huffDec.o huff.o fileInfo.o 
+       mv hash.o hashswcsa.o
+       mv basics.o basicsswcsa.o
+       mv huff.o huffswcsa.o
+       mv huffDec.o huffDecswcsa.o
+       mv bitmap.o bitmapswcsa.o
+       mv parameters.o parametswcsa.o
+       ar rc $(LIBINTINDEX) parametswcsa.o buildFacade.o hashswcsa.o valstring.o MemoryManager.o basicsswcsa.o \
+               bitmapswcsa.o huffDecswcsa.o huffswcsa.o fileInfo.o 
        mv $(LIBINTINDEX) $(LIBINDEX)
 
 ################# SELF INDEX ON INTEGERS ##############################

diff --git a/swcsa/intIndex/psiGonzalo.c b/swcsa/intIndex/psiGonzalo.c
index 42449a4..ee8f086 100644 (file)
--- 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);
 }
@@ -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

diff --git a/swcsa/intIndex/psiHuffmanRLE.c b/swcsa/intIndex/psiHuffmanRLE.c
index 5e36869..ac619a1 100644 (file)
--- a/swcsa/intIndex/psiHuffmanRLE.c
+++ b/swcsa/intIndex/psiHuffmanRLE.c
@@ -3,7 +3,7 @@
 // IMPLEMENTACION DAS FUNCIONS
 
 void destroyHuffmanCompressedPsi(HuffmanCompressedPsi *compressedPsi) {
-       freeHuff(compressedPsi->diffsHT);
+       freeHuff2(compressedPsi->diffsHT);
        free(compressedPsi->samples);
        free(compressedPsi->samplePointers);
        free (compressedPsi->stream);
@@ -166,7 +166,7 @@ HuffmanCompressedPsi huffmanCompressPsi(unsigned int *Psi, unsigned int psiSize,
        totalSize = sizeof(HuffmanCompressedPsi) + 
                sizeof(int)*((numberOfSamples*sampleSize+31)/32) + 
                sizeof(int)*((numberOfSamples*pointerSize+31)/32) +
-               sizeof(int)*((streamSize+31)/32) + sizeHuff(diffsHT);
+               sizeof(int)*((streamSize+31)/32) + sizeHuff2(diffsHT);
 
        printf("\n\t Compressed Psi size = %d bytes, with %d different symbols.", totalSize, nS);
        

diff --git a/swcsa/utils/huff.c b/swcsa/utils/huff.c
index 9d95da9..ebea077 100755 (executable)
--- a/swcsa/utils/huff.c
+++ b/swcsa/utils/huff.c
@@ -236,7 +236,7 @@ int decodeHuff (THuff *H, uint *symb, uint *stream, uint ptr)
      return ptr+d;
    } 
 */
-void saveHuff (THuff H, FILE *f)
+void saveHuff2 (THuff H, FILE *f)
 
    { uint *symb = (uint *)malloc((H.lim+1)*sizeof(uint));
      int i;
@@ -250,7 +250,7 @@ void saveHuff (THuff H, FILE *f)
      free (symb);
    }
 
-uint sizeHuff (THuff H)
+uint sizeHuff2 (THuff H)
 
    { return (4 +(H.lim+1)+2*(H.depth+1))*sizeof(uint);
    }
@@ -260,13 +260,13 @@ uint sizeHuffDisk (THuff H)
    { return ( sizeof(THuff) + ((H.lim+1)+(H.depth+1))*sizeof(uint) );
    }
 
-void freeHuff (THuff H)
+void freeHuff2 (THuff H)
 
   { free (H.s.spos);  free (H.num); free (H.fst);
   }
 
 
-THuff loadHuff (FILE *f, int enc)   //enc (0/1)-> do you only  want to perform encoding ??
+THuff loadHuff2 (FILE *f, int enc)   //enc (0/1)-> do you only  want to perform encoding ??
 
    { THuff H;
      uint *symb;

diff --git a/swcsa/utils/huff.h b/swcsa/utils/huff.h
index 060570c..ea45d47 100755 (executable)
--- a/swcsa/utils/huff.h
+++ b/swcsa/utils/huff.h
@@ -42,23 +42,23 @@ void prepareToDecode(THuff *H);
 
        // Writes H in file f
        
-void saveHuff (THuff H, FILE *f);
+void saveHuff2 (THuff H, FILE *f);
 
        // Size of H written on file
        
 uint sizeHuffDisk (THuff H);
 
        //Size of H in memory
-uint sizeHuff (THuff H);
+uint sizeHuff2 (THuff H);
        
        // Frees H
        
-void freeHuff (THuff H);
+void freeHuff2 (THuff H);
 
        // Loads H from file f, prepared for encoding or decoding depending
        // on enc
        
-THuff loadHuff (FILE *f, int enc);
+THuff loadHuff2 (FILE *f, int enc);
 
 //Decodes a code starting in position ptr from stream. Returns the ranking in the
 //vector of symbols.