Changeset 8691 for trunk/gsdl/src/mgpp/text/mgpp_compression_dict.cpp

Timestamp:

2004-11-29T15:04:28+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...

File:

• trunk/gsdl/src/mgpp/text/mgpp_compression_dict.cpp (modified) (30 diffs)

trunk/gsdl/src/mgpp/text/mgpp_compression_dict.cpp

@@ -233 +233 @@
   NTOHD(csh.num_bytes);
 
-  for (i = 0; i < 2; i++)
+  for (i = 0; i < 2; ++i)
     {
       frags_stats_header fsh;
@@ -253 +253 @@
       wd = Words[i] = (DictWordData *) Xmalloc (sizeof (DictWordData) * Num[i]);
       unsigned int j;
-      for (j = 0; j < Num[i]; j++, wd++)
+      for (j = 0; j < Num[i]; ++j, ++wd)
     {
       int len;
@@ -306 +306 @@
   dd->chars = 0;
   wd = dd->wd;
-  for (i = 0; i < dd->num_wds; i++, wd++)
+  for (i = 0; i < dd->num_wds; ++i, ++wd)
     dd->chars += (*wd)->word[0];
 }
@@ -317 +317 @@
   Alloc_keep_discard ();
   keep[0].num_wds = Num[0];
-  for (i = 0; i < Num[0]; i++)
+  for (i = 0; i < Num[0]; ++i)
     keep[0].wd[i] = Words[0] + i;
   keep[1].num_wds = Num[1];
-  for (i = 0; i < Num[1]; i++)
+  for (i = 0; i < Num[1]; ++i)
     keep[1].wd[i] = Words[1] + i;
   SortAndCount_DictData (&keep[0]);
@@ -367 +367 @@
   num = Num[0] + Num[1];
   wd = (DictWordData **) Xmalloc (num * sizeof (DictWordData *));
-  for (i = 0; (unsigned int)i < Num[0]; i++)
+  for (i = 0; (unsigned int)i < Num[0]; ++i)
     wd[i] = Words[0] + i;
-  for (i = 0; (unsigned int)i < Num[1]; i++)
+  for (i = 0; (unsigned int)i < Num[1]; ++i)
     wd[i + Num[0]] = Words[1] + i;
 
@@ -390 +390 @@
     }
 
-  for (i = 0; i < num; i++)
+  for (i = 0; i < num; ++i)
     {
       DictWordData *word = wd[i];
@@ -438 +438 @@
   memset (char_freqs, '\0', sizeof (char_freqs));
   memset (len_freqs, '\0', sizeof (len_freqs));
-  for (i = 0; i < num; i++, wd++)
+  for (i = 0; i < num; ++i, ++wd)
     {
       u_long freq = (*wd)->documents();
@@ -446 +446 @@
       len_freqs[idx][len] += freq;
       escape[idx] += freq;
-      for (; len; len--, buf++)
+      for (; len; --len, ++buf)
     char_freqs[idx][(u_long) (*buf)] += freq;
     }
@@ -471 +471 @@
   int j;
 
-  for (j = 0; j < num; j++, word++)
+  for (j = 0; j < num; ++j, ++word)
     {
       float   cbc, wbc;
@@ -480 +480 @@
 
       cbc = len_lens[idx][len];
-      for (; len; len--, buf++)
+      for (; len; --len, ++buf)
     cbc += char_lens[idx][(u_long) (*buf)];
 
@@ -585 +585 @@
 
 
-  for (i = 0; (unsigned int)i < Num[0]; i++)
+  for (i = 0; (unsigned int)i < Num[0]; ++i)
     discard_heap[i] = Words[0] + i;
-  for (i = 0; (unsigned int)i < Num[1]; i++)
+  for (i = 0; (unsigned int)i < Num[1]; ++i)
     discard_heap[i + Num[0]] = Words[1] + i;
 
@@ -600 +600 @@
       keep_heap[keep_num++] = word;
       freqs_trans[KIND (word)] += word->documents();
-      num_trans++;
+      ++num_trans;
     }
 
@@ -663 +663 @@
       heap_build (keep_heap, sizeof (keep_heap), keep_num, SmallSaving);
       recalc_reqd = 0;
-      recalcs++;
+      ++recalcs;
     }
     }
@@ -669 +669 @@
   Alloc_keep_discard ();
 
-  for (i = 0; i < discard_num; i++)
+  for (i = 0; i < discard_num; ++i)
     {
       DictWordData *word = discard_heap[i];
@@ -676 +676 @@
       discard[idx].wd[discard[idx].num_wds++] = word;
     }
