aboutsummaryrefslogtreecommitdiff
path: root/src/GenSVMgrid.c
diff options
context:
space:
mode:
authorGertjan van den Burg <burg@ese.eur.nl>2016-11-03 15:55:03 +0100
committerGertjan van den Burg <burg@ese.eur.nl>2016-11-03 15:55:03 +0100
commitc3edde20d385614f0016b74e03575344b7c5081a (patch)
tree314d386874ea60dccf8e111fa856bac06c9f656a /src/GenSVMgrid.c
parentupdate copyright information (diff)
downloadgensvm-c3edde20d385614f0016b74e03575344b7c5081a.tar.gz
gensvm-c3edde20d385614f0016b74e03575344b7c5081a.zip
prepare for gridsearch unit testing
Diffstat (limited to 'src/GenSVMgrid.c')
-rw-r--r--src/GenSVMgrid.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/GenSVMgrid.c b/src/GenSVMgrid.c
index 9b2b22c..681b90c 100644
--- a/src/GenSVMgrid.c
+++ b/src/GenSVMgrid.c
@@ -40,6 +40,7 @@
#include "gensvm_cmdarg.h"
#include "gensvm_io.h"
#include "gensvm_gridsearch.h"
+#include "gensvm_consistency.h"
#define MINARGS 2
@@ -111,11 +112,11 @@ int main(int argc, char **argv)
srand(time(NULL));
note("Starting training\n");
- start_training(q);
+ gensvm_train_queue(q);
note("Training finished\n");
if (grid->repeats > 0) {
- consistency_repeats(q, grid->repeats, grid->traintype);
+ gensvm_consistency_repeats(q, grid->repeats, grid->percentile);
}
gensvm_free_queue(q);
@@ -279,6 +280,13 @@ void read_grid_from_file(char *input_filename, struct GenGrid *grid)
fprintf(stderr, "Field \"repeats\" only "
"takes one value. Additional "
"fields are ignored.\n");
+ } else if (str_startswith(buffer, "percentile:")) {
+ nr = all_doubles_str(buffer, 11, params);
+ grid->percentile = params[0];
+ if (nr > 1)
+ fprintf(stderr, "Field \"percentile\" only "
+ "takes one value. Additional "
+ "fields are ignored.\n");
} else if (str_startswith(buffer, "kernel:")) {
grid->kerneltype = parse_kernel_str(buffer);
} else if (str_startswith(buffer, "gamma:")) {