tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with Trie search

Browse Source 
Exact matches were not being returned first in the array of results

Signed-off-by: Terry Yiu <git@tyiu.xyz>
Reviewed-by: William Casarin <jb55@jb55.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Terry Yiu
2023-07-03 16:32:18 -04:00
committed by William Casarin
parent 7d49d3d9f1
commit 0c0c58c0cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/Models/Trie.swift
View File

@@ -50,18 +50,18 @@ extension Trie {
} }
// Perform breadth-first search from matching branch and collect values from all descendants. // Perform breadth-first search from matching branch and collect values from all descendants.
var exactMatches = Set<V>() let exactMatches = Array(currentNode.exactMatchValues)
var substringMatches = Set<V>() var substringMatches = Set<V>(currentNode.substringMatchValues)
var queue = [currentNode] var queue = Array(currentNode.children.values)
while !queue.isEmpty { while !queue.isEmpty {
let node = queue.removeFirst() let node = queue.removeFirst()
exactMatches.formUnion(node.exactMatchValues) substringMatches.formUnion(node.exactMatchValues)
substringMatches.formUnion(node.substringMatchValues) substringMatches.formUnion(node.substringMatchValues)
queue.append(contentsOf: node.children.values) queue.append(contentsOf: node.children.values)
} }
return Array(exactMatches) + substringMatches return exactMatches + substringMatches
} }
/// Inserts value of type V into this trie for the specified key. This function stores all substring endings of the key, not only the key itself. /// Inserts value of type V into this trie for the specified key. This function stores all substring endings of the key, not only the key itself.