diff options
| author | Gertjan van den Burg <burg@ese.eur.nl> | 2013-08-08 14:21:38 +0200 |
|---|---|---|
| committer | Gertjan van den Burg <burg@ese.eur.nl> | 2013-08-08 14:21:38 +0200 |
| commit | 862307cff068bee98318415aa15ab920a02838a2 (patch) | |
| tree | 407a16f2ed4946c0ab67ed5737927fd3147b4b2a /include | |
| parent | changed the update to ensure instances are iterated over once (diff) | |
| download | gensvm-862307cff068bee98318415aa15ab920a02838a2.tar.gz gensvm-862307cff068bee98318415aa15ab920a02838a2.zip | |
allow seeding of V and added documentation
Diffstat (limited to 'include')
| -rw-r--r-- | include/MSVMMaj.h | 1 | ||||
| -rw-r--r-- | include/libMSVMMaj.h | 3 | ||||
| -rw-r--r-- | include/matrix.h | 12 | ||||
| -rw-r--r-- | include/util.h | 10 |
4 files changed, 15 insertions, 11 deletions
diff --git a/include/MSVMMaj.h b/include/MSVMMaj.h index fbcea8c..021a341 100644 --- a/include/MSVMMaj.h +++ b/include/MSVMMaj.h @@ -24,7 +24,6 @@ struct Model { double *H; double *R; double *rho; - double training_error; char *data_file; }; diff --git a/include/libMSVMMaj.h b/include/libMSVMMaj.h index 74f1e10..3e0f25c 100644 --- a/include/libMSVMMaj.h +++ b/include/libMSVMMaj.h @@ -3,7 +3,9 @@ #include <math.h> #include <cblas.h> #include <string.h> + #include "util.h" +#include "matrix.h" void simplex_gen(long K, double *U); void category_matrix(struct Model *model, struct Data *data); @@ -21,6 +23,7 @@ void main_loop(struct Model *model, struct Data *data); 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); diff --git a/include/matrix.h b/include/matrix.h new file mode 100644 index 0000000..4157475 --- /dev/null +++ b/include/matrix.h @@ -0,0 +1,12 @@ + +void matrix_set(double *M, long cols, long i, long j, double val); +void matrix_add(double *M, long cols, long i, long j, double val); +void matrix_mul(double *M, long cols, long i, long j, double val); + +double matrix_get(double *M, long cols, long i, long j); + +void matrix3_set(double *M, long N2, long N3, long i, long j, long k, + double val); +double matrix3_get(double *M, long N2, long N3, long i, long j, long k); + +void print_matrix(double *M, long rows, long cols); diff --git a/include/util.h b/include/util.h index ec415ac..2cf36e8 100644 --- a/include/util.h +++ b/include/util.h @@ -27,17 +27,7 @@ void info(const char *fmt,...); double rnd(); -void matrix_set(double *M, long cols, long i, long j, double val); -void matrix_add(double *M, long cols, long i, long j, double val); -void matrix_mult(double *M, long cols, long i, long j, double val); -double matrix_get(double *M, long cols, long i, long j); - -void matrix3_set(double *M, long N2, long N3, long i, long j, long k, double val); -double matrix3_get(double *M, long N2, long N3, long i, long j, long k); - void allocate_model(struct Model *model); void free_model(struct Model *model); void free_data(struct Data *data); -void print_matrix(double *M, long rows, long cols); - |