[libfann] 162/242: last commit before 1.2.0 release

Christian Kastner chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:38 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 7bb4d83de52c4b35b67f25b164afbd339789d25f
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Sat Oct 9 20:39:51 2004 +0000

    last commit before 1.2.0 release
---
 ChangeLog                    |   2 ++
 Makefile.am                  |   3 ++-
 Makefile.in                  |   3 ++-
 TODO                         |  37 ++++++++++++++++++++++++++++++------
 config.guess                 |  44 +++++++++++++++++--------------------------
 config.sub                   |  31 ++++++++++++++++--------------
 debian/changelog             |   6 ++++++
 debian/libfann1-dev.examples |   1 +
 debian/rules                 |   2 +-
 doc/BesselAll.gif            | Bin 0 -> 59717 bytes
 doc/Makefile                 |   2 +-
 doc/intro.html               |  15 +++++++++------
 doc/menu.html                |   3 ++-
 examples/Makefile            |   4 ++--
 examples/simple_test.c       |   2 +-
 examples/simple_train.c      |   2 +-
 examples/steepness_train.c   |   2 +-
 examples/xor.data            |  10 +++++-----
 ltmain.sh                    |   7 ++++++-
 python/makefile.gnu          |   2 +-
 20 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 814c790..2f62d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ libfann (1.2.0) stable; urgency=low
 	* fann_print_parameters function
 	* Renamed some functions and variables to avoid confusion of terms (kept deprecated functions)
 	
+ -- Steffen Nissen <lukesky at diku.dk> Sat, 09 Oct 2004 11:13:22 +0200
+
 libfann (1.1.0) stable; urgency=low
 	* Error checking when allocating memory
 	* Debian package
diff --git a/Makefile.am b/Makefile.am
index 9373c4e..35d3b8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ dist-hook:
 	rm -rf `find $(distdir)/examples -name CVS`
 	(cd $(distdir)/benchmarks && make clean)
 	rm -rf `find $(distdir)/benchmarks -name CVS`
-	(cd $(distdir)/python && make clean)
+	(cd $(distdir)/python && make -f makefile.gnu clean)
 	rm -rf `find $(distdir)/python -name CVS`
+	rm -rf `find $(distdir)/MSVC++ -name CVS`
 	zip -9 -r $(distdir).zip $(distdir)
 	tar chojf $(distdir).tar.bz2 $(distdir)
diff --git a/Makefile.in b/Makefile.in
index df1b56c..e6d920a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -580,8 +580,9 @@ dist-hook:
 	rm -rf `find $(distdir)/examples -name CVS`
 	(cd $(distdir)/benchmarks && make clean)
 	rm -rf `find $(distdir)/benchmarks -name CVS`
-	(cd $(distdir)/python && make clean)
+	(cd $(distdir)/python && make -f makefile.gnu clean)
 	rm -rf `find $(distdir)/python -name CVS`
