aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/msvmmaj.h2
-rw-r--r--include/msvmmaj_sv.h19
-rw-r--r--include/msvmmaj_train_dataset.h6
3 files changed, 25 insertions, 2 deletions
diff --git a/include/msvmmaj.h b/include/msvmmaj.h
index 5120087..3d04f30 100644
--- a/include/msvmmaj.h
+++ b/include/msvmmaj.h
@@ -42,6 +42,8 @@
* @param kerneltype kernel to be used in the model
* @param kernelparam pointer to the vector of kernel parameters
*
+ * @TODO
+ * change R to int, it's a binary matrix
*/
struct MajModel {
int weight_idx;
diff --git a/include/msvmmaj_sv.h b/include/msvmmaj_sv.h
new file mode 100644
index 0000000..e37ffc4
--- /dev/null
+++ b/include/msvmmaj_sv.h
@@ -0,0 +1,19 @@
+/**
+ * @file msvmmaj_sv.h
+ * @author Gertjan van den Burg
+ * @date May, 2014
+ * @brief Header file for msvmmaj_sv.c
+ *
+ * @details
+ * Contains function declarations for functions used to count support vectors.
+ *
+ */
+
+#ifndef MSVMMAJ_SV_H
+#define MSVMMAJ_SV_H
+
+#include "globals.h"
+
+long msvmmaj_num_sv(struct MajModel *model, struct MajData *data);
+
+#endif
diff --git a/include/msvmmaj_train_dataset.h b/include/msvmmaj_train_dataset.h
index ad40f55..2afcde8 100644
--- a/include/msvmmaj_train_dataset.h
+++ b/include/msvmmaj_train_dataset.h
@@ -129,11 +129,13 @@ void free_queue(struct Queue *q);
void consistency_repeats(struct Queue *q, long repeats, TrainType traintype);
-double cross_validation(struct MajModel *model, struct MajModel *seed_model,
- struct MajData *data, long folds);
+double cross_validation(struct MajModel *model, struct MajData *data,
+ long folds);
void make_model_from_task(struct Task *task, struct MajModel *model);
void copy_model(struct MajModel *from, struct MajModel *to);
+void msvmmaj_reallocate_model(struct MajModel *model, long n);
+
void print_progress_string(struct Task *task, long N);
#endif