logic: fixed underflow in fuzzy search after 100 chars

bin/test/data/log/test_log.txt

@@ -1,4 +1,27 @@
 ConfigManager.cpp ERROR: value path/to/nowhere is not present in config.
+Token.cpp ERROR: Location Id was not referenced by this Token.
+Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
+Edge.cpp ERROR: Nodes are not plain copies.
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
+Storage.cpp INFO: file: input.cc < 0:0 0:0>
+Storage.cpp INFO: class: A <input.cc 1:7 1:7>
+Storage.cpp INFO: method: A::A <input.cc 4:2 4:2>
+Storage.cpp INFO: global usage: A::A -> A::count <input.cc 5:3 5:7>
+Storage.cpp INFO: method: A::getCount <input.cc 8:13 8:20>
+Storage.cpp INFO: global usage: A::getCount -> A::count <input.cc 10:10 10:14>
+Storage.cpp INFO: method: A::process <input.cc 14:15 14:21>
+Storage.cpp INFO: field: A::count <input.cc 17:13 17:17>
+Storage.cpp INFO: class: B <input.cc 20:7 20:7>
+Storage.cpp INFO: inheritance: B : A <input.cc 21:4 21:11>
+Storage.cpp INFO: method: B::process <input.cc 24:15 24:21>
+Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
+Storage.cpp INFO: type usage: B::process -> int <input.cc 26:3 26:5>
+Storage.cpp INFO: function: main <input.cc 30:5 30:8>
+Storage.cpp INFO: type usage: main -> B <input.cc 32:2 32:2>
+Storage.cpp INFO: call: main -> B::B <input.cc 32:4 32:4>
+Storage.cpp INFO: call: main -> A::getCount <input.cc 34:9 34:21>
 Storage.cpp INFO: file: input.cc < 0:0 0:0>
 Storage.cpp INFO: class: A <input.cc 1:7 1:7>
 Storage.cpp INFO: method: A::A <input.cc 4:2 4:2>
@@ -20,42 +43,19 @@ Storage.cpp INFO: call: _main_ -> B::B <input.cc 36:4 36:4>
 Storage.cpp INFO: call: _main_ -> A::getCount <input.cc 38:9 38:21>
 SearchMatch.cpp INFO: 
 1 matches for "_main_":
-755	_main_
+931	_main_
 	^^^^^^
 
 SearchMatch.cpp INFO: 
 1 matches for "_main_":
-755	_main_
+931	_main_
 	^^^^^^
 
 SearchMatch.cpp INFO: 
 1 matches for "A::A":
-237	A::A
+190	A::A
 	^^^^
 
-Storage.cpp INFO: file: input.cc < 0:0 0:0>
-Storage.cpp INFO: class: A <input.cc 1:7 1:7>
-Storage.cpp INFO: method: A::A <input.cc 4:2 4:2>
-Storage.cpp INFO: global usage: A::A -> A::count <input.cc 5:3 5:7>
-Storage.cpp INFO: method: A::getCount <input.cc 8:13 8:20>
-Storage.cpp INFO: global usage: A::getCount -> A::count <input.cc 10:10 10:14>
-Storage.cpp INFO: method: A::process <input.cc 14:15 14:21>
-Storage.cpp INFO: field: A::count <input.cc 17:13 17:17>
-Storage.cpp INFO: class: B <input.cc 20:7 20:7>
-Storage.cpp INFO: inheritance: B : A <input.cc 21:4 21:11>
-Storage.cpp INFO: method: B::process <input.cc 24:15 24:21>
-Storage.cpp INFO: override: A::process -> B::process < 0:0 0:0>
-Storage.cpp INFO: type usage: B::process -> int <input.cc 26:3 26:5>
-Storage.cpp INFO: function: main <input.cc 30:5 30:8>
-Storage.cpp INFO: type usage: main -> B <input.cc 32:2 32:2>
-Storage.cpp INFO: call: main -> B::B <input.cc 32:4 32:4>
-Storage.cpp INFO: call: main -> A::getCount <input.cc 34:9 34:21>
-Token.cpp ERROR: Location Id was not referenced by this Token.
-Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
-Edge.cpp ERROR: Nodes are not plain copies.
-Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
-Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
-Edge.cpp ERROR: Edge usage can't go from Node undefined to Node undefined
 Settings.cpp WARNING: File for Settings not found.
 ConfigManager.cpp ERROR: value Bool is not present in config.
 ConfigManager.cpp ERROR: value Int is not present in config.
@@ -71,7 +71,6 @@ ConfigManager.cpp ERROR: value Int is not present in config.
 ConfigManager.cpp ERROR: value Float is not present in config.
 ConfigManager.cpp ERROR: value String is not present in config.
 ConfigManager.cpp ERROR: value NewBool is not present in config.
-Graph.cpp ERROR: Can't remove member edge, without removing the child node.
 Storage.cpp INFO: typedef: type -> int <file.cpp 1:1 1:1>
 Storage.cpp INFO: class: Class <file.cpp 1:1 1:1>
 Storage.cpp INFO: struct: Struct <file.cpp 1:1 1:1>
@@ -136,6 +135,7 @@ Storage.cpp INFO: file: file.h < 0:0 0:0>
 Storage.cpp INFO: file: file.cpp < 0:0 0:0>
 Storage.cpp INFO: include: f.h <file.cpp 1:0 1:0>
 Storage.cpp INFO: include: file.h <file.cpp 1:0 1:0>
+Graph.cpp ERROR: Can't remove member edge, without removing the child node.
 TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8

src/lib/data/search/SearchNode.cpp

@@ -348,10 +348,10 @@ std::pair<size_t, size_t> SearchNode::fuzzyMatch(
 		char c = m_name[i];
 		if (tolower(query[pos]) == tolower(c))
 		{
-			weight += std::max<size_t>(100 - size - i, 1);
+			weight += std::max<size_t>(100 / sqrt(size + i + 1), 1);
 			if (matchCount)
 			{
-				weight += matchCount * 10;
+				weight += matchCount * matchCount * 10;
 			}
 			else if (i == 0 || lastChar == '_' || tolower(c) != c)
 			{

src/test/SearchIndexTestSuite.h

@@ -223,12 +223,12 @@ public:
 	{
 		SearchIndex index;
 		index.addNode(utility::splitToVector("oaabbcc", "::"));
-		index.addNode(utility::splitToVector("ocbaabc", "::"));
+		index.addNode(utility::splitToVector("ocbcabc", "::"));
 
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("abc");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("ocbaabc", matches[0].fullName);
+		TS_ASSERT_EQUALS("ocbcabc", matches[0].fullName);
 		TS_ASSERT_EQUALS("oaabbcc", matches[1].fullName);
 	}