tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[expansion] using easier-to-access data structure for address dictionaries

Browse Source
This commit is contained in:
Al
2016-11-27 00:56:20 -08:00
parent 7de2aa21cd
commit eea11beb6a
4 changed files with 160 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/address_dictionary_builder.c
View File

@@ -58,7 +58,7 @@ int main(int argc, char **argv) {
for (int j = lang_index.index; j < lang_index.index + lang_index.len; j++) {
address_expansion_rule_t expansion_rule = expansion_rules[j];
uint16_t address_components = 0;
uint32_t address_components = 0;
address_expansion_t expansion;
expansion.separable = 0;
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
log_error("Invalid dictionary_type: %d\n", dictionary_id);
exit(EXIT_FAILURE);
}
address_components |= (uint16_t) kh_value(dictionary_components, k);
address_components |= kh_value(dictionary_components, k);
}
char *canonical = NULL;
@@ -104,7 +104,7 @@ int main(int argc, char **argv) {
if (k != kh_end(phrase_address_components)) {
uint32_t val = kh_value(phrase_address_components, k);
expansion.address_components = (uint16_t)val;
expansion.address_components = val;
} else {
expansion.address_components = address_components;
}