Safety before Techfest

[SXSI/xpathcomp.git] / results.c

diff --git a/results.c b/results.c
index 161f295..7570e5a 100644 (file)
--- a/results.c
+++ b/results.c
@@ -26,8 +26,11 @@ results createResults (int n)
        { fprintf(stderr,"Error, redefine logW as %i and recompile\n",lg(W)-1);\r
         exit(1);\r
        }\r
+\r
     R.n = 2*n-1;\r
     R.lgn = lg(n);\r
+    fprintf(stderr,"Size of the result set : %i elements, %li kB\n", n,\r
+           (((R.n+W-1)/W)*sizeof(int)/1024));\r
     R.tree = (int*) malloc (((R.n+W-1)/W)*sizeof(int));\r
     clearBit(R.tree,0); // clear all\r
     return R;\r
@@ -206,6 +209,20 @@ int nextResult (results R, int p) // returns pos of next(p) or -1 if none
     return unconv(answ,R.n,R.lgn);\r
   }\r
 \r
+// Naively implemented by kim\r
+\r
+unsigned int countResult(results R) {\r
+  unsigned int result = 0;\r
+  int i = 0;\r
+  while ( i != -1 && i < R.n) {\r
+    result ++; \r
+    i = unconv(nextLarger(R.tree,R.n,conv(i+1,R.n,R.lgn),0,R.lgn),R.n,R.lgn);\r
+  };\r
+  return result;\r
+   \r
+}\r
+\r
+\r
 static void prnspace (int k)\r
 \r
   { while (k--) putchar(' ');\r