fixed conflict in msvmmaj.h

4 files changed, 2 insertions, 32 deletions

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
diff --git a/src/msvmmaj_init.c b/src/msvmmaj_init.c
index b4384be..fcad0e2 100644
--- a/src/msvmmaj_init.c
+++ b/src/msvmmaj_init.c
@@ -38,7 +38,6 @@ struct MajModel *msvmmaj_init_model()
 	model->kappa = 0.0;
 	model->weight_idx = 1;
 	model->kerneltype = K_LINEAR;
-	model->use_cholesky = false;
 
 	return model;
 }
@@ -59,7 +58,6 @@ struct MajData *msvmmaj_init_data()
 
 	// set default values
 	data->kerneltype = K_LINEAR;
-	data->use_cholesky = false;
 
 	return data;
 }	
diff --git a/src/msvmmaj_kernel.c b/src/msvmmaj_kernel.c
index 6238fc1..9b421ac 100644
--- a/src/msvmmaj_kernel.c
+++ b/src/msvmmaj_kernel.c
@@ -62,19 +62,7 @@ void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data)
 		}
 	}
 
-	// get cholesky if necessary.
-	if (model->use_cholesky == true) {
-		int status = dpotrf('L', n, K, n);
-		if (status != 0) {
-			fprintf(stderr, "Error (%i) computing Cholesky "
-					"decomposition of kernel matrix.\n",
-					status);
-			exit(0);
-		}
-		note("Got Cholesky.\n");
-	}
-
-	// copy kernel/cholesky to data
+	// copy kernel to data
 	data->Z = realloc(data->Z, n*(n+1)*(sizeof(double)));
 	for (i=0; i<n; i++) {
 		for (j=0; j<n; j++)
@@ -105,7 +93,6 @@ void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data)
 			data->kernelparam[0] = model->kernelparam[0];
 			data->kernelparam[1] = model->kernelparam[1];
 	}
-	data->use_cholesky = model->use_cholesky;
 	model->m = n;
 	free(K);
 }
diff --git a/src/trainMSVMMaj.c b/src/trainMSVMMaj.c
index 9f71325..66f6450 100644
--- a/src/trainMSVMMaj.c
+++ b/src/trainMSVMMaj.c
@@ -55,8 +55,6 @@ void exit_with_help()
 	printf("-r rho : choose the weigth specification (1 = unit, 2 = "
 			"group)\n");
 	printf("-t type: kerneltype (LINEAR=0, POLY=1, RBF=2, SIGMOID=3)\n");
-	printf("-u use_cholesky: use cholesky decomposition when using "
-			"kernels (0 = false, 1 = true). Default 0.\n");
 
 	exit(0);
 }
@@ -157,7 +155,7 @@ int main(int argc, char **argv)
 void parse_command_line(int argc, char **argv, struct MajModel *model, 
 		char *input_filename, char *output_filename, char *model_filename)
 {
-	int i, tmp;
+	int i;
 	double gamma = 1.0, 
 	       degree = 2.0, 
 	       coef = 0.0;
@@ -204,13 +202,6 @@ void parse_command_line(int argc, char **argv, struct MajModel *model,
 			case 't':
 				model->kerneltype = atoi(argv[i]);
 				break;
-			case 'u':
-				tmp = atoi(argv[i]);
-				if (!(tmp == 1 || tmp == 0)) 
-					fprintf(stderr, "Unknown value %i for"
-							" use_cholesky", tmp);
-				model->use_cholesky = (tmp == 1) ? true : false;
-				break;
 			case 'q':
 				MSVMMAJ_OUTPUT_FILE = NULL;
 				i--;