add: linear activation added

3 files changed, 40 insertions, 9 deletions

diff --git a/tests/architectures/sine.cfg b/tests/architectures/sine.cfg
new file mode 100644
index 0000000..6b0c23f
--- /dev/null
+++ b/tests/architectures/sine.cfg
@@ -0,0 +1,20 @@
+[net]
+loss = square ; options (square)
+epochs = 1000 ; comment
+alpha = 1e-4
+weights_path = data/sine.bin
+inputs = x
+labels = y
+
+; activation options (relu, sigmoid, softplus, leaky_relu)
+
+[layer]
+neurons=20
+activation=leaky_relu
+
+[layer]
+neurons=20
+activation=sigmoid
+
+[outlayer]
+activation=linear
diff --git a/tests/main.sh b/tests/main.sh
index 7224f79..3cec06e 100644
--- a/tests/main.sh
+++ b/tests/main.sh
@@ -4,7 +4,7 @@ echo '-----------------'
 gnuplot tests/plots.gpi
 echo ''
 
-echo 'Benchmark test'
-echo '-------------------'
-time ./ml train -c tests/architectures/big_nn.cfg data/gauss2d.json > /dev/null
-echo ''
+#echo 'Benchmark test'
+#echo '-------------------'
+#time ./ml train -c tests/architectures/big_nn.cfg data/gauss2d.json > /dev/null
+#echo ''
diff --git a/tests/plots.gpi b/tests/plots.gpi
index 85fbf98..4fd11b0 100644
--- a/tests/plots.gpi
+++ b/tests/plots.gpi
@@ -11,10 +11,12 @@ predict_cmd = "<./ml predict %s -c %s | ".sprintf(json2tsv, "-")
 # --
 data_gauss1d = "data/gauss1d.json"
 data_xor = "data/xor.json"
+data_sine = "data/sine.json"
 
 # --
 arch_gauss1d = "tests/architectures/gauss1d.cfg"
 arch_xor = "tests/architectures/xor.cfg"
+arch_sine = "tests/architectures/sine.cfg"
 
 
 set ylabel arch_gauss1d
@@ -26,12 +28,21 @@ unset ylabel
 plot sprintf(predict_cmd, data_gauss1d, arch_gauss1d) with lines title 'network',\
      "<".sprintf(json2tsv, data_gauss1d) with lines title 'original'
 
-set ylabel arch_xor
+#set ylabel arch_xor
+#set logscale x
+#plot sprintf(train_cmd, data_xor, arch_xor) u 2:4 with lines title 'loss'
+#unset logscale
+#unset ylabel
+#
+#set table "/dev/stdout"
+#plot "<".sprintf(json2tsv, data_xor) using 1:2:3 with table,\
+#     sprintf(predict_cmd, data_xor, arch_xor)  using 3 with table
+
+set ylabel arch_sine
 set logscale x
-plot sprintf(train_cmd, data_xor, arch_xor) u 2:4 with lines title 'loss'
+plot sprintf(train_cmd, data_sine, arch_sine) u 2:4 with lines title 'loss'
 unset logscale
 unset ylabel
 
-set table "/dev/stdout" 
-plot "<".sprintf(json2tsv, data_xor) using 1:2:3 with table,\
-     sprintf(predict_cmd, data_xor, arch_xor)  using 3 with table
+plot sprintf(predict_cmd, data_sine, arch_sine) with lines title 'network',\
+     "<".sprintf(json2tsv, data_sine) with lines title 'original'