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

[language_classification] Making directory optional on language_classifier client/test program

Browse Source
This commit is contained in:
Al
2016-01-27 03:18:53 -05:00
parent c770468d03
commit 71c51f2e45
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/language_classifier_cli.c
View File

@@ -7,14 +7,20 @@
int main(int argc, char **argv) { int main(int argc, char **argv) {
if (argc < 3) { if (argc < 2) {
printf("Usage: ./language_classifier dir address\n"); printf("Usage: ./language_classifier [dir] address\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
char *dir = argv[1]; char *dir = LIBPOSTAL_LANGUAGE_CLASSIFIER_DIR;
char *address = strdup(argv[2]); char *address = NULL;
printf("address=%s\n", address);
if (argc >= 3) {
dir = argv[1];
address = strdup(argv[2]);
} else {
address = strdup(argv[1]);
}
if (!address_dictionary_module_setup(NULL) || !language_classifier_module_setup(dir)) { if (!address_dictionary_module_setup(NULL) || !language_classifier_module_setup(dir)) {
log_error("Could not load language classifiers\n"); log_error("Could not load language classifiers\n");

16
src/language_classifier_test.c
View File

@@ -64,15 +64,25 @@ double test_accuracy(char *filename) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
if (argc < 3) { if (argc < 2) {
log_error("Usage: language_classifier_test dir filename\n"); log_error("Usage: language_classifier_test [dir] filename\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
char *dir = LIBPOSTAL_LANGUAGE_CLASSIFIER_DIR;
char *filename = NULL;
if (argc >= 3) {
dir = argv[1];
filename = argv[2];
} else {
filename = argv[1];
}
if (!language_classifier_module_setup(argv[1]) || !address_dictionary_module_setup(NULL)) { if (!language_classifier_module_setup(argv[1]) || !address_dictionary_module_setup(NULL)) {
log_error("Error setting up classifier\n"); log_error("Error setting up classifier\n");
} }
double accuracy = test_accuracy(argv[2]); double accuracy = test_accuracy(filename);
log_info("Done. Accuracy: %f\n", accuracy); log_info("Done. Accuracy: %f\n", accuracy);
} }