sbndm minlen 2

fixes bin/sbndm a 1 aaaaaaaaaa 10
rurban · Dec 2, 2024 · 513c564 · 513c564
1 parent bff0a0c
commit 513c564
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/source/algocfg.c b/source/algocfg.c
@@ -183,7 +183,7 @@ const struct algocfg ALGOCFGS[] = {
   [_SA]    = {_SA, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
   [_BNDM]  = {_BNDM, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
   [_BNDML] = {_BNDML, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
-  [_SBNDM] = {_SBNDM, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
+  [_SBNDM] = {_SBNDM, GOOD, ASAN, VFY_PASS, 2, 32, 0, 0, 0, 0},
   [_TNDM]  = {_TNDM, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
   [_TNDMa] = {_TNDMa, GOOD, ASAN, VFY_PASS, 0, 0, 0, 0, 0, 0},
   [_LBNDM] = {_LBNDM, GOOD, ASAN, VFY_PASS, 2, 0, 0, 0, 0, 0},

diff --git a/source/algorithms.h b/source/algorithms.h
@@ -357,7 +357,7 @@ const struct algo ALGOS[] = {
   [_SA] = {_SA, OK, "sa", "Shift-And", 0, 0},
   [_BNDM] = {_BNDM, OK, "bndm", "BNDM for Long patterns", 0, 0},
   [_BNDML] = {_BNDML, OK, "bndml", "BNDM for Long patterns", 0, 0},
-  [_SBNDM] = {_SBNDM, OK, "sbndm", "Simplified BNDM", 0, 0},
+  [_SBNDM] = {_SBNDM, OK, "sbndm", "Simplified BNDM", 2, 0},
   [_TNDM] = {_TNDM, OK, "tndm", "Two-Way Nondeterministic DAWG Matching", 0, 0},
   [_TNDMa] = {_TNDMa, OK, "tndma", "Two-Way Nondeterministic DAWG Matching (version 2)", 0, 0},
   [_LBNDM] = {_LBNDM, OK, "lbndm", "long patterns bndm", 2, 0},

diff --git a/source/algos/sbndm.c b/source/algos/sbndm.c
@@ -21,10 +21,13 @@
  * Matching. Proceedings of the 10th International Symposium on String
  * Processing and Information Retrieval SPIRE'03, Lecture Notes in Computer
  * Science, vol.2857, pp.80--94, Springer-Verlag, Berlin, (2003).
+ *
+ * Constraints: m >= 2, m < 32
  */
 
 #include "include/define.h"
 #include "include/main.h"
+#include "include/search_small.h"
 
 int search_large(unsigned char *x, int m, unsigned char *y, int n);
 
@@ -38,7 +41,7 @@ int search(unsigned char *x, int m, unsigned char *y, int n) {
   if (m > 32)
     return search_large(x, m, y, n);
   if (m < 2)
-    return -1;
+    return search_small(x, m, y, n);
 
   /* Preprocessing */
   BEGIN_PREPROCESSING