aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2017-02-21 18:47:04 -0500
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2017-02-21 18:47:51 -0500
commitc8f01c292ee608ff24477222944c12e3acef2c3c (patch)
tree91fe7151ac149803f233b770cdc9e3b943d15323
parentAllow overriding of atlas usage from environment variable (diff)
downloadgensvm-c8f01c292ee608ff24477222944c12e3acef2c3c.tar.gz
gensvm-c8f01c292ee608ff24477222944c12e3acef2c3c.zip
Bump version and update changelog
-rw-r--r--CHANGELOG.md6
-rw-r--r--Makefile2
-rw-r--r--data/paperdata.train92
-rw-r--r--tests/src/test_gensvm_io.c2
4 files changed, 100 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f2e59..81713d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Change Log
+## Version 0.1.4
+
+- Keep track of elapsed iterations during training
+- Keep a training status
+- Explicitly specify "void" as arguments to functions
+
## Version 0.1.3
- Allow max_iter to be set in the model
diff --git a/Makefile b/Makefile
index 42f6451..8e99117 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.3
+VERSION=0.1.4
CC=gcc
CFLAGS=-Wall -DVERSION=$(VERSION) -g -O3
INCLUDE= -Iinclude
diff --git a/data/paperdata.train b/data/paperdata.train
new file mode 100644
index 0000000..e4c3db2
--- /dev/null
+++ b/data/paperdata.train
@@ -0,0 +1,92 @@
+90
+2
+-0.7763157894736842 0.3026315789473684 3
+-0.8157894736842105 0.3947368421052632 3
+-0.7236842105263158 0.4473684210526316 3
+-0.7631578947368421 0.6447368421052632 3
+-0.5 0.6447368421052632 3
+-0.5 0.9342105263157895 3
+-0.2105263157894737 0.8947368421052632 3
+-0.1710526315789474 0.8026315789473685 3
+-0.4473684210526316 0.7631578947368421 3
+-0.1578947368421053 0.7236842105263158 3
+-0.07894736842105263 0.881578947368421 3
+-0.2105263157894737 1 3
+0.05263157894736842 0.9736842105263158 3
+0.09210526315789473 0.7894736842105263 3
+-0.3684210526315789 0.5789473684210527 3
+-0.5526315789473685 0.8157894736842105 3
+-0.1973684210526316 0.4736842105263158 3
+0.2368421052631579 0.6973684210526315 3
+0.3289473684210527 0.9605263157894737 3
+-0.4868421052631579 0.4342105263157895 3
+0.5 -1 3
+0.7105263157894737 -0.881578947368421 3
+0.6052631578947368 -0.7631578947368421 3
+0.618421052631579 -0.9342105263157895 3
+0.3815789473684211 -0.7763157894736842 3
+0.6447368421052632 -0.6578947368421053 3
+0.7368421052631579 -0.9078947368421053 3
+0.4736842105263158 -0.881578947368421 3
+0.8421052631578947 -0.6842105263157895 3
+0.5789473684210527 -0.5 3
+-0.3684210526315789 -0.9342105263157895 2
+-0.3026315789473684 -0.6578947368421053 2
+-0.2894736842105263 -0.4210526315789473 2
+-0.5394736842105263 -0.3421052631578947 2
+-0.9210526315789473 -0.2368421052631579 2
+-1 -0.2236842105263158 2
+-0.7894736842105263 -0.6842105263157895 2
+-0.3815789473684211 -0.7763157894736842 2
+-0.5263157894736842 -0.5526315789473685 2
+-0.8947368421052632 -0.2368421052631579 2
+-0.8947368421052632 -0.5 2
+-0.7763157894736842 -0.9078947368421053 2
+-0.03947368421052631 -0.7368421052631579 2
+-0.1578947368421053 -0.3421052631578947 2
+-0.1184210526315789 -0.2368421052631579 2
+-0.3289473684210527 -0.2105263157894737 2
+-0.5263157894736842 -0.06578947368421052 2
+-0.2368421052631579 -0.1052631578947368 2
+-0.03947368421052631 -0.06578947368421052 2
+0.06578947368421052 -0.06578947368421052 2
+0.1052631578947368 -0.3289473684210527 2
+0.25 0.02631578947368421 2
+0.2631578947368421 0.05263157894736842 2
+0.03947368421052631 0.05263157894736842 2
+0.1578947368421053 -0.2236842105263158 2
+-0.1578947368421053 -0.1842105263157895 2
+-0.6578947368421053 -0.3684210526315789 2
+-0.6578947368421053 -0.6973684210526315 2
+-0.8947368421052632 0.02631578947368421 2
+-0.9736842105263158 0.1973684210526316 2
+0.9605263157894737 -0.1842105263157895 1
+0.75 -0.1842105263157895 1
+0.881578947368421 0.2368421052631579 1
+0.6842105263157895 0.2236842105263158 1
+0.7236842105263158 0.4078947368421053 1
+0.7631578947368421 0.4736842105263158 1
+0.3552631578947368 0.3421052631578947 1
+0.618421052631579 0.4736842105263158 1
+0.618421052631579 0.6052631578947368 1
+0.5394736842105263 0.3289473684210527 1
+0.7368421052631579 0.09210526315789473 1
+0.9078947368421053 0.02631578947368421 1
+0.7105263157894737 -0.2763157894736842 1
+0.5263157894736842 -0.2236842105263158 1
+0.8552631578947368 -0.4342105263157895 1
+0.5789473684210527 0.03947368421052631 1
+0.6973684210526315 -0.7236842105263158 1
+0.8157894736842105 -0.25 1
+0.4868421052631579 -0.2894736842105263 1
+0.4868421052631579 0.02631578947368421 1
+0.1447368421052632 0.4868421052631579 1
+0.4342105263157895 0.5526315789473685 1
+0.4605263157894737 0.8421052631578947 1
+0.8421052631578947 0.7894736842105263 1
+0.2105263157894737 -0.131578947368421 1
+0.2105263157894737 0.07894736842105263 1
+0.09210526315789473 -0.0131578947368421 1
+-0.02631578947368421 0.1184210526315789 1
+0.9078947368421053 0.3552631578947368 1
+1 0.1052631578947368 1
diff --git a/tests/src/test_gensvm_io.c b/tests/src/test_gensvm_io.c
index 72cdd04..bf9746f 100644
--- a/tests/src/test_gensvm_io.c
+++ b/tests/src/test_gensvm_io.c
@@ -654,7 +654,7 @@ char *test_gensvm_write_model()
char buffer[GENSVM_MAX_LINE_LENGTH];
fgets(buffer, GENSVM_MAX_LINE_LENGTH, fid);
- mu_assert(strcmp(buffer, "Output file for GenSVM (version 0.1.3)\n")
+ mu_assert(strcmp(buffer, "Output file for GenSVM (version 0.1.4)\n")
== 0, "Line doesn't contain expected content (0).\n");
// skip the time line