[libfann] 173/242: fixed some minor ANSI C problems

Christian Kastner chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:39 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 57fb9e4784776e50f97412b4320e90fcd314d9e7
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Sat Mar 19 11:11:13 2005 +0000

    fixed some minor ANSI C problems
---
 TODO                  |   4 ++
 aclocal.m4            |  24 +++++++++---
 config.guess          |  18 +++++++--
 config.sub            |  22 +++++++++--
 configure             | 106 ++++++++++++++++++++++++++++++++++++--------------
 doc/intro.html        |   8 +++-
 doc/menu.html         |  39 +++++++++++--------
 src/fann.c            |   8 +++-
 src/fann_cascade.c    |  10 ++---
 src/fann_train_data.c |   9 -----
 10 files changed, 171 insertions(+), 77 deletions(-)

diff --git a/TODO b/TODO
index 8d061e7..2d7ff16 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,8 @@
+Stuff for the next release
 * Implement cascade correlation.
+* More flexible use of training data
+* Save everything in save file
+
 * Implement SuperSAB
 * Implement the activation functions defined in fann_activation.h
 * More checks to see if train data is properly formatted in the file (some have experienced nasty problems because a number was missing in one line).
diff --git a/aclocal.m4 b/aclocal.m4
index a1fe77c..4142db4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -862,7 +862,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
 # serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 203 $
+# Debian $Rev: 214 $
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -2296,6 +2296,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -3026,7 +3038,7 @@ linux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | knetbsd*-gnu)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4020,7 +4032,7 @@ case $host_os in
 	;;
     esac
     ;;
-  netbsd* | knetbsd*-gnu)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -5510,7 +5522,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      netbsd* | knetbsd*-gnu)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -5953,7 +5965,7 @@ EOF
       fi
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -6371,7 +6383,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
diff --git a/config.guess b/config.guess
index 77c7cba..8229471 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-08-13'
+timestamp='2004-11-12'
 
 # 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
@@ -319,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
 	exit 0 ;;
@@ -342,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
@@ -824,6 +827,12 @@ EOF
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit 0 ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit 0 ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -1241,7 +1250,10 @@ EOF
 	    A*) echo alpha-dec-vms && exit 0 ;;
 	    I*) echo ia64-dec-vms && exit 0 ;;
 	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index ac6de98..0f84ac2 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-06-24'
+timestamp='2004-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -267,7 +267,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -343,8 +343,8 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -457,6 +457,9 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
@@ -486,6 +489,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -1026,6 +1033,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1294,6 +1305,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
diff --git a/configure b/configure
index 747441c..6ab6a76 100755
--- a/configure
+++ b/configure
@@ -3470,7 +3470,7 @@ linux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | knetbsd*-gnu)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6646,7 +6646,7 @@ EOF
       fi
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -7164,7 +7164,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -7813,6 +7813,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -8645,7 +8657,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8648 "configure"
+#line 8660 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8743,7 +8755,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8746 "configure"
+#line 8758 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10254,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  netbsd* | knetbsd*-gnu)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -10809,7 +10821,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
-      netbsd* | knetbsd*-gnu)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -10920,11 +10932,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10923: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10935: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10927: \$? = $ac_status" >&5
+   echo "$as_me:10939: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10980,11 +10992,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10983: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10995: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10987: \$? = $ac_status" >&5
+   echo "$as_me:10999: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11505,6 +11517,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -12337,7 +12361,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12340 "configure"
+#line 12364 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12435,7 +12459,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12438 "configure"
+#line 12462 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13262,11 +13286,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13265: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13289: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13269: \$? = $ac_status" >&5
+   echo "$as_me:13293: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13322,11 +13346,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13325: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13349: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13329: \$? = $ac_status" >&5
+   echo "$as_me:13353: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13499,7 +13523,7 @@ EOF
       fi
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -13997,7 +14021,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -14646,6 +14670,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -15355,11 +15391,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15358: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15394: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15362: \$? = $ac_status" >&5
+   echo "$as_me:15398: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15588,11 +15624,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15591: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15627: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15595: \$? = $ac_status" >&5
+   echo "$as_me:15631: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15648,11 +15684,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15651: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15687: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15655: \$? = $ac_status" >&5
+   echo "$as_me:15691: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15825,7 +15861,7 @@ EOF
       fi
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -16343,7 +16379,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd* | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16992,6 +17028,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -17824,7 +17872,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17827 "configure"
+#line 17875 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17922,7 +17970,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17925 "configure"
+#line 17973 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/doc/intro.html b/doc/intro.html
index 6c8e6ef..0af693c 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -50,15 +50,19 @@ 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='http://www.geocities.com/freegoldbar/indexExplorer.html'>Graphical Interface</a>
+  <li><a href='http://www.geocities.com/freegoldbar/CppWrapperHelp/index.html'>C++ Bindings</a>
   <li><a href='fann.html#php'>PHP Extension</a>
   <li><a href='fann.html#python'>Python Bindings</a>
   <li><a href='fann.html#delphi'>Delphi Bindings</a>
