From 45ebfa383f3416cd99ada5355df1e3cc5ff9b141 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <burg@ese.eur.nl>
Date: Fri, 21 Mar 2014 16:09:34 +0100
Subject: reached basic functionality of nonlinear training and grid search

---
 src/msvmmaj_io.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/msvmmaj_io.c')

diff --git a/src/msvmmaj_io.c b/src/msvmmaj_io.c
index fc7cc56..8a09b3d 100644
--- a/src/msvmmaj_io.c
+++ b/src/msvmmaj_io.c
@@ -56,12 +56,12 @@ void msvmmaj_read_data(struct MajData *dataset, char *data_file)
 	nr += fscanf(fid, "%ld", &m);
 
 	// Allocate memory
-	dataset->Z = Malloc(double, n*(m+1));
+	dataset->RAW = Malloc(double, n*(m+1));
 
 	// Read first line of data
 	for (j=1; j<m+1; j++) {
 		nr += fscanf(fid, "%lf", &value);
-		matrix_set(dataset->Z, n, 0, j, value);
+		matrix_set(dataset->RAW, n, 0, j, value);
 	}
 
 	// Check if there is a label at the end of the line
@@ -81,7 +81,7 @@ void msvmmaj_read_data(struct MajData *dataset, char *data_file)
 	for (i=1; i<n; i++) {
 		for (j=1; j<m+1; j++) {
 			nr += fscanf(fid, "%lf", &value);
-			matrix_set(dataset->Z, m+1, i, j, value);
+			matrix_set(dataset->RAW, m+1, i, j, value);
 		}
 		if (dataset->y != NULL) {
 			nr += fscanf(fid, "%lf", &value);
@@ -112,11 +112,12 @@ void msvmmaj_read_data(struct MajData *dataset, char *data_file)
 	
 	// Set the column of ones
 	for (i=0; i<n; i++)
-		matrix_set(dataset->Z, m+1, i, 0, 1.0);
+		matrix_set(dataset->RAW, m+1, i, 0, 1.0);
 
 	dataset->n = n;
 	dataset->m = m;
 	dataset->K = K;
+	dataset->Z = dataset->RAW;
 }
 
 
-- 
cgit v1.2.3