diff options
| author | Gertjan van den Burg <burg@ese.eur.nl> | 2014-03-21 16:09:34 +0100 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2014-05-19 22:39:28 -0700 |
| commit | 45ebfa383f3416cd99ada5355df1e3cc5ff9b141 (patch) | |
| tree | 64502eb16f648f2965ed8c88f2fb6857d0887d02 /src/crossval.c | |
| parent | work on regularization term with nonlinearity (diff) | |
| download | gensvm-45ebfa383f3416cd99ada5355df1e3cc5ff9b141.tar.gz gensvm-45ebfa383f3416cd99ada5355df1e3cc5ff9b141.zip | |
reached basic functionality of nonlinear training and grid search
Diffstat (limited to 'src/crossval.c')
| -rw-r--r-- | src/crossval.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/crossval.c b/src/crossval.c index 10e3051..09bd377 100644 --- a/src/crossval.c +++ b/src/crossval.c @@ -110,8 +110,8 @@ void msvmmaj_get_tt_split(struct MajData *full_data, struct MajData *train_data, train_data->y = Calloc(long, train_n); test_data->y = Calloc(long, test_n); - train_data->Z = Calloc(double, train_n*(m+1)); - test_data->Z = Calloc(double, test_n*(m+1)); + train_data->RAW = Calloc(double, train_n*(m+1)); + test_data->RAW = Calloc(double, test_n*(m+1)); k = 0; l = 0; @@ -119,17 +119,20 @@ void msvmmaj_get_tt_split(struct MajData *full_data, struct MajData *train_data, if (cv_idx[i] == fold_idx) { test_data->y[k] = full_data->y[i]; for (j=0; j<m+1; j++) - matrix_set(test_data->Z, m+1, k, j, - matrix_get(full_data->Z, m+1, + matrix_set(test_data->RAW, m+1, k, j, + matrix_get(full_data->RAW, m+1, i, j)); k++; } else { train_data->y[l] = full_data->y[i]; for (j=0; j<m+1; j++) - matrix_set(train_data->Z, m+1, l, j, - matrix_get(full_data->Z, m+1, + matrix_set(train_data->RAW, m+1, l, j, + matrix_get(full_data->RAW, m+1, i, j)); l++; } } + + train_data->Z = train_data->RAW; + test_data->Z = test_data->RAW; } |