-  <li><a href='http://www.geocities.com/freegoldbar/'>Mathematica Extension</a>
+  <li><a href='http://www.geocities.com/freegoldbar/indexExplorer.html'>.NET Bindings</a>
+  <li><a href='http://www.geocities.com/freegoldbar/indexMath.html'>Mathematica Extension</a>
+  <li><a href='http://blueruby.mydns.jp/fann/index.rbx?cmd=view;name=top'>Ruby Bindings</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 Nov 2, 2004</i>
+<br><i>Last updated Feb 15, 2005</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 5feb6ea..2c7f572 100644
--- a/doc/menu.html
+++ b/doc/menu.html
@@ -25,25 +25,30 @@ function makeFrame()
 <br>
 
 <div id="leftmenu">
-  <a href="intro.html" target="viewer">Introduction</a> ›<br><br>
-  <a href="html/index.html" target="viewer"><b>Reference Manual<br>HTML (multi files)</b></a> ›<br><br>
-  <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#delphi" target="viewer">Delphi 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>
-  <a href="http://sourceforge.net/mailarchive/forum.php?forum=fann-general" target="viewer">Mailing list archives</a> ›<br><br>
-  <a href="http://sourceforge.net/forum/forum.php?forum_id=323465" target="viewer">Help forum</a> ›<br><br>
+  <a href="intro.html" target="viewer">Introduction</a> ›<br>
+  <a href="html/index.html" target="viewer">Reference Manual</a> ›<br>
+  <a href="fann.html" target="viewer">Ref Man (single file)</a> ›<br>
+  <a href="fann.pdf" target="viewer">Reference Manual PDF</a> ›<br><br>
+  <a href="http://www.geocities.com/freegoldbar/indexExplorer.html" target="viewer">Graphical Interface</a> ›<br>
+  <a href="http://www.geocities.com/freegoldbar/CppWrapperHelp/index.html" target="viewer">C++ Bindings</a> ›<br>
+  <a href="fann.html#php" target="viewer">PHP Extension</a> ›<br>
+  <a href="fann.html#python" target="viewer">Python Bindings</a> ›<br>
+  <a href="fann.html#delphi" target="viewer">Delphi Bindings</a> ›<br>
+  <a href="http://www.geocities.com/freegoldbar/indexExplorer.html" target="viewer">.NET Bindings</a> ›<br>
+  <a href="http://www.geocities.com/freegoldbar/indexMath.html" target="viewer">Mathematica Extension</a> ›<br>
+  <a href="http://blueruby.mydns.jp/fann/index.rbx?cmd=view;name=top" target="viewer">Ruby Bindings</a> ›<br><br>
+  <a href="http://sourceforge.net/projects/fann/" target="viewer">Sourceforge Page</a> ›<br>
+  <a href="http://freshmeat.net/projects/fann/" target="viewer">Freshmeat Page</a> ›<br>
+  <a href="http://lists.sourceforge.net/mailman/listinfo/fann-general" target="viewer">Mailing list</a> ›<br>
+  <a href="http://sourceforge.net/mailarchive/forum.php?forum=fann-general" target="viewer">Mailing list archives</a> ›<br>
+  <a href="http://sourceforge.net/forum/forum.php?forum_id=323465" target="viewer">Help forum</a> ›<br>
+  <a href="http://sourceforge.net/tracker/?group_id=93562&atid=604725" target="viewer">Feature Request</a> ›<br>
 
