Merge lp:~jpakkane/libcolumbus/lessfuzz-test into lp:libcolumbus/0.4

[Jussi Pakkanen]

Reduce fuzziness by making the error tolerances stricter.

Reduce fuzziness by making the error tolerances stricter. This reduces the amount of matches reduced which users might consider confusing.

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Matcher.cc'
--- src/Matcher.cc	2013-01-30 15:21:02 +0000
+++ src/Matcher.cc	2013-04-12 12:34:05 +0000
@@ -138,21 +138,24 @@
 }
 
 /*
- * These are helper functions for Matcher. They are not member functions to avoid polluting the header
- * with STL includes.
+ * Long words should allow for more error than short ones.
+ * This is a simple function which is meant to be strict
+ * so there won't be too many matches.
  */
 
-
 static int getDynamicError(const Word &w) {
     size_t len = w.length();
     if(len < 2)
         return LevenshteinIndex::getDefaultError();
-    else if(len < 5)
+    else
         return 2*LevenshteinIndex::getDefaultError();
-    else
-        return int((1+len/4.0)*LevenshteinIndex::getDefaultError()); // Permit a typo for every fourth letter.
 }
 
+/*
+ * These are helper functions for Matcher. They are not member functions to avoid polluting the header
+ * with STL includes.
+ */
+
 static void addMatches(MatcherPrivate *p, BestIndexMatches &bestIndexMatches, const Word &queryWord, const WordID indexID, IndexMatches &matches) {
     MatchIndIterator it = bestIndexMatches.find(indexID);
     map<WordID, int> *indexMatches;