+	rm -rf `find $(distdir)/MSVC++ -name CVS`
 	zip -9 -r $(distdir).zip $(distdir)
 	tar chojf $(distdir).tar.bz2 $(distdir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/TODO b/TODO
index bebdc84..c6a0df7 100644
--- a/TODO
+++ b/TODO
@@ -25,12 +25,22 @@ Things TODO when releasing a new version (mostly for fann developers)
 	cd examples
 	make runtest
 
+* All of the examples should work fine
+	cd examples
+	make simple_train && ./simple_train
+	make simple_test && ./simple_test
+	make steepness_train && ./steepness_train
+	make mushroom && ./mushroom
+	make robot && ./robot
+
 * No memory leaks must exist
 	cd examples
-	rundebug
+	make rundebug
 
 * Documentation should be updated
 
+* Benchmarks should be updated
+
 * Python bindings should compile and run
 	cd python
 	make
@@ -38,18 +48,33 @@ Things TODO when releasing a new version (mostly for fann developers)
 
 * Changelog should be updated and timestamp should be set
 
-* CVS branch for release
-
 * PHP Extension should be up-to-date (including documentation)
 
-* Debian packages should be created
+* TGZ/BZ/ZIP packages should be created
 
-* RPM packages should be created
+* Debian packages should be created (from tgz package)
+	#Example of make command
+	rm -rf fann-1.2.0.* test && mkdir test && make dist && cp fann-1.2.0.*gz test && cd test && tar xvzf *gz && cd fann-1.2.0 
+	su
+	pbuilder update --distribution sid
+	pdebuild --distribution sid
+	exit
+	cd .. && cp /var/cache/pbuilder/result/*deb . && lintian *deb
 
 * Windows DLL's should be created
 
+* ZIP package with win dll should be created
+
+* RPM packages should be created
+
+* Commit for CVS
+
+* CVS branch for release
+
 * Upload to sf
 
-* Update sf site
+* Update sf site documentation etc.
 
 * Update fm site
+
+* Send out release info
diff --git a/config.guess b/config.guess
index 51fab47..6641456 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-03-12'
+timestamp='2004-07-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -212,6 +212,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -227,9 +230,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -307,9 +307,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -764,7 +761,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -787,21 +784,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -1096,9 +1079,9 @@ EOF
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1260,6 +1243,13 @@ EOF
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index ba33103..ac6de98 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-03-12'
+timestamp='2004-06-24'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -145,7 +145,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -300,7 +300,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -326,8 +326,9 @@ case $basic_machine in
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -445,6 +446,10 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
 	cr16c)
 		basic_machine=cr16c-unknown
 		os=-elf
@@ -659,10 +664,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -743,10 +744,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1059,6 +1056,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1374,6 +1374,9 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
diff --git a/debian/changelog b/debian/changelog
index df11e1d..c7ee1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libfann1 (1.2.0-1) unstable; urgency=low
+
+  * Debian package for version 1.2.0
+
+ -- Steffen Nissen <lukesky at diku.dk>  Sat,  9 Oct 2004 13:46:42 +0200
+
 libfann1 (1.1.0.1-1) unstable; urgency=low
 
   * rebuild with a clean tar.gz. All issues with debian/ dir in cvs
diff --git a/debian/libfann1-dev.examples b/debian/libfann1-dev.examples
index 83a3183..9c2401f 100644
--- a/debian/libfann1-dev.examples
+++ b/debian/libfann1-dev.examples
@@ -1,2 +1,3 @@
 examples/*c
+examples/xor.data
 examples/Makefile
diff --git a/debian/rules b/debian/rules
index 64f95a4..3c32f0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 # shared library versions, option 1
-version=1.1.0
+version=1.2.0
 major=1
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 #version=`ls src/.libs/lib*.so.* | \
diff --git a/doc/BesselAll.gif b/doc/BesselAll.gif
new file mode 100644
index 0000000..9576f6d
Binary files /dev/null and b/doc/BesselAll.gif differ
diff --git a/doc/Makefile b/doc/Makefile
index 25abeed..8bb7adb 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -28,7 +28,7 @@ tex: fann.xml Makefile
 txt: fann.xml Makefile
 	jw -u -b txt $(XML)
 
-sf: html html-single pdf
+sf: pdf html html-single
 	perl -p -i -e 's/><\/BODY/> <br><div><A href="http:\/\/sourceforge.net"> <IMG src="http:\/\/sourceforge.net\/sflogo.php?group_id=93562&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo" \/><\/A><\/div><br> <\/body/' fann.html
 	(cd html && perl -p -i -e 's/><\/BODY/> <br><div><A href="http:\/\/sourceforge.net"> <IMG src="http:\/\/sourceforge.net\/sflogo.php?group_id=93562&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo" \/><\/A><\/div><br> <\/body/' *.html)
 	tar czf sf.tgz *.html search.php style.css fann.pdf html
diff --git a/doc/intro.html b/doc/intro.html
index 551ec5a..1daafdc 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -29,18 +29,20 @@ fixed and floating point are supported. It includes a framework for
 easy handling of training data sets. It is easy to use, versatile,
 well documented, and fast. PHP and Python bindings are available.
 
+<p align='center'><img src='BesselAll.gif'>
+
 <p>A <a href='reference/index.html'>reference manual</a> accompanies the library with examples and
 recommendations on how to use the library.
 
-<p><b><big>Features for version 1.1.0:</big></b>
+<p><b><big>Features for version 1.2.0:</big></b>
 <ul>
   <li>Multilayer Artificial Neural Network Library in C
-  <li>Backpropagation training
+  <li>Backpropagation training (RPROP, Quickprop, Batch, Incremental)
   <li>Easy to use (create, train and run an ANN with just three function calls)
   <li>Fast (up to 150 times faster execution than other libraries)
   <li>Versatile (possible to adjust many parameters and features on-the-fly)
   <li>Well documented (An easy to use <a href='reference/index.html'>reference manual</a> and a 50+ page <a href='http://prdownloads.sourceforge.net/fann/fann_doc_complete_1.0.pdf?download'>university report</a> describing the implementation considerations etc.)
-  <li>Cross-platform (configure script for linux and unix, project files for MSVC++ and Borland compilers are also reported to work)
+  <li>Cross-platform (configure script for linux and unix, dll files for windows, project files for MSVC++ and Borland compilers are also reported to work)
   <li>Several different activation functions implemented (including stepwise linear functions for that extra bit of speed)
   <li>Easy to save and load entire ANNs
   <li>Several easy to use examples (simple <a href='http://sourceforge.net/docman/display_doc.php?docid=19857&group_id=93562'>train example</a> and simple <a href='http://sourceforge.net/docman/display_doc.php?docid=19858&group_id=93562'>test example</a>)
@@ -48,13 +50,14 @@ recommendations on how to use the library.
   <li>Cache optimized (for that extra bit of speed)
   <li>Open source (licenced under <a href='http://www.gnu.org/copyleft/lesser.html'>LGPL</a>)
   <li>Framework for easy handling of training data sets
-  <li><a href='reference/c1844.html'>PHP Bindings</a>
-  <li><a href='reference/c2335.html'>Python Bindings</a>
+  <li><a href='fann.html#php'>PHP Extension</a>
+  <li><a href='fann.html#python'>Python Bindings</a>
+  <li><a href='http://www.geocities.com/freegoldbar/'>Mathematica Extension</a>
   <li><a href='http://sourceforge.net/project/showfiles.php?group_id=93562'>RPM package</a>
   <li><a href='http://sourceforge.net/project/showfiles.php?group_id=93562'>Debian package</a>
 </ul>
 
-<br><i>Last updated Mar 31, 2004</i>
+<br><i>Last updated Oct 9, 2004</i>
 
 <br><div align="right"><A href="http://sourceforge.net"> <IMG src="http://sourceforge.net/sflogo.php?group_id=93562&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo" /></A></div><br>
 
diff --git a/doc/menu.html b/doc/menu.html
index 4766571..c995417 100644
--- a/doc/menu.html
+++ b/doc/menu.html
@@ -30,7 +30,8 @@ function makeFrame()
   <a href="fann.html" target="viewer"><b>Reference Manual<br>HTML (single file)</b></a> ›<br><br>
   <a href="fann.pdf" target="viewer"><b>Reference Manual<br>PDF</b></a> ›<br><br>
   <a href="fann.html#php" target="viewer">PHP Extension</a> ›<br><br>
-  <a href="fann.html#python" target="viewer">Python bindings</a> ›<br><br>
+  <a href="fann.html#python" target="viewer">Python Bindings</a> ›<br><br>
+  <a href="http://www.geocities.com/freegoldbar/" target="viewer">Mathematica Extension</a> ›<br><br>
   <a href="http://sourceforge.net/projects/fann/" target="viewer">Sourceforge Page</a> ›<br><br>
   <a href="http://freshmeat.net/projects/fann/" target="viewer">Freshmeat Page</a> ›<br><br>
   <a href="http://lists.sourceforge.net/mailman/listinfo/fann-general" target="viewer">Mailing list</a> ›<br><br>
diff --git a/examples/Makefile b/examples/Makefile
index a5e1df6..b51d025 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -3,7 +3,7 @@
 
 GCC=gcc
 
-TARGETS = xor_train xor_test xor_test_fixed simple_train steepness_train simple_test
+TARGETS = xor_train xor_test xor_test_fixed simple_train steepness_train simple_test robot mushroom
 DEBUG_TARGETS = xor_train_debug xor_test_debug xor_test_fixed_debug
 
 all: $(TARGETS)
@@ -15,7 +15,7 @@ all: $(TARGETS)
 	$(GCC) -O3 -lm -lfixedfann -DFIXEDFANN $< -o $@
 
 clean:
-	rm -f $(TARGETS) $(DEBUG_TARGETS) xor_fixed.data xor_float.net xor_fixed.net
+	rm -f $(TARGETS) $(DEBUG_TARGETS) xor_fixed.data *.net *~
 
 runtest: $(TARGETS)
 	@echo
diff --git a/examples/simple_test.c b/examples/simple_test.c
index a163b60..0e4b3ca 100644
--- a/examples/simple_test.c
+++ b/examples/simple_test.c
@@ -27,7 +27,7 @@ int main()
 
 	struct fann *ann = fann_create_from_file("xor_float.net");
 	
-	input[0] = 0;
+	input[0] = -1;
 	input[1] = 1;
 	calc_out = fann_run(ann, input);
 
diff --git a/examples/simple_train.c b/examples/simple_train.c
index 35f4119..f89a09a 100644
--- a/examples/simple_train.c
+++ b/examples/simple_train.c
@@ -26,7 +26,7 @@ int main()
 	const unsigned int num_input = 2;
 	const unsigned int num_output = 1;
 	const unsigned int num_layers = 3;
-	const unsigned int num_neurons_hidden = 5;
+	const unsigned int num_neurons_hidden = 3;
 	const float desired_error = (const float)0.001;
 	const unsigned int max_iterations = 500000;
 	const unsigned int iterations_between_reports = 1000;
diff --git a/examples/steepness_train.c b/examples/steepness_train.c
index 066fc3b..64873a7 100644
--- a/examples/steepness_train.c
+++ b/examples/steepness_train.c
@@ -70,7 +70,7 @@ int main()
 	const unsigned int num_input = 2;
 	const unsigned int num_output = 1;
 	const unsigned int num_layers = 3;
-	const unsigned int num_neurons_hidden = 2;
+	const unsigned int num_neurons_hidden = 3;
 	const float desired_error = (const float)0.001;
 	const unsigned int max_iterations = 500000;
 	const unsigned int iterations_between_reports = 1000;
diff --git a/examples/xor.data b/examples/xor.data
index 1d8fe3e..e831fc6 100644
--- a/examples/xor.data
+++ b/examples/xor.data
@@ -1,9 +1,9 @@
 4 2 1
-0 0
-0
-0 1
+-1 -1
+-1
+-1 1
 1
-1 0
+1 -1
 1
 1 1
-0
+-1
diff --git a/ltmain.sh b/ltmain.sh
index 529c85f..ea9adba 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -44,7 +44,7 @@ EXIT_FAILURE=1
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 203 $"
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $"
 
 
 # Check that we have a working $echo.
@@ -2933,6 +2933,11 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/python/makefile.gnu b/python/makefile.gnu
index 06f4e81..b673eab 100755
--- a/python/makefile.gnu
+++ b/python/makefile.gnu
@@ -18,4 +18,4 @@ _%.dll: %_wrap.o fann_helper.o
 	swig -python $<
 
 clean:
-	rm -f $(TARGETS) *_wrap.* fann_helper.o fann.pyc
+	rm -f $(TARGETS) *_wrap.* fann_helper.o fann.pyc *.so

-- 
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