[libfann] 114/242: The other libraries should not be needed as default in benchmarks

[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 6239a3f93baa3d9b9e464b57c8211da4de6295ae
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Tue Mar 30 21:52:23 2004 +0000

    The other libraries should not be needed as default in benchmarks
---
 benchmarks/Makefile       | 4 ++--
 benchmarks/README         | 7 +++++++
 benchmarks/performance.cc | 4 ++--
 benchmarks/quality.cc     | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index f545ccf..9484a41 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 $@ -lfann -llwneuralnet -ljneural -lfl
+	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann #-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/README b/benchmarks/README
index ab663ae..8dfc9df 100644
--- a/benchmarks/README
+++ b/benchmarks/README
@@ -5,6 +5,13 @@ quality - Program to benchmark the quality of the training algorithms
 benchmark.sh - Shell file that runs a series of benchmarks
 gnuplot - File containing gnuplot commands for displaying graphs
 
+In order to run benchmarks, run:
+make
+./benchmarks.sh
+gnuplot < gnuplot
+
+A file named allplots.ps will display the benchmark graphs.
+
 In order to generate benchmarks against other libraries (jneural and
 lwneuralnet), these libraries need to be installed (they can be
 downloaded from http://voltar-confed.org/jneural/ and
diff --git a/benchmarks/performance.cc b/benchmarks/performance.cc
index 4101c0e..251b261 100644
--- a/benchmarks/performance.cc
+++ b/benchmarks/performance.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>
diff --git a/benchmarks/quality.cc b/benchmarks/quality.cc
index 363b5c0..a029740 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>

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