Changeset 1836

Timestamp:

2001-01-15T12:56:57+13:00 (23 years ago)

Author:

kjm18

Message:

added support for equiv terms for highlighting. THe QueryResult.TermFreqData
has UCArrayVector equivTerms now.

Location:

trunk/gsdl/src/mgpp/text

Files:

• MGQuery.cpp (modified) (6 diffs)
• MGQuery.h (modified) (1 diff)
• Terms.cpp (modified) (9 diffs)
• Terms.h (modified) (4 diffs)

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

@@ -423 +423 @@
               bool needFragFreqs,
               FragRangeArray *fragLimits,
-              FragData &fragData) const {
+              FragData &fragData,
+              UCArrayVector &equivTerms) const {
   fragData.Clear ();
+  equivTerms.erase(equivTerms.begin(), equivTerms.end());
 
   // get a list of term numbers
-  vector<unsigned long> equivWords;
-  FindWordNumbers (indexData, term, stemMethod, equivWords);
+  vector<unsigned long> equivNums;
+  FindWordNumbers (indexData, term, stemMethod, equivNums);
 
   // get the information for each word and merge it with
@@ -434 +436 @@
   FragData tempFragData1;
   FragData tempFragData2;
-  vector<unsigned long>::iterator here = equivWords.begin();
-  vector<unsigned long>::iterator end = equivWords.end();
+  UCArray equivWord;
+  vector<unsigned long>::iterator here = equivNums.begin();
+  vector<unsigned long>::iterator end = equivNums.end();
   while (here != end) {
     // get the information for this word
     ReadTermFragData (indexData, needFragFreqs, *here,
-              tempFragData1, fragLimits);
-
+              tempFragData1, fragLimits, equivWord);
+    equivTerms.push_back(equivWord);
     // combine with last results
     tempFragData2 = fragData;
@@ -503 +506 @@
   // read in the first term
   FragData termData;
+  UCArrayVector equivTerms;
   TermNodeArray::const_iterator termHere=terms.begin(), termEnd = terms.end();
   if (termHere != termEnd) {
-    (*termHere).Calculate (indexData, needFragFreqs, fragLimitsPtr, termData);
+    (*termHere).Calculate (indexData, needFragFreqs, fragLimitsPtr, 
+               termData, equivTerms);
 
     // convert initial fragment information
@@ -515 +520 @@
             (*termHere).stemMethod,
             (*termHere).termWeight,
+            equivTerms,
             result);
   
@@ -526 +532 @@
   while (termHere != termEnd) {
     (*termHere).Calculate (indexData, needFragFreqs,
-               fragLimitsPtr, comTermData);
+               fragLimitsPtr, comTermData, equivTerms);
 
     AndFragsToQueryResult (indexData,
@@ -535 +541 @@
                (*termHere).stemMethod,
                (*termHere).termWeight,
+               equivTerms,
                result);
     

trunk/gsdl/src/mgpp/text/MGQuery.h

@@ -139 +139 @@
           bool needFragFreqs,
           FragRangeArray *fragLimits,
-          FragData &fragData) const;
+          FragData &fragData,
+          UCArrayVector &equivTerms) const;
   void Free ();
   void Print (ostream &s, int indent=0) const;

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

@@ -42 +42 @@
   UCArrayClear (tag);
   UCArrayClear (term);
+  equivTerms.erase(equivTerms.begin(), equivTerms.end());
   stemMethod = 0;
   matchDocs = 0;
@@ -49 +50 @@
 ostream &operator<< (ostream &s, const TermFreqData &t) {
   s << "<" << t.tag << ">\"" << t.term << "\"stem("
-    << t.stemMethod << ")docs(" << t.matchDocs << ")"
+    << t.stemMethod << ")equiv terms(";
+  
+  unsigned long i;
+  for (i=0; i<t.equivTerms.size(); i++) {
+    s << t.equivTerms[i] << ", ";
+  }
+  s <<")docs(" << t.matchDocs << ")"
     << "count("<<t.termFreq<<")";
   return s;
@@ -58 +65 @@
       (t1.term == t2.term) &&
       (t1.stemMethod == t2.stemMethod) &&
+      (t1.equivTerms == t2.equivTerms) &&
       (t1.matchDocs == t2.matchDocs) &&
       (t1.termFreq == t2.termFreq));
@@ -279 +287 @@
                unsigned long termNum,
                FragData &fragData,
-               FragRangeArray *fragLimits) {
+               FragRangeArray *fragLimits,
+               UCArray & termWord) {
   fragData.Clear();
 
@@ -295 +304 @@
 
   fragData.matchDocs = wordDictEl.levelFreqs[indexData.curLevelNum];
-
+  termWord = wordDictEl.el;
   // seek to the appropriate place in the inverted file
   fseek (indexData.invfFile, wordDictEl.invf_ptr, SEEK_SET);
@@ -462 +471 @@
              unsigned long stemMethod,
              unsigned long termWeight,
+             UCArrayVector &equivTerms,
              QueryResult &result) {
   bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo);
@@ -527 +537 @@
     termFreqData.term = term;
     termFreqData.stemMethod = stemMethod;
+    termFreqData.equivTerms = equivTerms;
     termFreqData.matchDocs = termData.matchDocs;
     termFreqData.termFreq = overallwordfreq; // will be zero if needRankInfo 
@@ -541 +552 @@
                 unsigned long stemMethod,
                 unsigned long termWeight,
+                UCArrayVector &equivTerms,
                 QueryResult &result) {
   bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo);
@@ -636 +648 @@
     termFreqData.term = term;
     termFreqData.stemMethod = stemMethod;
+    termFreqData.equivTerms = equivTerms;
     termFreqData.matchDocs = termData.matchDocs;
     termFreqData.termFreq = overallwordfreq;

trunk/gsdl/src/mgpp/text/Terms.h

@@ -58 +58 @@
   UCArray term; // unstemmed term
   int stemMethod;
+  UCArrayVector equivTerms; // the stemmed and casefolded variants of the term
   unsigned long matchDocs; // tf for level - num levels
                // containing this term
@@ -126 +127 @@
                unsigned long termNum,
                FragData &fragData,
-               FragRangeArray *fragLimits);
+               FragRangeArray *fragLimits,
+               UCArray &termWord);
 
 void CombineFragData (bool needFragFreqs,
@@ -148 +150 @@
              unsigned long stemMethod,
              unsigned long termWeight,
+             UCArrayVector &equivTerms,
              QueryResult &result);
 
@@ -157 +160 @@
                 unsigned long stemMethod,
                 unsigned long termWeight,
+                UCArrayVector &equivTerms,
                 QueryResult &result);