diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/msvmmaj.h | 7 | ||||
| -rw-r--r-- | include/msvmmaj_kernel.h | 6 | ||||
| -rw-r--r-- | include/msvmmaj_pred.h | 8 | ||||
| -rw-r--r-- | include/msvmmaj_train_dataset.h | 5 |
4 files changed, 19 insertions, 7 deletions
diff --git a/include/msvmmaj.h b/include/msvmmaj.h index 1dba211..3d04f30 100644 --- a/include/msvmmaj.h +++ b/include/msvmmaj.h @@ -36,8 +36,6 @@ * @param *Q pointer to the error matrix * @param *H pointer to the Huber weighted error matrix * @param *R pointer to the 0-1 auxiliary matrix - * @param *J pointer to the diagonal matrix in the - * regularization term * @param *rho pointer to the instance weight vector * @param training_error error after training has completed * @param *data_file pointer to the filename of the data @@ -65,7 +63,6 @@ struct MajModel { double *Q; double *H; double *R; - double *J; double *rho; double training_error; char *data_file; @@ -81,6 +78,8 @@ struct MajModel { * @param m number of predictors * @param *y pointer to vector of class labels * @param *Z pointer to augmented data matrix + * @param *RAW pointer to augmented raw data matrix + * @param *J pointer to regularization vector * @param kerneltype kerneltype used in MajData::Z * @param *kernelparam kernel parameters used in MajData::Z * @@ -91,6 +90,8 @@ struct MajData { long m; long *y; double *Z; + double *RAW; + double *J; KernelType kerneltype; double *kernelparam; }; diff --git a/include/msvmmaj_kernel.h b/include/msvmmaj_kernel.h index 2965c1c..d4f169a 100644 --- a/include/msvmmaj_kernel.h +++ b/include/msvmmaj_kernel.h @@ -23,7 +23,11 @@ struct MajModel; // function declarations void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data); -long msvmmaj_make_eigen(double *K, long n, double *P, double *Lambda); +long msvmmaj_make_eigen(double *K, long n, double **P, double **Lambda); + +void msvmmaj_make_crosskernel(struct MajModel *model, + struct MajData *data_train, struct MajData *data_test, + double **K2); double msvmmaj_compute_rbf(double *x1, double *x2, double *kernelparam, long n); diff --git a/include/msvmmaj_pred.h b/include/msvmmaj_pred.h index ce22b10..c274cfa 100644 --- a/include/msvmmaj_pred.h +++ b/include/msvmmaj_pred.h @@ -19,7 +19,13 @@ struct MajData; struct MajModel; // function declarations -void msvmmaj_predict_labels(struct MajData *data, struct MajModel *model, +void msvmmaj_predict_labels(struct MajData *data_test, + struct MajData *data_train, struct MajModel *model, + long *predy); +void msvmmaj_predict_labels_linear(struct MajData *data, + struct MajModel *model, long *predy); +void msvmmaj_predict_labels_kernel(struct MajData *data_test, + struct MajData *data_train, struct MajModel *model, long *predy); double msvmmaj_prediction_perf(struct MajData *data, long *perdy); diff --git a/include/msvmmaj_train_dataset.h b/include/msvmmaj_train_dataset.h index 4ee39bf..2afcde8 100644 --- a/include/msvmmaj_train_dataset.h +++ b/include/msvmmaj_train_dataset.h @@ -29,7 +29,7 @@ * @param lambda parameter for the MajModel * @param epsilon parameter for the MajModel * @param kerneltype parameter for the MajModel - * @param *kernel_param parameters for the MajModel + * @param *kernelparam parameters for the MajModel * @param *train_data pointer to the training data * @param *test_data pointer to the test data (if any) * @param performance performance after cross validation @@ -43,7 +43,7 @@ struct Task { double kappa; double lambda; double epsilon; - double *kernel_param; + double *kernelparam; struct MajData *train_data; struct MajData *test_data; double performance; @@ -137,4 +137,5 @@ 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 |