Some bug fixes and some optimizations.

[idzebra-moved-to-github.git] / dict / dicttest.c

diff --git a/dict/dicttest.c b/dict/dicttest.c
index b74b795..d9acca4 100644 (file)
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.9  1994-09-22 14:43:56  adam
+ * Revision 1.13  1994-10-04 12:08:05  adam
+ * Some bug fixes and some optimizations.
+ *
+ * Revision 1.12  1994/10/03  17:23:03  adam
+ * First version of dictionary lookup with regular expressions and errors.
+ *
+ * Revision 1.11  1994/09/28  13:07:09  adam
+ * Use log_mask_str now.
+ *
+ * Revision 1.10  1994/09/26  10:17:24  adam
+ * Minor changes.
+ *
+ * Revision 1.9  1994/09/22  14:43:56  adam
  * First functional version of lookup with error correction. A 'range'
  * specified the maximum number of insertions+deletions+substitutions.
  *
@@ -46,10 +58,13 @@
 #include <dict.h>
 
 char *prog;
-Dict dict;
+static Dict dict;
+
+static int look_hits;
 
-static int lookup_handle (Dict_char *name)
+static int grep_handle (Dict_char *name, char *info)
 {
+    look_hits++;
     printf ("%s\n", name);
     return 0;
 }
@@ -64,22 +79,24 @@ int main (int argc, char **argv)
     int infosize = 4;
     int cache = 10;
     int ret;
+    int unique = 0;
+    char *grep_pattern = NULL;
+    char *arg;
     int no_of_iterations = 0;
     int no_of_new = 0, no_of_same = 0, no_of_change = 0;
     int no_of_hits = 0, no_of_misses = 0;
-    int unique = 0;
-    char *arg;
+
     
     prog = argv[0];
     if (argc < 2)
     {
         fprintf (stderr, "usage:\n "
-                 " %s [-r n] [-u] [-s n] [-v n] [-i f] [-w] [-c n]"
+                 " %s [-r n] [-u] [-g pat] [-s n] [-v n] [-i f] [-w] [-c n]"
                  " base file\n",
                  prog);
         exit (1);
     }
-    while ((ret = options ("r:us:v:i:wc:", argv, argc, &arg)) != -2)
+    while ((ret = options ("r:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -93,6 +110,10 @@ int main (int argc, char **argv)
                 exit (1);
             }
         }
+        else if (ret == 'g')
+        {
+            grep_pattern = arg;
+        }
         else if (ret == 'r')
         {
             range = atoi (arg);
@@ -117,7 +138,7 @@ int main (int argc, char **argv)
         }
         else if (ret == 'v')
         {
-            log_init (atoi(arg), prog, NULL);
+            log_init (log_mask_str(arg), prog, NULL);
         }
         else
         {
@@ -202,7 +223,12 @@ int main (int argc, char **argv)
                     }
                     else
                     {
-                        dict_lookup_ec (dict, ipf_ptr, range, lookup_handle);
+                        look_hits = 0;
+                        dict_lookup_grep (dict, ipf_ptr, range, grep_handle);
+                        if (look_hits)
+                            no_of_hits++;
+                        else
+                            no_of_misses++;
                     }
                     ++no_of_iterations;
                     ipf_ptr += (i-1);
@@ -212,6 +238,13 @@ int main (int argc, char **argv)
         }
         fclose (ipf);
     }
+    if (grep_pattern)
+    {
+        if (range < 0)
+            range = 0;
+        log (LOG_LOG, "Grepping '%s'", grep_pattern);
+        dict_lookup_grep (dict, grep_pattern, range, grep_handle);
+    }
     if (rw)
     {
         log (LOG_LOG, "Insertions.... %d", no_of_iterations);