-  for (i = 0; i < keep_num; i++)
+  for (i = 0; i < keep_num; ++i)
     {
       DictWordData *word = keep_heap[i];
@@ -724 +724 @@
   HTONUL(tmp.dict_type);
   HTONUL(tmp.novel_method);
-  for (i = 0; i < TEXT_PARAMS; i++)
+  for (i = 0; i < TEXT_PARAMS; ++i)
     HTONUL(tmp.params[i]);
   HTONUL(tmp.num_words[0]);
@@ -741 +741 @@
   unsigned int i;
   u_char *curr, *prev = NULL;
-  for (i = 0; i < dd->num_wds; i++)
+  for (i = 0; i < dd->num_wds; ++i)
     {
       int len;
@@ -762 +762 @@
 {
   unsigned int i, us;
-  for (us = i = 0; i < dd->num_wds; i++)
+  for (us = i = 0; i < dd->num_wds; ++i)
     us += dd->wd[i]->word[0];
   return us;
@@ -783 +783 @@
     FatalError (1, "Unable to allocate memory for freqs");
 
-  for (i = 0; (unsigned)i < dd->num_wds; i++)
+  for (i = 0; (unsigned)i < dd->num_wds; ++i)
     {
       freqs[i] = dd->wd[i]->documents();
@@ -792 +792 @@
     FatalError (1, "Unable to allocate memory for huffman data");
 
-  delete (freqs);
+  delete []freqs;
   freqs = NULL;
 
@@ -813 +813 @@
   mem_reqd = 0;
 
-  for (i = 0; (unsigned)i < dd->num_wds; i++)
+  for (i = 0; (unsigned)i < dd->num_wds; ++i)
     {
       int codelen = hd->clens[i];
@@ -841 +841 @@
       lastword[codelen] = word;
 #endif
-      lencounts[codelen]++;
+      ++lencounts[codelen];
     }
 
   /* [RPAP - Jan 97: Endian Ordering] */
-  for (i = hd->mincodelen; i < hd->maxcodelen + 1; i++)
+  for (i = hd->mincodelen; i < hd->maxcodelen + 1; ++i)
     HTONUL(huff_words_size[i]);
 
@@ -852 +852 @@
 
   /* [RPAP - Jan 97: Endian Ordering] */
-  for (i = hd->mincodelen; i < hd->maxcodelen + 1; i++)
+  for (i = hd->mincodelen; i < hd->maxcodelen + 1; ++i)
     NTOHUL(huff_words_size[i]);
 
   Write_words (f, dd);
 
-  delete hd->clens;
+  delete []hd->clens;
   delete hd;
 
@@ -876 +876 @@
   memset (freqs, '\0', sizeof (freqs));
 
-  for (j = 0; j < dd->num_wds; j++, wd++)
+  for (j = 0; j < dd->num_wds; ++j, ++wd)
     {
       u_char *buf = (*wd)->word;
       int len = *buf++;
-      for (; len; len--, buf++)
+      for (; len; --len, ++buf)
     freqs[(u_long) (*buf)] += (*wd)->documents();
     }
 
   if (!zero_freq_permitted)
-    for (j = 0; j < 256; j++)
+    for (j = 0; j < 256; ++j)
       if (!freqs[j] && PESINAWORD (j) == words)
     freqs[j] = 1;
@@ -895 +895 @@
     FatalError (1, "Unable to write huffman data");
 
-  delete hd->clens;
+  delete []hd->clens;
   delete hd;
 }
@@ -912 +912 @@
   memset (freqs, '\0', sizeof (freqs));
 
-  for (j = 0; j < dd->num_wds; j++, wd++)
+  for (j = 0; j < dd->num_wds; ++j, ++wd)
     freqs[(*wd)->word[0]] += (*wd)->documents();
 
   if (!zero_freq_permitted)
-    for (j = 0; j < 16; j++)
+    for (j = 0; j < 16; ++j)
       if (!freqs[j])
     freqs[j] = 1;
@@ -927 +927 @@
 
 
-  delete hd->clens;
+  delete []hd->clens;
   delete hd;
 }
@@ -958 +958 @@
   Write_cdh (f, &cdh);
 
-  for (i = 0; i < 2; i++)
+  for (i = 0; i < 2; ++i)
     switch (type)
       {
@@ -975 +975 @@
           esc.word = (u_char *) "";
           keep[i].wd[keep[i].num_wds++] = &esc;
-          for (j = 0; (unsigned)j < discard[i].num_wds; j++)
+          for (j = 0; (unsigned)j < discard[i].num_wds; ++j)
         esc.docCount += discard[i].wd[j]->documents();
           if (!esc.docCount)
-        esc.docCount++;
+        ++esc.docCount;
           mem_reqd += Write_data (f, &keep[i], lookback);
         }
@@ -994 +994 @@
           esc.word = (u_char *) "";
           keep[i].wd[keep[i].num_wds++] = &esc;
-          for (j = 0; (unsigned)j < all[i].num_wds; j++)
+          for (j = 0; (unsigned)j < all[i].num_wds; ++j)
         if (all[i].wd[j]->documents() == 1)
-          esc.docCount++;
+          ++esc.docCount;
           if (!esc.docCount)
-        esc.docCount++;
+        ++esc.docCount;
           mem_reqd += Write_data (f, &keep[i], lookback);
         }