diff options
| author | Gertjan van den Burg <burg@ese.eur.nl> | 2014-03-21 16:09:34 +0100 |
|---|---|---|
| committer | Gertjan van den Burg <burg@ese.eur.nl> | 2014-03-21 16:09:34 +0100 |
| commit | 4d3da10ae516f218d33bde539a575c969d0c8423 (patch) | |
| tree | 5e0b27c583c4e3acf268e08527b6190087f28675 /src/msvmmaj_io.c | |
| parent | work on regularization term with nonlinearity (diff) | |
| download | gensvm-4d3da10ae516f218d33bde539a575c969d0c8423.tar.gz gensvm-4d3da10ae516f218d33bde539a575c969d0c8423.zip | |
reached basic functionality of nonlinear training and grid search
Diffstat (limited to 'src/msvmmaj_io.c')
| -rw-r--r-- | src/msvmmaj_io.c | 9 |
1 files changed, 5 insertions, 4 deletions
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; } |