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

[features] No copy versions of feature counts functions

Browse Source
This commit is contained in:
Al
2016-01-05 16:39:50 -05:00
parent a740417cab
commit 6e1435ac48
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/features.c
View File

@@ -26,13 +26,20 @@ void feature_array_add_printf(cstring_array *features, char *format, ...) {
} }
bool feature_counts_update_or_add(khash_t(str_double) *features, char *feature, double count, bool add) { bool feature_counts_update_or_add(khash_t(str_double) *features, char *feature, double count, bool copy, bool add) {
khiter_t k; khiter_t k;
k = kh_get(str_double, features, feature); char *str;
if (copy) {
str = strdup(feature);
} else {
str = feature;
}
k = kh_get(str_double, features, str);
if (k == kh_end(features)) { if (k == kh_end(features)) {
int ret; int ret;
k = kh_put(str_double, features, feature, &ret); k = kh_put(str_double, features, str, &ret);
if (ret < 0) return false; if (ret < 0) return false;
kh_value(features, k) = count; kh_value(features, k) = count;
@@ -46,9 +53,17 @@ bool feature_counts_update_or_add(khash_t(str_double) *features, char *feature,
inline bool feature_counts_add(khash_t(str_double) *features, char *feature, double count) { inline bool feature_counts_add(khash_t(str_double) *features, char *feature, double count) {
return feature_counts_update_or_add(features, feature, count, true); return feature_counts_update_or_add(features, feature, count, true, true);
}
inline bool feature_counts_add_no_copy(khash_t(str_double) *features, char *feature, double count) {
return feature_counts_update_or_add(features, feature, count, false, true);
} }
inline bool feature_counts_update(khash_t(str_double) *features, char *feature, double count) { inline bool feature_counts_update(khash_t(str_double) *features, char *feature, double count) {
return feature_counts_update_or_add(features, feature, count, false); return feature_counts_update_or_add(features, feature, count, true, false);
}
inline bool feature_counts_update_no_copy(khash_t(str_double) *features, char *feature, double count) {
return feature_counts_update_or_add(features, feature, count, false, false);
} }

2
src/features.h
View File

@@ -18,7 +18,9 @@ void feature_array_add_printf(cstring_array *features, char *format, ...);
// Add feature count to dictionary // Add feature count to dictionary
bool feature_counts_add(khash_t(str_double) *features, char *feature, double count); bool feature_counts_add(khash_t(str_double) *features, char *feature, double count);
bool feature_counts_add_no_copy(khash_t(str_double) *features, char *feature, double count);
bool feature_counts_update(khash_t(str_double) *features, char *feature, double count); bool feature_counts_update(khash_t(str_double) *features, char *feature, double count);
bool feature_counts_update_no_copy(khash_t(str_double) *features, char *feature, double count);
VECTOR_INIT(feature_count_array, khash_t(str_double) *) VECTOR_INIT(feature_count_array, khash_t(str_double) *)