remove unused case, add more optimization for multiple patterns

kbrsh · May 22, 2017 · 60feaf9 · 60feaf9
1 parent 74b9bc4
commit 60feaf9
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 43 deletions.
diff --git a/dist/wade.js b/dist/wade.js
@@ -36,32 +36,30 @@
 
       var match = false;
 
-      if(itemLength !== 0) {
-        while(i < length) {
-        	for(var j = itemLength - 1; j >= 0; j--) {
-          	var char = item[j];
-            var target = data[j + i];
-
-            if(char === target) {
-            	match = true;
+      while(i < length) {
+        for(var j = itemLength - 1; j >= 0; j--) {
+          var char = item[j];
+          var target = data[j + i];
+
+          if(char === target) {
+            match = true;
+          } else {
+            var shift = table[target];
+
+            if(shift === undefined) {
+              i += j + 1;
             } else {
-            	var shift = table[target];
-
-              if(shift === undefined) {
-              	i += j + 1;
-              } else {
-              	i += shift;
-              }
-
-              match = false;
-      				break;
+              i += shift;
             }
-          }
 
-          if(match === true) {
-          	break;
+            match = false;
+            break;
           }
         }
+
+        if(match === true) {
+          break;
+        }
       }
 
       return match;
@@ -81,6 +79,25 @@
       }
     }
 
+    var addMultiplePatternTable = function(table, trie) {
+
+    }
+
+    var containsMultiplePatterns = function(items, trie, table, data) {
+      var dataLength = data.length;
+
+      var i = 0;
+      var length = dataLength - itemLength + 1;
+
+      var match = false;
+
+      while(i < length) {
+        i++;
+      }
+
+      return match;
+    }
+
     var lowercase = function(str) {
       return str.toLowerCase();
     }
@@ -135,9 +152,19 @@
           }
         } else {
           var trie = {};
+          var table = {};
           for(var i = 0; i < keywordsLength; i++) {
             addMultiplePatternTrie(trie, i, keywords[i]);
           }
+          addMultiplePatternTable(table, trie);
+          for(var i = 0; i < dataLength; i++) {
+            if(containsMultiplePatterns(keywords[i], trie, table, data[i]) === true) {
+              results.push({
+                index: i,
+                score: 1
+              });
+            }
+          }
         }
 
         return results;

diff --git a/dist/wade.min.js b/dist/wade.min.js
diff --git a/src/index.js b/src/index.js
@@ -26,32 +26,30 @@ var containsPattern = function(item, itemLength, table, data) {
 
   var match = false;
 
-  if(itemLength !== 0) {
-    while(i < length) {
-    	for(var j = itemLength - 1; j >= 0; j--) {
-      	var char = item[j];
-        var target = data[j + i];
-
-        if(char === target) {
-        	match = true;
+  while(i < length) {
+    for(var j = itemLength - 1; j >= 0; j--) {
+      var char = item[j];
+      var target = data[j + i];
+
+      if(char === target) {
+        match = true;
+      } else {
+        var shift = table[target];
+
+        if(shift === undefined) {
+          i += j + 1;
         } else {
-        	var shift = table[target];
-
-          if(shift === undefined) {
-          	i += j + 1;
-          } else {
-          	i += shift;
-          }
-
-          match = false;
-  				break;
+          i += shift;
         }
-      }
 
-      if(match === true) {
-      	break;
+        match = false;
+        break;
       }
     }
+
+    if(match === true) {
+      break;
+    }
   }
 
   return match;
@@ -71,6 +69,25 @@ var addMultiplePatternTrie = function(parent, id, item) {
   }
 }
 
+var addMultiplePatternTable = function(table, trie) {
+
+}
+
+var containsMultiplePatterns = function(items, trie, table, data) {
+  var dataLength = data.length;
+
+  var i = 0;
+  var length = dataLength - itemLength + 1;
+
+  var match = false;
+
+  while(i < length) {
+    i++;
+  }
+
+  return match;
+}
+
 var lowercase = function(str) {
   return str.toLowerCase();
 }
@@ -125,9 +142,19 @@ var Wade = function(data) {
       }
     } else {
       var trie = {};
+      var table = {};
       for(var i = 0; i < keywordsLength; i++) {
         addMultiplePatternTrie(trie, i, keywords[i]);
       }
+      addMultiplePatternTable(table, trie);
+      for(var i = 0; i < dataLength; i++) {
+        if(containsMultiplePatterns(keywords[i], trie, table, data[i]) === true) {
+          results.push({
+            index: i,
+            score: 1
+          });
+        }
+      }
     }
 
     return results;