Changeset 8692 for trunk/indexers/mgpp/lib

Timestamp:

2004-11-29T15:43:11+13:00 (20 years ago)

Author:

kjdon

Message:

Added the changes from Emanuel Dejanu (Simple Words) - mostly efficiency changes. For example, changing i++ to ++i, delete xxx to delete []xxx, some stuff to do with UCArrays...

Location:

trunk/indexers/mgpp/lib

Files:

• bitio_m_random.cpp (modified) (4 diffs)
• huffman.cpp (modified) (18 diffs)

trunk/indexers/mgpp/lib/bitio_m_random.cpp

@@ -16 +16 @@
 
 random_bitio_buffer::~random_bitio_buffer() {
-  if (buffer != NULL) delete buffer;
+  if (buffer != NULL) delete []buffer;
 }
 
@@ -22 +22 @@
   // delete the old buffer
   if (buffer != NULL) {
-    delete buffer;
+    delete []buffer;
     buffer = NULL;
   }
@@ -54 +54 @@
   // delete the old buffer
   if (buffer != NULL) {
-    delete buffer;
+    delete []buffer;
     buffer = NULL;
   }
@@ -131 +131 @@
   flush();
   if (buffer != NULL) {
-    delete buffer;
+    delete []buffer;
     buffer = NULL;
   }

trunk/indexers/mgpp/lib/huffman.cpp

@@ -56 +56 @@
 
   /* Initialise the pointers to the leaves */
-  for (count = i = 0; i < num; i++)
+  for (count = i = 0; i < num; ++i)
     if (heap[num + i])
       heap[count++] = num + i;
@@ -62 +62 @@
   /* Reorganise the pointers so that it is a heap */
   HNum = count;
-  for (i = HNum / 2; i > 0; i--)
+  for (i = HNum / 2; i > 0; --i)
     {
       register int curr, child;
@@ -70 +70 @@
     {
       if (child < HNum && heap[heap[child]] < heap[heap[child - 1]])
-        child++;
+        ++child;
       if (heap[heap[curr - 1]] > heap[heap[child - 1]])
         {
@@ -91 +91 @@
       int pos[2];
 
-      for (i = 0; i < 2; i++)
+      for (i = 0; i < 2; ++i)
     {
       register int curr, child;
@@ -102 +102 @@
           if (child < HNum &&
           heap[heap[child]] < heap[heap[child - 1]])
-        child++;
+        ++child;
           if (heap[heap[curr - 1]] > heap[heap[child - 1]])
         {
@@ -124 +124 @@
       {
     register int parent, curr;
-    HNum++;
+    ++HNum;
     curr = HNum;
     parent = curr >> 1;
@@ -143 +143 @@
   heap[0] = -1UL;
   heap[1] = 0;
-  for (i = 2; i < num * 2; i++)
+  for (i = 2; i < num * 2; ++i)
     heap[i] = heap[heap[i]] + 1;
 
@@ -152 +152 @@
 
   /* Set the code length of each leaf in the huffman tree */
-  for (i = 0; i < num; i++)
+  for (i = 0; i < num; ++i)
     {
       register u_long codelen = heap[i + num];
@@ -162 +162 @@
       if (codelen < hd->mincodelen)
     hd->mincodelen = codelen;
-      hd->lencount[codelen]++;
+      ++hd->lencount[codelen];
     }
 
@@ -174 +174 @@
       /* Calculate the current codes for each different code length */
       hd->min_code[hd->maxcodelen] = 0;
-      for (i = hd->maxcodelen - 1; i>=0; i--)
+      for (i = hd->maxcodelen - 1; i>=0; --i)
     hd->min_code[i] = (hd->min_code[i + 1] + hd->lencount[i + 1]) >> 1;
     }
-  delete heap;
+  delete []heap;
   return (hd);
 
 error2:
-  delete heap;
+  delete []heap;
 error1:
   if (!data)
@@ -204 +204 @@
     *mem += data->num_codes * sizeof (*codes);
   memcpy (mc, data->min_code, sizeof (mc));
-  for (i = 0; i < data->num_codes; i++)
+  for (i = 0; i < data->num_codes; ++i)
     if (data->clens[i])
       codes[i] = mc[(int) (data->clens[i])]++;
@@ -226 +226 @@
   if (!(values = new unsigned long *[MAX_HUFFCODE_LEN + 1]))
     {
-      delete vals;
+      delete []vals;
       return (NULL);
     }
@@ -237 +237 @@
 
   fcode[0] = values[0] = &vals[0];
-  for (i = 1; i <= data->maxcodelen; i++)
+  for (i = 1; i <= data->maxcodelen; ++i)
     fcode[i] = values[i] = &vals[(values[i - 1] - vals) + data->lencount[i - 1]];
 
-  for (i = 0; i < data->num_codes; i++)
+  for (i = 0; i < data->num_codes; ++i)
     if (data->clens[i])
       *fcode[(int) (data->clens[i])]++ = i;
@@ -256 +256 @@
   if (!Generate_Huffman_Data (num, freqs, &hd, NULL))
     return -1;
-  for (i = 0; i < num; i++)
+  for (i = 0; i < num; ++i)
     size += counts[i] * hd.clens[i];
-  delete hd.clens;
+  delete []hd.clens;
   return size;
 }
@@ -290 +290 @@
       /* [RPAP - Jan 97: Endian Ordering] */
       int i;
-      for (i = hd->mincodelen; i < hd->maxcodelen + 1; i++)
+      for (i = hd->mincodelen; i < hd->maxcodelen + 1; ++i)
     HTONSI(hd->lencount[i]);
-      for (i = 0; i < hd->maxcodelen + 1; i++)
+      for (i = 0; i < hd->maxcodelen + 1; ++i)
     HTONUL(hd->min_code[i]);
 
@@ -308 +308 @@
 
       /* [RPAP - Jan 97: Endian Ordering] */
-      for (i = hd->mincodelen; i < hd->maxcodelen + 1; i++)
+      for (i = hd->mincodelen; i < hd->maxcodelen + 1; ++i)
     NTOHSI(hd->lencount[i]);
-      for (i = 0; i < hd->maxcodelen + 1; i++)
+      for (i = 0; i < hd->maxcodelen + 1; ++i)
     NTOHUL(hd->min_code[i]);
     }
@@ -350 +350 @@
 
       /* [RPAP - Jan 97: Endian Ordering] */
-      for (i = hd->mincodelen; i < hd->maxcodelen + 1; i++)
+      for (i = hd->mincodelen; i < hd->maxcodelen + 1; ++i)
     NTOHSI(hd->lencount[i]);
 
@@ -363 +363 @@
 
       /* [RPAP - Jan 97: Endian Ordering] */
-      for (i = 0; i < hd->maxcodelen + 1; i++)
+      for (i = 0; i < hd->maxcodelen + 1; ++i)
     NTOHUL(hd->min_code[i]);