diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2014-08-18 15:59:44 +0200 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2014-08-18 15:59:44 +0200 |
| commit | bba8d185d3f5119ff610aed3ff3b540839fa827f (patch) | |
| tree | a6267307d2a3576859e9b2096125e1ac36fb4a21 | |
| parent | forgot to set pointers to NULL and free some stuff (diff) | |
| download | gensvm-bba8d185d3f5119ff610aed3ff3b540839fa827f.tar.gz gensvm-bba8d185d3f5119ff610aed3ff3b540839fa827f.zip | |
read matrix from RAW instead of Z, as it should be
| -rw-r--r-- | src/msvmmaj_kernel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/msvmmaj_kernel.c b/src/msvmmaj_kernel.c index edcd68f..fc00c4e 100644 --- a/src/msvmmaj_kernel.c +++ b/src/msvmmaj_kernel.c @@ -92,8 +92,8 @@ void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data) for (i=0; i<n; i++) { for (j=i; j<n; j++) { - x1 = &data->Z[i*(data->m+1)+1]; - x2 = &data->Z[j*(data->m+1)+1]; + x1 = &data->RAW[i*(data->m+1)+1]; + x2 = &data->RAW[j*(data->m+1)+1]; if (model->kerneltype == K_POLY) value = msvmmaj_compute_poly(x1, x2, model->kernelparam, data->m); @@ -130,6 +130,8 @@ void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data) } // Set the regularization matrix (change if not full rank used) + if (data->J != NULL) + free(data->J); data->J = Calloc(double, data->m+1); for (i=1; i<data->m+1; i++) { value = 1.0/matrix_get(Sigma, 1, i-1, 0); |