[mv] Moving trie_new_from_hash to a module

This commit is contained in:
Al
2016-01-05 16:43:17 -05:00
parent 33e9a05ebf
commit 22668945cb
5 changed files with 111 additions and 47 deletions

View File

@@ -102,52 +102,6 @@ trie_t *trie_new(void) {
return trie_new_alphabet(DEFAULT_ALPHABET, sizeof(DEFAULT_ALPHABET));
}
/*
Build a trie from the sorted keys of a hashtable. Adding
keys in sorted order to a double-array trie is faster than
adding them in random order.
*/
trie_t *trie_new_from_hash(khash_t(str_uint32) *hash) {
trie_t *trie = trie_new();
const char *key;
uint32_t value;
string_array *hash_keys = string_array_new_size(kh_size(hash));
kh_foreach(hash, key, value, {
if (strlen(key) == 0) continue;
string_array_push(hash_keys, (char *)key);
})
ks_introsort(str, hash_keys->n, (const char **)hash_keys->a);
khiter_t k;
for (int i = 0; i < hash_keys->n; i++) {
char *str = hash_keys->a[i];
k = kh_get(str_uint32, hash, str);
if (k == kh_end(hash)) {
log_error("Key not found\n");
string_array_destroy(hash_keys);
trie_destroy(trie);
return NULL;
}
value = kh_value(hash, k);
if (!trie_add(trie, str, value)) {
log_error("Error adding to trie\n");
string_array_destroy(hash_keys);
trie_destroy(trie);
return NULL;
}
}
string_array_destroy(hash_keys);
return trie;
}
inline bool trie_node_is_free(trie_node_t node) {
return node.check < 0;
}