From d46dcf17b07433daabf9d4d71dd3fce582e752fb Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Mon, 19 May 2014 22:19:28 -0700 Subject: fixed conflict in msvmmaj.h --- include/msvmmaj.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/msvmmaj.h b/include/msvmmaj.h index 4e00654..ec3da6f 100644 --- a/include/msvmmaj.h +++ b/include/msvmmaj.h @@ -41,12 +41,9 @@ * @param *data_file pointer to the filename of the data * @param kerneltype kernel to be used in the model * @param kernelparam pointer to the vector of kernel parameters - * @param use_cholesky whether the Cholesky decomposition should be - * used * * @TODO * change R to int, it's a binary matrix - * */ struct MajModel { int weight_idx; @@ -71,7 +68,6 @@ struct MajModel { char *data_file; KernelType kerneltype; double *kernelparam; - bool use_cholesky; }; /** @@ -84,7 +80,6 @@ struct MajModel { * @param *Z pointer to augmented data matrix * @param kerneltype kerneltype used in MajData::Z * @param *kernelparam kernel parameters used in MajData::Z - * @param use_cholesky whether the Cholesky decomposition is used in MajData::Z * */ struct MajData { @@ -95,7 +90,6 @@ struct MajData { double *Z; KernelType kerneltype; double *kernelparam; - bool use_cholesky; }; #endif -- cgit v1.2.3