aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2014-08-18 14:19:25 +0200
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2014-08-18 14:19:25 +0200
commit32f8a34ae9520e76ec9e91455f92f44d44c1e495 (patch)
tree7031367a7b1dd0d30c6f1a9f570b75085df2ec55
parentchanges in training (diff)
downloadgensvm-32f8a34ae9520e76ec9e91455f92f44d44c1e495.tar.gz
gensvm-32f8a34ae9520e76ec9e91455f92f44d44c1e495.zip
fix length of S to take norm of
-rw-r--r--Makefile3
-rw-r--r--src/msvmmaj_pred.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6d2479e..7cefd3f 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,8 @@ lib/libmsvmmaj.a: \
@echo libmsvmmaj.a...
trainMSVMMaj: src/trainMSVMMaj.c lib/libmsvmmaj.a
- @$(CC) -o trainMSVMMaj src/trainMSVMMaj.c $(CFLAGS) $(INCLUDE) $(LIB) -lmsvmmaj $(LDFLAGS)
+ @$(CC) -o trainMSVMMaj src/trainMSVMMaj.c $(CFLAGS) $(INCLUDE) $(LIB)\
+ -lmsvmmaj $(LDFLAGS)
@echo trainMSVMMaj...
trainMSVMMajdataset: src/trainMSVMMajdataset.c lib/libmsvmmaj.a
diff --git a/src/msvmmaj_pred.c b/src/msvmmaj_pred.c
index 0c798cf..ea1ebfe 100644
--- a/src/msvmmaj_pred.c
+++ b/src/msvmmaj_pred.c
@@ -90,7 +90,7 @@ void msvmmaj_predict_labels_linear(struct MajData *data,
S[k] = matrix_get(ZV, K-1, i, k) -
matrix_get(U, K-1, j, k);
}
- norm = cblas_dnrm2(K, S, 1);
+ norm = cblas_dnrm2(K-1, S, 1);
if (norm < min_dist) {
label = j+1; // labels start counting from 1
min_dist = norm;