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

[parser] Adding context struct to feature function

Browse Source
This commit is contained in:
Al
2015-09-17 05:48:00 -04:00
parent 87ed7d9a0f
commit 8a86f7ec64
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/averaged_perceptron_trainer.c
View File

@@ -1,9 +1,6 @@
#include "averaged_perceptron_trainer.h" #include "averaged_perceptron_trainer.h"
#include "klib/ksort.h" #include "klib/ksort.h"
#define START "START"
#define START2 "START2"
KSORT_INIT_STR KSORT_INIT_STR
void averaged_perceptron_trainer_destroy(averaged_perceptron_trainer_t *self) { void averaged_perceptron_trainer_destroy(averaged_perceptron_trainer_t *self) {
@@ -356,7 +353,7 @@ bool averaged_perceptron_trainer_update_counts(averaged_perceptron_trainer_t *se
return true; return true;
} }
bool averaged_perceptron_trainer_train_example(averaged_perceptron_trainer_t *self, void *tagger, cstring_array *features, ap_tagger_feature_function feature_function, tokenized_string_t *tokenized, cstring_array *labels) { bool averaged_perceptron_trainer_train_example(averaged_perceptron_trainer_t *self, void *tagger, void *context, cstring_array *features, ap_tagger_feature_function feature_function, tokenized_string_t *tokenized, cstring_array *labels) {
// Keep two tags of history in training // Keep two tags of history in training
char *prev = START; char *prev = START;
char *prev2 = START2; char *prev2 = START2;
@@ -387,7 +384,7 @@ bool averaged_perceptron_trainer_train_example(averaged_perceptron_trainer_t *se
prev2 = cstring_array_get_string(labels, prev2_id); prev2 = cstring_array_get_string(labels, prev2_id);
} }
if (!feature_function(tagger, features, tokenized, i, prev, prev2)) { if (!feature_function(tagger, context, tokenized, i, prev, prev2)) {
log_error("Could not add address parser features\n"); log_error("Could not add address parser features\n");
return false; return false;
} }

4
src/averaged_perceptron_trainer.h
View File

@@ -34,6 +34,7 @@ Link: http://www.cs.columbia.edu/~mcollins/papers/tagperc.pdf
#include <stdlib.h> #include <stdlib.h>
#include "averaged_perceptron.h" #include "averaged_perceptron.h"
#include "averaged_perceptron_tagger.h"
#include "collections.h" #include "collections.h"
#include "string_utils.h" #include "string_utils.h"
#include "tokens.h" #include "tokens.h"
@@ -51,8 +52,6 @@ KHASH_MAP_INIT_INT(class_weights, class_weight_t)
KHASH_MAP_INIT_INT(feature_class_weights, khash_t(class_weights) *) KHASH_MAP_INIT_INT(feature_class_weights, khash_t(class_weights) *)
typedef bool (*ap_tagger_feature_function)(void *, cstring_array *, tokenized_string_t *, uint32_t, char *, char *);
typedef struct averaged_perceptron_trainer { typedef struct averaged_perceptron_trainer {
uint32_t num_features; uint32_t num_features;
uint32_t num_classes; uint32_t num_classes;
@@ -72,6 +71,7 @@ uint32_t averaged_perceptron_trainer_predict(averaged_perceptron_trainer_t *self
bool averaged_perceptron_trainer_train_example(averaged_perceptron_trainer_t *self, bool averaged_perceptron_trainer_train_example(averaged_perceptron_trainer_t *self,
void *tagger, void *tagger,
void *context,
cstring_array *features, cstring_array *features,
ap_tagger_feature_function feature_function, ap_tagger_feature_function feature_function,
tokenized_string_t *tokenized, tokenized_string_t *tokenized,