[libfann] 145/242: updated benchmarks to include new training algorithms
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
chrisk-guest pushed a commit to tag Version2_0_0
in repository libfann.
commit 63f8633f24e8ff6b5c2617cf426cfcf613e42a9d
Author: Steffen Nissen <lukesky at diku.dk>
Date: Fri Jun 25 21:59:08 2004 +0000
updated benchmarks to include new training algorithms
---
benchmarks/Makefile | 2 +-
benchmarks/benchmark.sh | 166 ++++++++----------
benchmarks/gnuplot | 417 ++++++++++++++++++++++++++-------------------
benchmarks/quality.cc | 66 +++++--
benchmarks/quality_fixed.c | 4 +
5 files changed, 368 insertions(+), 287 deletions(-)
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 66d5ab2..187e83f 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -31,4 +31,4 @@ shuffle: shuffle.c
$(GCC) $(CFLAGS) $(LFLAGS) $< -o $@ -lfloatfann
clean:
- rm -rf $(TARGETS) *.net *.out *_fixed_test_* *_fixed_train_*
+ rm -rf $(TARGETS) *.net *.out *_fixed_test_* *_fixed_train_* *~
diff --git a/benchmarks/benchmark.sh b/benchmarks/benchmark.sh
index 5e3a274..23767a3 100755
--- a/benchmarks/benchmark.sh
+++ b/benchmarks/benchmark.sh
@@ -1,105 +1,73 @@
#!/bin/sh
+
+seconds_training=1000;
+secs_between_reports=1;
+
+function benchmark_algorithm() {
+ ./quality $algo datasets/$prob.train datasets/$prob.test $prob.$algo.train.out $prob.$algo.test.out $n1 $n2 $seconds_training $secs_between_reports
+}
+
+function benchmark_problem() {
+ rm -f *_fixed.net
+ algo="fann_rprop"; benchmark_algorithm;
+ ./quality_fixed $prob.$algo.train.out_fixed_train $prob.$algo.train.out_fixed_test $prob.$algo.fixed_train.out $prob.$algo.fixed_test.out *_fixed.net
+ algo="fann_rprop_stepwise"; benchmark_algorithm;
+ algo="fann_quickprop"; benchmark_algorithm;
+ #algo="fann_quickprop_stepwise"; benchmark_algorithm;
+ algo="fann_batch"; benchmark_algorithm;
+ #algo="fann_batch_stepwise"; benchmark_algorithm;
+ algo="fann_incremental"; benchmark_algorithm;
+ #algo="fann_incremental_stepwise"; benchmark_algorithm;
+
+ #comment out two following lines if the libraries are not available
+ algo="lwnn"; benchmark_algorithm;
+ algo="jneural"; benchmark_algorithm;
+}
+
+#comment out some of the lines below if some of the problems should not be benchmarked
+
+prob="building"; n1=16; n2=0;
+benchmark_problem;
+exit 1;
+prob="cancer"; n1=8; n2=4;
+benchmark_problem;
+
+prob="card"; n1=32; n2=0;
+benchmark_problem;
+
+prob="diabetes"; n1=4; n2=0;
+benchmark_problem;
+
+prob="flare"; n1=4; n2=0;
+benchmark_problem;
+
+prob="gene"; n1=4; n2=2;
+benchmark_problem;
+
+prob="glass"; n1=32; n2=0;
+benchmark_problem;
+
+prob="heart"; n1=16; n2=8;
+benchmark_problem;
+
+prob="horse"; n1=4; n2=4;
+benchmark_problem;
+
+prob="mushroom"; n1=32; n2=0;
+benchmark_problem;
+
+prob="robot"; n1=96; n2=0;
+benchmark_problem;
+
+prob="soybean"; n1=16; n2=8;
+benchmark_problem;
+
+prob="thyroid"; n1=16; n2=8;
+benchmark_problem;
+
./performance fann fann_performance.out 1 2048 2 20
./performance fann_stepwise fann_stepwise_performance.out 1 2048 2 20
./performance_fixed fann fann_fixed_performance.out 1 2048 2 20
./performance lwnn lwnn_performance.out 1 2048 2 20
-./performance jneural jneural_performance.out 1 512 2 20
-
-#./performance_arm fann fann_performance_arm.out 1 512 2 20
-#./performance_arm fann_noopt fann_noopt_performance_arm.out 1 512 2 20
-#./performance_arm fann_thres fann_thres_performance_arm.out 1 512 2 20
-#./performance_fixed_arm fann fann_fixed_performance_arm.out 1 512 2 20
-#./performance_arm lwnn lwnn_performance_arm.out 1 512 2 20
-#./performance_arm jneural jneural_performance_arm.out 1 512 2 20
-
-rm -f *_fixed.net
-./quality fann datasets/building.train datasets/building.test building_fann_train.out building_fann_test.out 16 0 200 1
-./quality_fixed building_fann_train.out_fixed_train building_fann_train.out_fixed_test building_fann_fixed_train.out building_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/building.train datasets/building.test building_fann_stepwise_train.out building_fann_stepwise_test.out 16 0 200 1
-./quality lwnn datasets/building.train datasets/building.test building_lwnn_train.out building_lwnn_test.out 16 0 200 1
-./quality jneural datasets/building.train datasets/building.test building_jneural_train.out building_jneural_test.out 16 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/cancer.train datasets/cancer.test cancer_fann_train.out cancer_fann_test.out 8 4 200 1
-./quality_fixed cancer_fann_train.out_fixed_train cancer_fann_train.out_fixed_test cancer_fann_fixed_train.out cancer_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/cancer.train datasets/cancer.test cancer_fann_stepwise_train.out cancer_fann_stepwise_test.out 8 4 200 1
-./quality lwnn datasets/cancer.train datasets/cancer.test cancer_lwnn_train.out cancer_lwnn_test.out 8 4 200 1
-./quality jneural datasets/cancer.train datasets/cancer.test cancer_jneural_train.out cancer_jneural_test.out 8 4 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/card.train datasets/card.test card_fann_train.out card_fann_test.out 32 0 200 1
-./quality_fixed card_fann_train.out_fixed_train card_fann_train.out_fixed_test card_fann_fixed_train.out card_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/card.train datasets/card.test card_fann_stepwise_train.out card_fann_stepwise_test.out 32 0 200 1
-./quality lwnn datasets/card.train datasets/card.test card_lwnn_train.out card_lwnn_test.out 32 0 200 1
-./quality jneural datasets/card.train datasets/card.test card_jneural_train.out card_jneural_test.out 32 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/diabetes.train datasets/diabetes.test diabetes_fann_train.out diabetes_fann_test.out 8 8 200 1
-./quality_fixed diabetes_fann_train.out_fixed_train diabetes_fann_train.out_fixed_test diabetes_fann_fixed_train.out diabetes_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/diabetes.train datasets/diabetes.test diabetes_fann_stepwise_train.out diabetes_fann_stepwise_test.out 8 8 200 1
-./quality lwnn datasets/diabetes.train datasets/diabetes.test diabetes_lwnn_train.out diabetes_lwnn_test.out 8 8 200 1
-./quality jneural datasets/diabetes.train datasets/diabetes.test diabetes_jneural_train.out diabetes_jneural_test.out 8 8 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/flare.train datasets/flare.test flare_fann_train.out flare_fann_test.out 4 0 200 1
-./quality_fixed flare_fann_train.out_fixed_train flare_fann_train.out_fixed_test flare_fann_fixed_train.out flare_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/flare.train datasets/flare.test flare_fann_stepwise_train.out flare_fann_stepwise_test.out 4 0 200 1
-./quality lwnn datasets/flare.train datasets/flare.test flare_lwnn_train.out flare_lwnn_test.out 4 0 200 1
-./quality jneural datasets/flare.train datasets/flare.test flare_jneural_train.out flare_jneural_test.out 4 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/gene.train datasets/gene.test gene_fann_train.out gene_fann_test.out 4 2 200 1
-./quality_fixed gene_fann_train.out_fixed_train gene_fann_train.out_fixed_test gene_fann_fixed_train.out gene_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/gene.train datasets/gene.test gene_fann_stepwise_train.out gene_fann_stepwise_test.out 4 2 200 1
-./quality lwnn datasets/gene.train datasets/gene.test gene_lwnn_train.out gene_lwnn_test.out 4 2 200 1
-./quality jneural datasets/gene.train datasets/gene.test gene_jneural_train.out gene_jneural_test.out 4 2 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/glass.train datasets/glass.test glass_fann_train.out glass_fann_test.out 32 0 200 1
-./quality_fixed glass_fann_train.out_fixed_train glass_fann_train.out_fixed_test glass_fann_fixed_train.out glass_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/glass.train datasets/glass.test glass_fann_stepwise_train.out glass_fann_stepwise_test.out 32 0 200 1
-./quality lwnn datasets/glass.train datasets/glass.test glass_lwnn_train.out glass_lwnn_test.out 32 0 200 1
-./quality jneural datasets/glass.train datasets/glass.test glass_jneural_train.out glass_jneural_test.out 32 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/heart.train datasets/heart.test heart_fann_train.out heart_fann_test.out 16 8 200 1
-./quality_fixed heart_fann_train.out_fixed_train heart_fann_train.out_fixed_test heart_fann_fixed_train.out heart_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/heart.train datasets/heart.test heart_fann_stepwise_train.out heart_fann_stepwise_test.out 16 8 200 1
-./quality lwnn datasets/heart.train datasets/heart.test heart_lwnn_train.out heart_lwnn_test.out 16 8 200 1
-./quality jneural datasets/heart.train datasets/heart.test heart_jneural_train.out heart_jneural_test.out 16 8 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/horse.train datasets/horse.test horse_fann_train.out horse_fann_test.out 4 4 200 1
-./quality_fixed horse_fann_train.out_fixed_train horse_fann_train.out_fixed_test horse_fann_fixed_train.out horse_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/horse.train datasets/horse.test horse_fann_stepwise_train.out horse_fann_stepwise_test.out 4 4 200 1
-./quality lwnn datasets/horse.train datasets/horse.test horse_lwnn_train.out horse_lwnn_test.out 4 4 200 1
-./quality jneural datasets/horse.train datasets/horse.test horse_jneural_train.out horse_jneural_test.out 4 4 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/mushroom.train datasets/mushroom.test mushroom_fann_train.out mushroom_fann_test.out 32 0 200 1
-./quality_fixed mushroom_fann_train.out_fixed_train mushroom_fann_train.out_fixed_test mushroom_fann_fixed_train.out mushroom_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/mushroom.train datasets/mushroom.test mushroom_fann_stepwise_train.out mushroom_fann_stepwise_test.out 32 0 200 1
-./quality lwnn datasets/mushroom.train datasets/mushroom.test mushroom_lwnn_train.out mushroom_lwnn_test.out 32 0 200 1
-./quality jneural datasets/mushroom.train datasets/mushroom.test mushroom_jneural_train.out mushroom_jneural_test.out 32 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/robot.train datasets/robot.test robot_fann_train.out robot_fann_test.out 96 0 200 1
-./quality_fixed robot_fann_train.out_fixed_train robot_fann_train.out_fixed_test robot_fann_fixed_train.out robot_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/robot.train datasets/robot.test robot_fann_stepwise_train.out robot_fann_stepwise_test.out 96 0 200 1
-./quality lwnn datasets/robot.train datasets/robot.test robot_lwnn_train.out robot_lwnn_test.out 96 0 200 1
-./quality jneural datasets/robot.train datasets/robot.test robot_jneural_train.out robot_jneural_test.out 96 0 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/soybean.train datasets/soybean.test soybean_fann_train.out soybean_fann_test.out 16 8 200 1
-./quality_fixed soybean_fann_train.out_fixed_train soybean_fann_train.out_fixed_test soybean_fann_fixed_train.out soybean_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/soybean.train datasets/soybean.test soybean_fann_stepwise_train.out soybean_fann_stepwise_test.out 16 8 200 1
-./quality lwnn datasets/soybean.train datasets/soybean.test soybean_lwnn_train.out soybean_lwnn_test.out 16 8 200 1
-./quality jneural datasets/soybean.train datasets/soybean.test soybean_jneural_train.out soybean_jneural_test.out 16 8 200 1
-
-rm -f *_fixed.net
-./quality fann datasets/thyroid.train datasets/thyroid.test thyroid_fann_train.out thyroid_fann_test.out 16 8 200 1
-./quality_fixed thyroid_fann_train.out_fixed_train thyroid_fann_train.out_fixed_test thyroid_fann_fixed_train.out thyroid_fann_fixed_test.out *_fixed.net
-./quality fann_stepwise datasets/thyroid.train datasets/thyroid.test thyroid_fann_stepwise_train.out thyroid_fann_stepwise_test.out 16 8 200 1
-./quality lwnn datasets/thyroid.train datasets/thyroid.test thyroid_lwnn_train.out thyroid_lwnn_test.out 16 8 200 1
-./quality jneural datasets/thyroid.train datasets/thyroid.test thyroid_jneural_train.out thyroid_jneural_test.out 16 8 200 1
+./performance jneural jneural_performance.out 1 256 2 20
diff --git a/benchmarks/gnuplot b/benchmarks/gnuplot
index 774c5af..133834d 100644
--- a/benchmarks/gnuplot
+++ b/benchmarks/gnuplot
@@ -1,215 +1,284 @@
set terminal postscript color solid
set output "allplots.ps"
-set nologscale
set grid
+set xlabel "Number of neurons in the four layers"
+set ylabel "Nanoseconds per connection"
+
+set logscale
+#set output "performance.ps"
+set title "Performance of execution"
+plot "fann_performance.out" title "fann" with lines -1, \
+ "fann_stepwise_performance.out" title "fann (stepwise)" with lines 1, \
+ "fann_fixed_performance.out" title "fann (fix)" with lines 2, \
+ "lwnn_performance.out" title "lwnn" with lines 3, \
+ "jneural_performance.out" title "jneural" with lines 4
+
+set nologscale
+
set xlabel "Seconds of training"
set ylabel "Mean square error"
-set logscale x
+#set logscale x
#set output "building.ps"
set title "building"
-plot "building_fann_train.out" title "fann train" with lines -1, \
- "building_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "building_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "building_lwnn_train.out" title "lwnn train" with lines 3, \
- "building_jneural_train.out" title "jneural train" with lines 4, \
- "building_fann_test.out" title "fann test" with lines -1, \
- "building_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "building_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "building_lwnn_test.out" title "lwnn test" with lines 3, \
- "building_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "building.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "building.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "building.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "building.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "building.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "building.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "building.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "building.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "building.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "building.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "building.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "building.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "building.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "building.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "building.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "building.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "cancer.ps"
set title "cancer"
-plot "cancer_fann_train.out" title "fann train" with lines -1, \
- "cancer_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "cancer_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "cancer_lwnn_train.out" title "lwnn train" with lines 3, \
- "cancer_jneural_train.out" title "jneural train" with lines 4, \
- "cancer_fann_test.out" title "fann test" with lines -1, \
- "cancer_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "cancer_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "cancer_lwnn_test.out" title "lwnn test" with lines 3, \
- "cancer_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "cancer.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "cancer.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "cancer.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "cancer.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "cancer.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "cancer.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "cancer.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "cancer.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "cancer.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "cancer.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "cancer.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "cancer.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "cancer.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "cancer.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "cancer.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "cancer.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "card.ps"
set title "card"
-plot "card_fann_train.out" title "fann train" with lines -1, \
- "card_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "card_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "card_lwnn_train.out" title "lwnn train" with lines 3, \
- "card_jneural_train.out" title "jneural train" with lines 4, \
- "card_fann_test.out" title "fann test" with lines -1, \
- "card_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "card_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "card_lwnn_test.out" title "lwnn test" with lines 3, \
- "card_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "card.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "card.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "card.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "card.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "card.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "card.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "card.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "card.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "card.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "card.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "card.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "card.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "card.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "card.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "card.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "card.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "diabetes.ps"
set title "diabetes"
-plot "diabetes_fann_train.out" title "fann train" with lines -1, \
- "diabetes_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "diabetes_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "diabetes_lwnn_train.out" title "lwnn train" with lines 3, \
- "diabetes_jneural_train.out" title "jneural train" with lines 4, \
- "diabetes_fann_test.out" title "fann test" with lines -1, \
- "diabetes_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "diabetes_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "diabetes_lwnn_test.out" title "lwnn test" with lines 3, \
- "diabetes_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "diabetes.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "diabetes.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "diabetes.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "diabetes.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "diabetes.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "diabetes.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "diabetes.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "diabetes.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "diabetes.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "diabetes.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "diabetes.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "diabetes.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "diabetes.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "diabetes.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "diabetes.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "diabetes.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "flare.ps"
set title "flare"
-plot "flare_fann_train.out" title "fann train" with lines -1, \
- "flare_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "flare_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "flare_lwnn_train.out" title "lwnn train" with lines 3, \
- "flare_jneural_train.out" title "jneural train" with lines 4, \
- "flare_fann_test.out" title "fann test" with lines -1, \
- "flare_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "flare_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "flare_lwnn_test.out" title "lwnn test" with lines 3, \
- "flare_jneural_test.out" title "jneural test" with lines 4
+plot "flare.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "flare.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "flare.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "flare.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "flare.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "flare.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "flare.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "flare.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "flare.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "flare.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "flare.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "flare.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "flare.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "flare.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "flare.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "flare.jneural.test.out" title "jneural incremental test" with lines 9
+#set logscale x
#set output "gene.ps"
set title "gene"
-plot "gene_fann_train.out" title "fann train" with lines -1, \
- "gene_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "gene_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "gene_lwnn_train.out" title "lwnn train" with lines 3, \
- "gene_jneural_train.out" title "jneural train" with lines 4, \
- "gene_fann_test.out" title "fann test" with lines -1, \
- "gene_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "gene_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "gene_lwnn_test.out" title "lwnn test" with lines 3, \
- "gene_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "gene.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "gene.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "gene.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "gene.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "gene.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "gene.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "gene.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "gene.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "gene.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "gene.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "gene.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "gene.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "gene.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "gene.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "gene.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "gene.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "glass.ps"
set title "glass"
-plot "glass_fann_train.out" title "fann train" with lines -1, \
- "glass_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "glass_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "glass_lwnn_train.out" title "lwnn train" with lines 3, \
- "glass_jneural_train.out" title "jneural train" with lines 4, \
- "glass_fann_test.out" title "fann test" with lines -1, \
- "glass_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "glass_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "glass_lwnn_test.out" title "lwnn test" with lines 3, \
- "glass_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "glass.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "glass.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "glass.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "glass.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "glass.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "glass.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "glass.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "glass.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "glass.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "glass.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "glass.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "glass.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "glass.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "glass.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "glass.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "glass.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "heart.ps"
set title "heart"
-plot "heart_fann_train.out" title "fann train" with lines -1, \
- "heart_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "heart_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "heart_lwnn_train.out" title "lwnn train" with lines 3, \
- "heart_jneural_train.out" title "jneural train" with lines 4, \
- "heart_fann_test.out" title "fann test" with lines -1, \
- "heart_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "heart_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "heart_lwnn_test.out" title "lwnn test" with lines 3, \
- "heart_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "heart.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "heart.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "heart.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "heart.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "heart.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "heart.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "heart.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "heart.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "heart.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "heart.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "heart.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "heart.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "heart.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "heart.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "heart.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "heart.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "horse.ps"
set title "horse"
-plot "horse_fann_train.out" title "fann train" with lines -1, \
- "horse_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "horse_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "horse_lwnn_train.out" title "lwnn train" with lines 3, \
- "horse_jneural_train.out" title "jneural train" with lines 4, \
- "horse_fann_test.out" title "fann test" with lines -1, \
- "horse_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "horse_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "horse_lwnn_test.out" title "lwnn test" with lines 3, \
- "horse_jneural_test.out" title "jneural test" with lines 4
+plot "horse.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "horse.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "horse.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "horse.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "horse.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "horse.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "horse.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "horse.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "horse.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "horse.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "horse.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "horse.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "horse.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "horse.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "horse.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "horse.jneural.test.out" title "jneural incremental test" with lines 9
-set logscale
+#set logscale x
#set output "mushroom.ps"
set title "mushroom"
-plot "mushroom_fann_train.out" title "fann train" with lines -1, \
- "mushroom_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "mushroom_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "mushroom_lwnn_train.out" title "lwnn train" with lines 3, \
- "mushroom_jneural_train.out" title "jneural train" with lines 4, \
- "mushroom_fann_test.out" title "fann test" with lines -1, \
- "mushroom_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "mushroom_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "mushroom_lwnn_test.out" title "lwnn test" with lines 3, \
- "mushroom_jneural_test.out" title "jneural test" with lines 4
-set nologscale
+plot "mushroom.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "mushroom.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "mushroom.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "mushroom.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "mushroom.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "mushroom.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "mushroom.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "mushroom.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "mushroom.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "mushroom.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "mushroom.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "mushroom.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "mushroom.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "mushroom.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "mushroom.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "mushroom.jneural.test.out" title "jneural incremental test" with lines 9
-set logscale x
+#set logscale x
#set output "robot.ps"
set title "robot"
-plot "robot_fann_train.out" title "fann train" with lines -1, \
- "robot_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "robot_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "robot_lwnn_train.out" title "lwnn train" with lines 3, \
- "robot_jneural_train.out" title "jneural train" with lines 4, \
- "robot_fann_test.out" title "fann test" with lines -1, \
- "robot_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "robot_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "robot_lwnn_test.out" title "lwnn test" with lines 3, \
- "robot_jneural_test.out" title "jneural test" with lines 4
-
-set logscale x
+plot "robot.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "robot.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "robot.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "robot.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "robot.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "robot.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "robot.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "robot.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "robot.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "robot.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "robot.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "robot.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "robot.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "robot.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "robot.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "robot.jneural.test.out" title "jneural incremental test" with lines 9
+
+#set logscale x
#set output "soybean.ps"
set title "soybean"
-plot "soybean_fann_train.out" title "fann train" with lines -1, \
- "soybean_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "soybean_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "soybean_lwnn_train.out" title "lwnn train" with lines 3, \
- "soybean_jneural_train.out" title "jneural train" with lines 4, \
- "soybean_fann_test.out" title "fann test" with lines -1, \
- "soybean_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "soybean_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "soybean_lwnn_test.out" title "lwnn test" with lines 3, \
- "soybean_jneural_test.out" title "jneural test" with lines 4
+plot "soybean.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "soybean.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "soybean.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "soybean.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "soybean.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "soybean.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "soybean.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "soybean.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "soybean.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "soybean.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "soybean.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "soybean.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "soybean.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "soybean.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "soybean.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "soybean.jneural.test.out" title "jneural incremental test" with lines 9
-set nologscale
+#set logscale x
#set output "thyroid.ps"
set title "thyroid"
-plot "thyroid_fann_train.out" title "fann train" with lines -1, \
- "thyroid_fann_stepwise_train.out" title "fann (stepwise) train" with lines 1, \
- "thyroid_fann_fixed_train.out" title "fann (fix) train" with lines 2, \
- "thyroid_lwnn_train.out" title "lwnn train" with lines 3, \
- "thyroid_jneural_train.out" title "jneural train" with lines 4, \
- "thyroid_fann_test.out" title "fann test" with lines -1, \
- "thyroid_fann_stepwise_test.out" title "fann (stepwise) test" with lines 1, \
- "thyroid_fann_fixed_test.out" title "fann (fix) test" with lines 2, \
- "thyroid_lwnn_test.out" title "lwnn test" with lines 3, \
- "thyroid_jneural_test.out" title "jneural test" with lines 4
-
-set xlabel "Number of neurons in the four layers"
-set ylabel "Nanoseconds per connection"
-
-set logscale
-#set output "performance.ps"
-set title "Performance"
-plot "fann_performance.out" title "fann" with lines -1, \
- "fann_stepwise_performance.out" title "fann (stepwise)" with lines 1, \
- "fann_fixed_performance.out" title "fann (fix)" with lines 2, \
- "lwnn_performance.out" title "lwnn" with lines 3, \
- "jneural_performance.out" title "jneural" with lines 4
-
-#set logscale
-#set output "performance_arm.ps"
-#set title "Performance iPAQ"
-#plot "fann_performance_arm.out" title "fann" with lines -1, \
-# "fann_thres_performance_arm.out" title "fann (thres)" with lines 1, \
-# "fann_fixed_performance_arm.out" title "fann (fix)" with lines 2, \
-# "fann_noopt_performance_arm.out" title "fann (noopt)" with lines 5, \
-# "lwnn_performance_arm.out" title "lwnn" with lines 3, \
-# "jneural_performance_arm.out" title "jneural" with lines 4
+plot "thyroid.fann_rprop.train.out" title "fann rprop train" with lines -1, \
+ "thyroid.fann_rprop.fixed_train.out" title "fann rprop (fixed) train" with lines 1, \
+ "thyroid.fann_rprop_stepwise.train.out" title "fann rprop (stepwise) train" with lines 2, \
+ "thyroid.fann_quickprop.train.out" title "fann quickprop train" with lines 3, \
+ "thyroid.fann_batch.train.out" title "fann batch train" with lines 4, \
+ "thyroid.fann_incremental.train.out" title "fann incremental train" with lines 5, \
+ "thyroid.lwnn.train.out" title "lwnn incremental train" with lines 8, \
+ "thyroid.jneural.train.out" title "jneural incremental train" with lines 9, \
+ "thyroid.fann_rprop.test.out" title "fann rprop test" with lines -1, \
+ "thyroid.fann_rprop.fixed_test.out" title "fann rprop (fixed) test" with lines 1, \
+ "thyroid.fann_rprop_stepwise.test.out" title "fann rprop (stepwise) test" with lines 2, \
+ "thyroid.fann_quickprop.test.out" title "fann quickprop test" with lines 3, \
+ "thyroid.fann_batch.test.out" title "fann batch test" with lines 4, \
+ "thyroid.fann_incremental.test.out" title "fann incremental test" with lines 5, \
+ "thyroid.lwnn.test.out" title "lwnn incremental test" with lines 8, \
+ "thyroid.jneural.test.out" title "jneural incremental test" with lines 9
set output
set terminal x11
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 3ef266f..b9d0914 100644
--- a/benchmarks/quality.cc
+++ b/benchmarks/quality.cc
@@ -125,11 +125,13 @@ void quality_benchmark_jneural(
fprintf(stderr, ".");
}
+ fprintf(stderr, " epochs: %d, epochs/sec: %f", epochs, epochs/total_elapsed);
+
delete ann;
}
#endif
-void quality_benchmark_fann(bool stepwise,
+void quality_benchmark_fann(bool stepwise, unsigned int training_algorithm,
char *filename,
struct fann_train_data *train_data,
struct fann_train_data *test_data,
@@ -155,9 +157,11 @@ void quality_benchmark_fann(bool stepwise,
num_input, num_neurons_hidden1, num_output);
}
+ fann_set_training_algorithm(ann, training_algorithm);
+
if(stepwise){
- fann_set_activation_function_hidden(ann, FANN_SIGMOID_SYMMETRIC);
- fann_set_activation_function_output(ann, FANN_SIGMOID);
+ fann_set_activation_function_hidden(ann, FANN_SIGMOID_SYMMETRIC_STEPWISE);
+ fann_set_activation_function_output(ann, FANN_SIGMOID_STEPWISE);
}else{
fann_set_activation_function_hidden(ann, FANN_SIGMOID_SYMMETRIC);
fann_set_activation_function_output(ann, FANN_SIGMOID);
@@ -170,11 +174,7 @@ void quality_benchmark_fann(bool stepwise,
elapsed = 0;
start_timer();
while(elapsed < (double)seconds_between_reports){
- if(stepwise){
- fann_train_epoch_irpropm(ann, train_data);
- } else {
- fann_train_epoch_quickprop(ann, train_data);
- }
+ fann_train_epoch(ann, train_data);
elapsed = time_elapsed();
epochs++;
@@ -203,7 +203,7 @@ void quality_benchmark_fann(bool stepwise,
/* Save the data as fixed point, to allow for drawing of
a fixed point graph */
- if(!stepwise){
+ if(filename){
/* buffer overflow could occur here */
sprintf(fixed_point_file, "%05d_%f_%s_fixed.net", epochs, total_elapsed, filename);
decimal_point = fann_save_to_fixed(ann, fixed_point_file);
@@ -216,6 +216,8 @@ void quality_benchmark_fann(bool stepwise,
}
}
+ fprintf(stderr, " epochs: %d, epochs/sec: %f", epochs, epochs/total_elapsed);
+
fann_destroy(ann);
}
@@ -293,6 +295,8 @@ void quality_benchmark_lwnn(
fprintf(stderr, ".");
}
+ fprintf(stderr, " epochs: %d, epochs/sec: %f", epochs, epochs/total_elapsed);
+
net_free(ann);
}
#endif
@@ -335,14 +339,50 @@ int main(int argc, char* argv[])
fprintf(stderr, "Quality test of %s %s ", argv[1], argv[2]);
- if(strcmp(argv[1], "fann") == 0){
- quality_benchmark_fann(false, argv[4], train_data, test_data,
+ if(strcmp(argv[1], "fann_incremental") == 0){
+ quality_benchmark_fann(false, FANN_TRAIN_INCREMENTAL, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_incremental_stepwise") == 0){
+ quality_benchmark_fann(true, FANN_TRAIN_INCREMENTAL, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_quickprop") == 0){
+ quality_benchmark_fann(false, FANN_TRAIN_QUICKPROP, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_quickprop_stepwise") == 0){
+ quality_benchmark_fann(true, FANN_TRAIN_QUICKPROP, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_batch") == 0){
+ quality_benchmark_fann(false, FANN_TRAIN_BATCH, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_batch_stepwise") == 0){
+ quality_benchmark_fann(true, FANN_TRAIN_BATCH, NULL, train_data, test_data,
+ train_out, test_out,
+ train_data->num_input, num_neurons_hidden1,
+ num_neurons_hidden2, train_data->num_output,
+ seconds_of_training, seconds_between_reports);
+ }else if(strcmp(argv[1], "fann_rprop") == 0){
+ quality_benchmark_fann(false, FANN_TRAIN_RPROP, argv[4], train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
seconds_of_training, seconds_between_reports);
- }else if(strcmp(argv[1], "fann_stepwise") == 0){
- quality_benchmark_fann(true, NULL, train_data, test_data,
+ }else if(strcmp(argv[1], "fann_rprop_stepwise") == 0){
+ quality_benchmark_fann(true, FANN_TRAIN_RPROP, NULL, train_data, test_data,
train_out, test_out,
train_data->num_input, num_neurons_hidden1,
num_neurons_hidden2, train_data->num_output,
diff --git a/benchmarks/quality_fixed.c b/benchmarks/quality_fixed.c
index 9f0cd93..58d7c76 100644
--- a/benchmarks/quality_fixed.c
+++ b/benchmarks/quality_fixed.c
@@ -48,6 +48,8 @@ int main(int argc, char* argv[])
test_out = fopen(argv[4], "w");
}
+ fprintf(stderr, "Quality test of fixed point ");
+
for(j = 5; j < argc; j++){
ann = fann_create_from_file(argv[j]);
@@ -76,6 +78,8 @@ int main(int argc, char* argv[])
fann_destroy(ann);
}
+
+ fprintf(stderr, "\n");
return 0;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git
More information about the debian-science-commits
mailing list