-  <br><a href="http://sourceforge.net/project/showfiles.php?group_id=93562" target="viewer"><b>Download</b></a> ›<br><br>
-  <a href="http://sourceforge.net/cvs/?group_id=93562" target="viewer">CVS</a> ›<br><br><br>
+  <br><a href="http://sourceforge.net/project/showfiles.php?group_id=93562" target="viewer"><b>Download</b></a> ›<br>
+  <a href="http://sourceforge.net/cvs/?group_id=93562" target="viewer">CVS</a> ›<br>
 
-  <a href="report/report.html" target="viewer">University Report<br>HTML (v. 1.0)</a> ›<br><br>
-  <a href="http://prdownloads.sourceforge.net/fann/fann_doc_complete_1.0.pdf?download" target="viewer">University Report<br>PDF (v. 1.0)</a> ›<br><br>
+  <a href="report/report.html" target="viewer">University Report<br>HTML (v. 1.0)</a> ›<br>
+  <a href="http://prdownloads.sourceforge.net/fann/fann_doc_complete_1.0.pdf?download" target="viewer">University Report<br>PDF (v. 1.0)</a> ›<br>
 
   <br>
   <div align='left'>
diff --git a/src/fann.c b/src/fann.c
index fb57cab..b9db649 100644
--- a/src/fann.c
+++ b/src/fann.c
@@ -38,12 +38,12 @@ FANN_EXTERNAL struct fann * FANN_API fann_create(float connection_rate, float le
 {
 	struct fann *ann;
 	va_list layer_sizes;
+	int i;
 	unsigned int *layers = (unsigned int *)calloc(num_layers, sizeof(unsigned int));
 	if(layers == NULL){
 		fann_error(NULL, FANN_E_CANT_ALLOCATE_MEM);
 		return NULL;
 	}
-	int i = 0;
 
 	va_start(layer_sizes, num_layers);
 	for ( i=0 ; i<(int)num_layers ; i++ ) {
@@ -299,6 +299,7 @@ FANN_EXTERNAL struct fann * FANN_API fann_create_shortcut(float learning_rate,
 	...) /* the number of neurons in each of the layers, starting with the input layer and ending with the output layer */
 {
 	struct fann *ann;
+	int i;
 	va_list layer_sizes;
 	unsigned int *layers = (unsigned int *)calloc(num_layers, sizeof(unsigned int));
 	if(layers == NULL){
@@ -306,7 +307,6 @@ FANN_EXTERNAL struct fann * FANN_API fann_create_shortcut(float learning_rate,
 		return NULL;
 	}
 	
-	int i = 0;
 
 	va_start(layer_sizes, num_layers);
 	for ( i=0 ; i<(int)num_layers ; i++ ) {
@@ -702,9 +702,11 @@ FANN_EXTERNAL void FANN_API fann_randomize_weights(struct fann *ann, fann_type m
 		*weights = (fann_type)(fann_rand(min_weight, max_weight));
 	}
 
+#ifndef FIXEDFANN
 	if(ann->prev_train_slopes != NULL){
 		fann_clear_train_arrays(ann);
 	}
+#endif
 }
 
 FANN_EXTERNAL void FANN_API fann_print_connections(struct fann *ann)
@@ -816,9 +818,11 @@ FANN_EXTERNAL void FANN_API fann_init_weights(struct fann *ann, struct fann_trai
 		}
 	}
 
+#ifndef FIXEDFANN
 	if(ann->prev_train_slopes != NULL){
 		fann_clear_train_arrays(ann);
 	}
+#endif
 }
 
 /* INTERNAL FUNCTION
diff --git a/src/fann_cascade.c b/src/fann_cascade.c
index 0d355f9..75ead61 100644
--- a/src/fann_cascade.c
+++ b/src/fann_cascade.c
@@ -109,7 +109,7 @@ void fann_update_weights_special_quickprop(struct fann *ann, unsigned int num_da
 
 void fann_print_connections_raw(struct fann *ann)
 {
-	int i;
+	unsigned int i;
 	for(i = 0; i < ann->total_connections_allocated; i++){
 		if(i == ann->total_connections){
 			printf("* ");
@@ -351,7 +351,7 @@ int fann_reallocate_neurons(struct fann *ann, unsigned int total_neurons)
 	}
 
 	/* Also allocate room for more train_errors */
-	ann->train_errors = realloc(ann->train_errors, total_neurons * sizeof(fann_type));
+	ann->train_errors = (fann_type *)realloc(ann->train_errors, total_neurons * sizeof(fann_type));
 	if(ann->train_errors == NULL){
 		fann_error((struct fann_error *)ann, FANN_E_CANT_ALLOCATE_MEM);
 		return -1;
@@ -677,7 +677,7 @@ struct fann_layer *fann_add_layer(struct fann *ann, struct fann_layer *layer)
 	int i;
 
 	/* allocate the layer */
-	struct fann_layer *layers = realloc(ann->first_layer, num_layers * sizeof(struct fann_layer));
+	struct fann_layer *layers = (struct fann_layer *)realloc(ann->first_layer, num_layers * sizeof(struct fann_layer));
 	if(layers == NULL){
 		fann_error((struct fann_error *)ann, FANN_E_CANT_ALLOCATE_MEM);
 		return NULL;
@@ -731,7 +731,7 @@ void fann_add_candidate_neuron(struct fann *ann, struct fann_layer *layer)
 	unsigned int num_connections_out = (ann->last_layer-1)->last_neuron - (layer+1)->first_neuron;
 	unsigned int num_connections_move = num_connections_out + num_connections_in;
 
-	int i, candidate_con, candidate_output_weight;
+	unsigned int i, candidate_con, candidate_output_weight;
 
 	struct fann_layer *layer_it;
 	struct fann_neuron *neuron_it, *neuron_place, *candidate;
@@ -783,7 +783,7 @@ void fann_add_candidate_neuron(struct fann *ann, struct fann_layer *layer)
 #ifdef CASCADE_DEBUG	
 		printf("move weight[%d ... %d] -> weight[%d ... %d]\n", neuron_it->first_con, neuron_it->last_con-1, neuron_it->first_con + num_connections_move - 1, neuron_it->last_con + num_connections_move - 2);
 #endif
-		for(i = neuron_it->last_con - 1; i >= (int)neuron_it->first_con; i--){
+		for(i = neuron_it->last_con - 1; i >= neuron_it->first_con; i--){
 #ifdef CASCADE_DEBUG	
 			printf("move weight[%d] = weight[%d]\n", i + num_connections_move - 1, i);
 #endif
diff --git a/src/fann_train_data.c b/src/fann_train_data.c
index 8085d0c..77cc376 100644
--- a/src/fann_train_data.c
+++ b/src/fann_train_data.c
@@ -213,15 +213,6 @@ FANN_EXTERNAL void FANN_API fann_train_on_data_callback(struct fann *ann, struct
 		printf("Max epochs %8d. Desired error: %.10f.\n", max_epochs, desired_error);
 	}
 
-	/* some training algorithms need stuff to be cleared etc. before training starts.
-	 */
-	if(ann->training_algorithm == FANN_TRAIN_RPROP ||
-		ann->training_algorithm == FANN_TRAIN_QUICKPROP){
-		if(ann->prev_train_slopes == NULL){
-			fann_clear_train_arrays(ann);
-		}
-	}
-
 	for(i = 1; i <= max_epochs; i++){
 		/* train */
 		error = fann_train_epoch(ann, data);

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