Changeset 711 for trunk/gsdl/src/mgpp/text/mg_invf_rebuild.cpp

Timestamp:

1999-10-18T12:43:31+13:00 (25 years ago)

Author:

cs025

Message:

Changes to eradicate Xmalloc

File:

• trunk/gsdl/src/mgpp/text/mg_invf_rebuild.cpp (modified) (14 diffs)

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

@@ -50 +50 @@
 /*
    $Log$
+   Revision 1.2  1999/10/17 23:43:26  cs025
+   Changes to eradicate Xmalloc
+
    Revision 1.1  1999/10/11 02:57:58  cs025
    Base install of MG-PP
@@ -355 +358 @@
   for (i = 0; i < ifh_in.no_of_words; i++)
     {
-      unsigned long blk, p;
+      unsigned long blk, docCount;
       unsigned long odn_blk = 0, olen_blk = 0;
       unsigned long idn_blk = 0, ilen_blk = 0;
@@ -374 +377 @@
       NTOHUL(bytes_out);  /* [RPAP - Jan 97: Endian Ordering] */
 
-      p = word.documents();
-      blk = BIO_Bblock_Init (idh.static_num_of_docs, p);
+      docCount = word.documents();
+      blk = BIO_Bblock_Init (idh.static_num_of_docs, docCount);
       switch (outmode)
     {
@@ -381 +384 @@
       {
         unsigned long len;
-        if (p <= ifh_out.params[0])
+        if (docCount <= ifh_out.params[0])
           out_k = 0;
         else
           {
         out_k = ifh_out.params[0];
-        len = BIO_Bblock_Bound (N, p);
+        len = BIO_Bblock_Bound (N, docCount);
         if (ifh_in.InvfLevel >= 2)
           len += word.words();
-        odn_blk = BIO_Bblock_Init (idh.num_of_docs, (p + out_k - 1) / out_k);
-        olen_blk = BIO_Bblock_Init (len, (p + out_k - 1) / out_k);
+        odn_blk = BIO_Bblock_Init (idh.num_of_docs, (docCount + out_k - 1) / out_k);
+        olen_blk = BIO_Bblock_Init (len, (docCount + out_k - 1) / out_k);
           }
         break;
@@ -397 +400 @@
       {
         unsigned long len;
-        if (p <= mins)
+        if (docCount <= mins)
           out_k = 0;
         else
           {
-        out_k = (int) (2 * sqrt ((double) p / max_nodes));
+        out_k = (int) (2 * sqrt ((double) docCount / max_nodes));
         if (out_k <= mins)
           out_k = mins;
-        len = BIO_Bblock_Bound (N, p);
+        len = BIO_Bblock_Bound (N, docCount);
         if (ifh_in.InvfLevel >= 2)
           len += word.words();
         odn_blk = BIO_Bblock_Init (idh.num_of_docs,
-                       (p + out_k - 1) / out_k);
-        olen_blk = BIO_Bblock_Init (len, (p + out_k - 1) / out_k);
+                       (docCount + out_k - 1) / out_k);
+        olen_blk = BIO_Bblock_Init (len, (docCount + out_k - 1) / out_k);
           }
         break;
@@ -422 +425 @@
       {
         unsigned long len;
-        if (p <= ifh_in.params[0])
+        if (docCount <= ifh_in.params[0])
           in_k = 0;
         else
           {
         in_k = ifh_in.params[0];
-        len = BIO_Bblock_Bound (N, p);
+        len = BIO_Bblock_Bound (N, docCount);
         if (ifh_in.InvfLevel >= 2)
           len += word.words();
-        idn_blk = BIO_Bblock_Init (idh.num_of_docs, (p + in_k - 1) / in_k);
-        ilen_blk = BIO_Bblock_Init (len, (p + in_k - 1) / in_k);
+        idn_blk = BIO_Bblock_Init (idh.num_of_docs, (docCount + in_k - 1) / in_k);
+        ilen_blk = BIO_Bblock_Init (len, (docCount + in_k - 1) / in_k);
           }
         break;
@@ -438 +441 @@
       {
         unsigned long len;
-        if (p <= ifh_in.params[1])
+        if (docCount <= ifh_in.params[1])
           {
         in_k = 0;
@@ -444 +447 @@
         else
           {
-        in_k = (int) (2 * sqrt ((double) p / ifh_in.params[0]));
+        in_k = (int) (2 * sqrt ((double) docCount / ifh_in.params[0]));
         if (in_k <= ifh_in.params[1])
           in_k = ifh_in.params[1];
-        len = BIO_Bblock_Bound (N, p);
+        len = BIO_Bblock_Bound (N, docCount);
         if (ifh_in.InvfLevel >= 2)
           len += word.words();
         idn_blk = BIO_Bblock_Init (idh.num_of_docs,
-                       (p + in_k - 1) / in_k);
-        ilen_blk = BIO_Bblock_Init (len, (p + in_k - 1) / in_k);
+                       (docCount + in_k - 1) / in_k);
+        ilen_blk = BIO_Bblock_Init (len, (docCount + in_k - 1) / in_k);
           }
         break;
@@ -460 +463 @@
     }
 
-      if (!(ii = (invf_info *) Xmalloc (sizeof (invf_info) * p)))
+      if (!(ii = (invf_info *) Xmalloc (sizeof (invf_info) * docCount)))
     FatalError (1, "Unable to allocate memory for \"ii\"\n");
 
@@ -467 +470 @@
       kd = 0;
       DECODE_CONTINUE (in_buf)
-    for (j = 0; j < p; j++, kd++)
+    for (j = 0; j < docCount; j++, kd++)
     {
       unsigned long doc_diff, count = 0;
       if (kd == in_k)
         kd = 0;
-      if (in_k && kd == 0 && j + in_k < p)
+      if (in_k && kd == 0 && j + in_k < docCount)
         {
           int temp;
@@ -480 +483 @@
         }
       ii[j].bits_so_far = bits_so_far;
-      if (in_k && kd == in_k - 1 && j != p - 1)
+      if (in_k && kd == in_k - 1 && j != docCount - 1)
         {
           int count;
@@ -517 +520 @@
       kd = 0;
       ENCODE_CONTINUE (out_buf)
-    for (j = 0; j < p; j++, kd++)
+    for (j = 0; j < docCount; j++, kd++)
     {
       if (kd == out_k)
@@ -523 +526 @@
       if (out_k && kd == 0)
         {
-          if (j + out_k < p)
+          if (j + out_k < docCount)
         {
           int num = ii[j + out_k - 1].doc_num - last_major;
@@ -535 +538 @@
         }
         }
-      if (!(out_k && kd == out_k - 1 && j != p - 1))
+      if (!(out_k && kd == out_k - 1 && j != docCount - 1))
         buffer.bblock_encode (ii[j].doc_num - doc_num, blk, &bits_out);
       doc_num = ii[j].doc_num;