Changeset 74

Timestamp:

1999-09-20 15:19:27 (9 years ago)

Author:

olly

Message:

max msize no longer hard coded
can be set with --msize <number> in matchtest

Location:

trunk/xapian-core

Files:

• common/match.h (modified) (2 diffs)
• matcher/match.cc (modified) (5 diffs)
• tests/matchtest.cc (modified) (1 diff)

trunk/xapian-core/common/match.h

@@ -16 +16 @@
    
         PostList *merger;
-//        const int msize = 1000;
+        doccount max_msize;
 
         // FIXME: try using a heap instead (C++ sect 18.8)
@@ -25 +25 @@
         bool add_pterm(const string&);
         void match(void);
+        void set_max_msize(doccount n) { max_msize = n; }
 };

trunk/xapian-core/matcher/match.cc

@@ -20 +20 @@
     return true;
 }
-
-#define MSIZE 1000
 
 typedef struct {
@@ -50 +48 @@
     }
 
-    docid msize = 0, mtotal = 0;
+    doccount msize = 0, mtotal = 0;
     weight min = 0;
-    msetitem mset[MSIZE];
+    msetitem *mset = new msetitem[max_msize];
 
     // FIXME: this method of building the M-set isn't very efficient
@@ -67 +65 @@
 
             if (i == msize) {
-                if (msize < MSIZE) {
+                if (msize < max_msize) {
                     mset[msize].id = id;
                     mset[msize].w = w;
@@ -74 +72 @@
             } else {
                 int len;
-                if (msize < MSIZE) msize++;
+                if (msize < max_msize) msize++;
                 len = msize - i - 1;
                 memmove(mset + i + 1, mset + i, len * sizeof(msetitem));
@@ -80 +78 @@
                 mset[i].w = w;          
             }
-            if (msize == MSIZE) min = mset[MSIZE - 1].w;
+            if (msize == max_msize) min = mset[max_msize - 1].w;
         }
         mtotal++;

trunk/xapian-core/tests/matchtest.cc

@@ -14 +14 @@
         StemEn stemmer;
 
+        if (argc >= 3 && strcmp(argv[1], "--msize") == 0) {
+            match.set_max_msize(atoi(argv[2]));
+            argc -= 2;
+            memmove(argv + 1, argv + 3, argc);
+        }
+
         if (argc < 2) {
             cout << "Syntax: " << argv[0] << " TERM ..." << endl;
             exit(1);
-        }
+        }        
        
         for (char **p = argv + 1; *p; p++) {