Changeset 861

Timestamp:

2000-01-19T12:24:19+13:00 (24 years ago)

Author:

rjmcnab

Message:

fixed a few more bugs

Location:

trunk/gsdl/src/mgpp/text

Files:

• MGQuery.cpp (modified) (3 diffs)
• Makefile.in (modified) (1 diff)
• QueryResultsSort.h (modified) (2 diffs)
• Queryer.cpp (modified) (1 diff)
• Weights.cpp (modified) (1 diff)
• mg_weights_build.cpp (modified) (2 diffs)

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

@@ -587 +587 @@
 
   unsigned long resultsSize = queryInfo.maxDocs;
-  if (resultsSize == 0 || resultsSize > result.ranks.size())
-    resultsSize = result.ranks.size();
+  if (resultsSize == 0 || resultsSize > result.docs.size())
+    resultsSize = result.docs.size();
   
   // sort results by rank if needed
-  LTRank ltRank;
+  GTRank gtRank;
   if (queryInfo.sortByRank) {
+    // need in ascending order for SelectAddHeap
     MakeHeap (result.docs.begin(), result.ranks.begin(),
-          resultsSize, ltRank);
+          resultsSize, gtRank);
     SelectAddHeap (result.docs.begin(), result.ranks.begin(), resultsSize,
            result.docs.begin()+resultsSize,
            result.ranks.begin()+resultsSize,
-           result.ranks.size()-resultsSize, ltRank);
-    SortHeap (result.docs.begin(), result.ranks.begin(), resultsSize, ltRank);
+           result.ranks.size()-resultsSize, gtRank);
+
+    // sort into descending order
+    SortHeap (result.docs.begin(), result.ranks.begin(), resultsSize, gtRank);
   }
   
@@ -609 +612 @@
     
     for (i=0; i<resultsSize; i++) {
-      result.ranks[i] = result.ranks[i] * 
+      result.ranks[i] =  result.ranks[i] *
     indexData.weightData.GetLowerApproxDocWeight (result.docs[i]) /
     GetExactDocWeight (indexData.exactWeightsFile, exactDiskPtr,
@@ -618 +621 @@
     if (queryInfo.sortByRank) {
       MakeHeap (result.docs.begin(), result.ranks.begin(),
-        resultsSize, ltRank);
+        resultsSize, gtRank);
       SortHeap (result.docs.begin(), result.ranks.begin(),
-        resultsSize, ltRank);
+        resultsSize, gtRank);
     }
   }
 
   // get rid of unwanted ranking results
-  if (!result.ranks.empty() && !queryInfo.needRankInfo) {
+  if (result.ranks.empty()) {
+    // do nothing
+  } else if (!queryInfo.needRankInfo) {
     result.ranks.erase(result.ranks.begin(), result.ranks.end());
   } else {

trunk/gsdl/src/mgpp/text/Makefile.in

@@ -273 +273 @@
 
 
-LIB_OBJS = Queryer$o mg_files$o mg_errors$o locallib$o invf$o UCArray$o \
+LIB_OBJS = mg_files$o mg_errors$o locallib$o invf$o UCArray$o \
            FIvfLevelInfo$o FragLevelConvert$o Terms$o MGQuery$o \
            IndexData$o stemmer$o Weights$o TextGet$o text$o FText$o \

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

@@ -104 +104 @@
   
   unsigned long i = 0;
-  for (i=0; i<size; i++)
+  for (i=1; i<=size; i++)
     PushHeap (docNumHeap, parallelHeap, i, comp);
 }
@@ -132 +132 @@
   unsigned long i;
   for (i=0; i<addSize; i++) {
-    if (comp(*(parallelHeap), *(parallelAdd+i))) {
+    if (comp(*(parallelAdd+i), *(parallelHeap))) {
       swap (*(docNumHeap), *(docNumAdd+i));
       swap (*(parallelHeap), *(parallelAdd+i));

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

@@ -75 +75 @@
   QueryInfo queryInfo;
   SetCStr (queryInfo.docLevel, "Document");
-  queryInfo.maxDocs = 100000;
+  queryInfo.maxDocs = 10;
   queryInfo.sortByRank = true;
   queryInfo.exactWeights = false;

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

@@ -111 +111 @@
   // decompress the weight
   if (table != NULL) return table[c];
-  else return (L * pow (B, (double) c));
+  return (L * pow (B, (double) c));
 }
 

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

@@ -48 +48 @@
 /*
    $Log$
+   Revision 1.3  2000/01/18 23:24:19  rjmcnab
+   fixed a few more bugs
+
    Revision 1.2  2000/01/18 03:53:24  rjmcnab
    Fixed a couple of bugs and made building silent if needed.
@@ -242 +245 @@
   while (here != end) {
 //      cout << *here << "\n";
-    WriteF (weightsFile, *here);
+    WriteF (weightsFile, sqrt (*here));
     here++;
   }