[libfann] 103/242: some stuff for benchmarking symetric sigmoid

[Christian Kastner]

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 07b780beb1044f833e2cd2448b4b545f19411f24
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Thu Mar 18 14:44:26 2004 +0000

    some stuff for benchmarking symetric sigmoid
---
 benchmarks/Makefile   |  4 ++--
 benchmarks/quality.cc | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 23b9d61..f545ccf 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -16,13 +16,13 @@ LWNNDIR = ../libraries/lwneuralnet-0.6/source/
 all: $(TARGETS)
 
 quality: quality.cc
-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann # -llwneuralnet -ljneural -lfl
+	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfann -llwneuralnet -ljneural -lfl
 
 quality_fixed: quality_fixed.c
 	$(GCC) $(CFLAGS) $(LFLAGS) $< -o $@ -lfixedfann
 
 performance: performance.cc
-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann # -llwneuralnet -ljneural -lfl
+	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -llwneuralnet -ljneural -lfl
 
 performance_fixed: performance.cc
 	$(G++) $(CFLAGS) $(LFLAGS) -DFIXEDFANN $< -o $@ -lfixedfann
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 9c57c68..363b5c0 100644
--- a/benchmarks/quality.cc
+++ b/benchmarks/quality.cc
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 //uncomment lines below to benchmark the libraries
 
-//#define JNEURAL
-//#define LWNN
+#define JNEURAL
+#define LWNN
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -139,7 +139,7 @@ void quality_benchmark_fann(bool stepwise,
 	unsigned int seconds_of_training, unsigned int seconds_between_reports)
 {
 	float train_error, test_error;
-	unsigned int i, decimal_point;
+	unsigned int i, decimal_point, j;
 	unsigned int epochs = 0;
 	double elapsed = 0;
 	double total_elapsed = 0;
@@ -156,13 +156,13 @@ void quality_benchmark_fann(bool stepwise,
 	}
 
 	if(stepwise){
-		fann_set_activation_function_hidden(ann, FANN_SIGMOID_STEPWISE);
+		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);
+		fann_set_activation_function_hidden(ann, FANN_SIGMOID_SYMMETRIC);
 		fann_set_activation_function_output(ann, FANN_SIGMOID);
 	}
-	
+
 	calibrate_timer();
 
 	while(total_elapsed < (double)seconds_of_training){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git