From c3edde20d385614f0016b74e03575344b7c5081a Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 3 Nov 2016 15:55:03 +0100 Subject: prepare for gridsearch unit testing --- src/GenSVMgrid.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/GenSVMgrid.c') 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:")) { -- cgit v1.2.3