restart using git

1 files changed, 16 insertions, 24 deletions

diff --git a/include/libMSVMMaj.h b/include/libMSVMMaj.h
index 3e0f25c..21efc2f 100644
--- a/include/libMSVMMaj.h
+++ b/include/libMSVMMaj.h
@@ -1,31 +1,23 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <cblas.h>
-#include <string.h>
+#ifndef LIBMSVMMAJ_H
+#define LIBMSVMMAJ_H
 
-#include "util.h"
-#include "matrix.h"
+#include "globals.h"
 
-void simplex_gen(long K, double *U);
-void category_matrix(struct Model *model, struct Data *data);
-void simplex_diff(struct Model *model, struct Data *dataset);
+// forward declarations 
+struct MajData;
+struct MajModel;
 
-void calculate_errors(struct Model *model, struct Data *data, double *ZV);
-void calculate_huber(struct Model *model);
+// function declarations
+void msvmmaj_simplex_gen(long K, double *U);
+void msvmmaj_category_matrix(struct MajModel *model, struct MajData *data);
+void msvmmaj_simplex_diff(struct MajModel *model, struct MajData *dataset);
 
-double get_msvmmaj_loss(struct Model *model, struct Data *data, double *ZV);
-void msvmmaj_update(struct Model *model, struct Data *data, 
-		double *B, double *ZAZ, double *ZAZV, double *ZAZVT);
-void step_doubling(struct Model *model);
+void msvmmaj_calculate_errors(struct MajModel *model, struct MajData *data, double *ZV);
+void msvmmaj_calculate_huber(struct MajModel *model);
 
-void main_loop(struct Model *model, struct Data *data);
+void msvmmaj_step_doubling(struct MajModel *model);
 
-int dposv(char UPLO, int N, int NRHS, double *A, int LDA, double *B, int LDB);
-
-void seed_model_V(struct Model *from_model, struct Model *to_model);
-void initialize_weights(struct Data *data, struct Model *model);
-
-void predict_labels(struct Data *data, struct Model *model, long *predy);
-double prediction_perf(struct Data *data, long *predy);
+void msvmmaj_seed_model_V(struct MajModel *from_model, struct MajModel *to_model);
+void msvmmaj_initialize_weights(struct MajData *data, struct MajModel *model);
 
+#endif