prepare for gridsearch unit testing

1 files changed, 8 insertions, 10 deletions

diff --git a/include/gensvm_gridsearch.h b/include/gensvm_gridsearch.h
index c4ddb98..f0be067 100644
--- a/include/gensvm_gridsearch.h
+++ b/include/gensvm_gridsearch.h
@@ -34,22 +34,20 @@
 #define GENSVM_GRIDSEARCH_H
 
 // includes
+#include "gensvm_cross_validation.h"
 #include "gensvm_cv_util.h"
-#include "gensvm_init.h"
 #include "gensvm_grid.h"
-#include "gensvm_optimize.h"
-#include "gensvm_predict.h"
 #include "gensvm_queue.h"
 #include "gensvm_timer.h"
 
 // function declarations
 void gensvm_fill_queue(struct GenGrid *grid, struct GenQueue *queue,
 		struct GenData *train_data, struct GenData *test_data);
-void consistency_repeats(struct GenQueue *q, long repeats, TrainType traintype);
-void make_model_from_task(struct GenTask *task, struct GenModel *model);
-void print_progress_string(struct GenTask *task, long N);
-void start_training(struct GenQueue *q);
-double gensvm_cross_validation(struct GenModel *model,
-	       	struct GenData **train_folds, struct GenData **test_folds,
-		int folds, long n_total);
+bool gensvm_kernel_changed(struct GenTask *newtask, struct GenTask *oldtask);
+void gensvm_kernel_folds(int folds, struct GenModel *model,
+		struct GenData **train_folds, struct GenData **test_folds);
+void gensvm_gridsearch_progress(struct GenTask *task, long N, double perf,
+		double duration, double current_max);
+void gensvm_train_queue(struct GenQueue *q);
+
 #endif