Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/mgpp/text/Terms.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/mgpp/text/Terms.cpp (modified) (8 diffs)

branches/New_Config_Format-branch/gsdl/src/mgpp/text/Terms.cpp

@@ -44 +44 @@
   stemMethod = 0;
   matchDocs = 0;
+  termFreq = 0;
 }
 
 ostream &operator<< (ostream &s, const TermFreqData &t) {
   s << "<" << t.tag << ">\"" << t.term << "\"stem("
-    << t.stemMethod << ")docs(" << t.matchDocs << ")";
+    << t.stemMethod << ")docs(" << t.matchDocs << ")"
+    << "count("<<t.termFreq<<")";
   return s;
 }
@@ -56 +58 @@
       (t1.term == t2.term) &&
       (t1.stemMethod == t2.stemMethod) &&
-      (t1.matchDocs == t2.matchDocs));
+      (t1.matchDocs == t2.matchDocs) &&
+      (t1.termFreq == t2.termFreq));
 }
 
@@ -442 +445 @@
   unsigned long termDocFreq = 0;
   unsigned long lastLevelDocNum = 0;
-
+  unsigned long overallwordfreq = 0;
   
   while (termDataI < termDataSize) {
@@ -463 +466 @@
       if (needRanks)
     termDocFreq += termData.fragFreqs[termDataI];
+      overallwordfreq += termData.fragFreqs[termDataI];
     }
     
@@ -484 +488 @@
     termFreqData.stemMethod = stemMethod;
     termFreqData.matchDocs = termData.matchDocs;
+    termFreqData.termFreq = overallwordfreq;
     result.termFreqs.push_back (termFreqData);
   }
@@ -517 +522 @@
   unsigned long termDocFreq = 0;
   unsigned long lastLevelDocNum = 0;
-
+  unsigned long overallwordfreq = 0;
   unsigned long resultI = 0;
   unsigned long resultSize = result.docs.size();
@@ -552 +557 @@
       if (needRanks)
     termDocFreq += termData.fragFreqs[termDataI];
+     overallwordfreq += termData.fragFreqs[termDataI]; 
     }
     
     termDataI++;
-  }
+  } // while
 
   if (lastLevelDocNum > 0) {
@@ -590 +596 @@
     termFreqData.stemMethod = stemMethod;
     termFreqData.matchDocs = termData.matchDocs;
+    termFreqData.termFreq = overallwordfreq;
     result.termFreqs.push_back (termFreqData);
   }