[libfann] 218/242: closing in on release 2.0
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:47 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 d091e89b6a3245c0ed2df76cd305012a1ec67acb
Author: Steffen Nissen <lukesky at diku.dk>
Date: Tue Dec 13 20:42:45 2005 +0000
closing in on release 2.0
---
ChangeLog | 2 +
Makefile.am | 12 +++--
Makefile.in | 12 +++--
README | 10 +++--
TODO | 15 +++----
configure | 2 +-
configure.in | 2 +-
examples/Makefile | 2 +-
examples/cascade_train.c | 115 +----------------------------------------------
src/Makefile.am | 5 ++-
src/Makefile.in | 20 +++------
11 files changed, 39 insertions(+), 158 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 90cff4e..fc8b27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ libfann (2.0.0) stable; urgency=low
* All parameters are saved to configuration file and not just the parameters needed to execute the ANN
* More readable configuration file
+ -- Steffen Nissen <sn at leenissen.dk> Tue, 13 Dec 2005 20:33:59 +0100
+
libfann (1.2.0) stable; urgency=low
* Fixes for better compability with different compilers
* Shortcut connections that skip layers
diff --git a/Makefile.am b/Makefile.am
index 35d3b8c..8631738 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fann.pc
-EXTRA_DIST = benchmarks doc/fann.xml doc/fann_doc_complete_1.0.pdf \
- doc/Makefile doc/style.css examples python MSVC++ src/include/config.h \
+EXTRA_DIST = benchmarks examples MSVC++ vs.net2003 src/include/config.h \
debian/changelog debian/compat debian/control debian/copyright \
debian/docs debian/libfann1-dev.dirs debian/libfann1-dev.examples \
debian/libfann1-dev.files debian/libfann1-dev.install \
@@ -14,19 +13,18 @@ EXTRA_DIST = benchmarks doc/fann.xml doc/fann_doc_complete_1.0.pdf \
win32_dll/examples/examples.ncb win32_dll/examples/examples.sln \
win32_dll/examples/examples.suo win32_dll/examples/simple_test.vcproj \
win32_dll/examples/simple_train.vcproj win32_dll/examples/xor_test.vcproj \
- win32_dll/examples/xor_train.vcproj
+ win32_dll/examples/xor_train.vcproj \
+ doc/advancedusage.txt doc/gettingstarted.txt doc/theory.txt \
+ doc/fixedpointusage.txt doc/installation.txt doc/fann_en.pdf
dist-hook:
rm -rf `find $(distdir) -name "*~" -o -name ".#*"`
- (cd $(distdir)/doc && make clean && make html)
- rm -rf `find $(distdir)/doc -name CVS`
(cd $(distdir)/examples && make clean)
rm -rf `find $(distdir)/examples -name CVS`
(cd $(distdir)/benchmarks && make clean)
rm -rf `find $(distdir)/benchmarks -name CVS`
- (cd $(distdir)/python && make -f makefile.gnu clean)
- rm -rf `find $(distdir)/python -name CVS`
rm -rf `find $(distdir)/MSVC++ -name CVS`
+ rm -rf `find $(distdir)/vs.net2003 -name CVS`
zip -9 -r $(distdir).zip $(distdir)
tar chojf $(distdir).tar.bz2 $(distdir)
diff --git a/Makefile.in b/Makefile.in
index e6d920a..d175dbe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,8 +134,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fann.pc
-EXTRA_DIST = benchmarks doc/fann.xml doc/fann_doc_complete_1.0.pdf \
- doc/Makefile doc/style.css examples python MSVC++ src/include/config.h \
+EXTRA_DIST = benchmarks examples MSVC++ vs.net2003 src/include/config.h \
debian/changelog debian/compat debian/control debian/copyright \
debian/docs debian/libfann1-dev.dirs debian/libfann1-dev.examples \
debian/libfann1-dev.files debian/libfann1-dev.install \
@@ -145,7 +144,9 @@ EXTRA_DIST = benchmarks doc/fann.xml doc/fann_doc_complete_1.0.pdf \
win32_dll/examples/examples.ncb win32_dll/examples/examples.sln \
win32_dll/examples/examples.suo win32_dll/examples/simple_test.vcproj \
win32_dll/examples/simple_train.vcproj win32_dll/examples/xor_test.vcproj \
- win32_dll/examples/xor_train.vcproj
+ win32_dll/examples/xor_train.vcproj \
+ doc/advancedusage.txt doc/gettingstarted.txt doc/theory.txt \
+ doc/fixedpointusage.txt doc/installation.txt doc/fann_en.pdf
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -574,15 +575,12 @@ uninstall-info: uninstall-info-recursive
dist-hook:
rm -rf `find $(distdir) -name "*~" -o -name ".#*"`
- (cd $(distdir)/doc && make clean && make html)
- rm -rf `find $(distdir)/doc -name CVS`
(cd $(distdir)/examples && make clean)
rm -rf `find $(distdir)/examples -name CVS`
(cd $(distdir)/benchmarks && make clean)
rm -rf `find $(distdir)/benchmarks -name CVS`
- (cd $(distdir)/python && make -f makefile.gnu clean)
- rm -rf `find $(distdir)/python -name CVS`
rm -rf `find $(distdir)/MSVC++ -name CVS`
+ rm -rf `find $(distdir)/vs.net2003 -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/README b/README
index 1d6de05..66c71d8 100644
--- a/README
+++ b/README
@@ -5,15 +5,19 @@ artificial neural networks in C with support for both fully connected
and sparsely connected networks. Cross-platform execution in both
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.
+well documented, and fast. Bindings to other programming languages
+and a GUI are also available.
A reference manual accompanies the library with examples and
recommendations on how to use the library.
-The reference manual is awailable in: doc/html/index.html
+The reference manual is available at: http://leenissen.dk/fann/html/index.html
A university report about the implementation of version 1.0 is also
-available, please see: doc/fann_doc_complete_1.0.pdf
+available, please see:
+http://prdownloads.sourceforge.net/fann/fann_doc_complete_1.0.pdf?download
+
+An article about how to use the library is available at: doc/fann_en.pdf
For installation do the following:
type command: ./configure
diff --git a/TODO b/TODO
index 8b2c5d5..d94ebf5 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,8 @@ If you want to contribute to the library, please contact me at lukesky at diku.dk
Things TODO when releasing a new version (mostly for fann developers)
+* All Makefile.am and configure.in should be updated to include relevant files and to reflect the new version number
+
* No compile warnings
cd examples
make compiletest
@@ -23,6 +25,8 @@ Things TODO when releasing a new version (mostly for fann developers)
make steepness_train && ./steepness_train
make mushroom && ./mushroom
make robot && ./robot
+ make cascade_train && ./cascade_train
+ make momentums && ./momentums
* No memory leaks must exist
cd examples
@@ -32,22 +36,17 @@ Things TODO when releasing a new version (mostly for fann developers)
* Benchmarks should be updated
-* Python bindings should compile and run
- cd python
- make
- python simple_train.py
-
* Changelog should be updated and timestamp should be set
-* CVS branch for release
+* All relevant files should be in CVS (all other removed)
-* PHP Extension should be up-to-date (including documentation)
+* CVS branch for release
* TGZ/BZ/ZIP 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
+ rm -rf fann-2.0.0.* test && mkdir test && make distclean && make dist && cp fann-2.0.0.*gz test && cd test && tar xvzf *gz && cd fann-2.0.0
su
pbuilder update --distribution sid
pdebuild --distribution sid
diff --git a/configure b/configure
index e0fa292..03e100d 100755
--- a/configure
+++ b/configure
@@ -1769,7 +1769,7 @@ fi
# Define the identity of the package.
PACKAGE=fann
- VERSION=1.2.0
+ VERSION=2.0.0
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 8bd9d69..2dad105 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
AC_INIT(src/fann.c)
-AM_INIT_AUTOMAKE(fann, 1.2.0)
+AM_INIT_AUTOMAKE(fann, 2.0.0)
AM_CONFIG_HEADER(src/include/config.h:config.in)
AC_PROG_CC
AC_PROG_LIBTOOL
diff --git a/examples/Makefile b/examples/Makefile
index cc15c01..395cd69 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 robot mushroom
+TARGETS = xor_train xor_test xor_test_fixed simple_train steepness_train simple_test robot mushroom cascade_train
DEBUG_TARGETS = xor_train_debug xor_test_debug xor_test_fixed_debug cascade_train_debug
all: $(TARGETS)
diff --git a/examples/cascade_train.c b/examples/cascade_train.c
index f126999..11ae73a 100644
--- a/examples/cascade_train.c
+++ b/examples/cascade_train.c
@@ -21,30 +21,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "fann.h"
-struct fann *ann;
-struct fann_train_data *train_data, *test_data;
-
-int FANN_API print_callback(struct fann *ann, struct fann_train_data *train,
- unsigned int max_epochs, unsigned int epochs_between_reports,
- float desired_error, unsigned int epochs)
-{
- int bit1, bit2;
- float mse1, mse2;
-
- mse2 = fann_test_data(ann, test_data);
- bit2 = fann_get_bit_fail(ann);
-
- mse1 = fann_test_data(ann, train);
- bit1 = fann_get_bit_fail(ann);
-
- printf("Nerons %4d. Epochs: %7d ",
- fann_get_total_neurons(ann)-(fann_get_num_input(ann)+fann_get_num_output(ann)), epochs);
- printf("Train error: %.10f (%d), Test error: %.10f (%d)\n", mse1, bit1, mse2, bit2);
- return 0;
-}
int main()
{
+ struct fann *ann;
+ struct fann_train_data *train_data, *test_data;
const float desired_error = (const float) 0.001;
unsigned int max_neurons = 40;
unsigned int neurons_between_reports = 1;
@@ -52,48 +33,9 @@ int main()
printf("Reading data.\n");
- train_data = fann_read_train_from_file("../benchmarks/datasets/pumadyn-32fm.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/pumadyn-32fm.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/gene.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/gene.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/two-spiral.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/two-spiral.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/mushroom.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/mushroom.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/diabetes.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/diabetes.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/gene.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/gene.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/thyroid.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/thyroid.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/soybean.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/soybean.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/parity13.test");
- test_data = fann_read_train_from_file("../benchmarks/datasets/parity13.test");
-
- train_data = fann_read_train_from_file("xor.data");
- test_data = fann_read_train_from_file("xor.data");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/building.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/building.test");
-
- train_data = fann_read_train_from_file("../benchmarks/datasets/robot.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/robot.test");
-
train_data = fann_read_train_from_file("../benchmarks/datasets/two-spiral.train");
test_data = fann_read_train_from_file("../benchmarks/datasets/two-spiral.test");
- train_data = fann_read_train_from_file("../benchmarks/datasets/parity8.train");
- test_data = fann_read_train_from_file("../benchmarks/datasets/parity8.test");
-
fann_scale_train_data(train_data, 0, 1);
fann_scale_train_data(test_data, 0, 1);
@@ -101,8 +43,6 @@ int main()
ann = fann_create_shortcut(2, fann_num_input_train_data(train_data), fann_num_output_train_data(train_data));
- fann_set_training_algorithm(ann, FANN_TRAIN_BATCH);
- fann_set_training_algorithm(ann, FANN_TRAIN_QUICKPROP);
fann_set_training_algorithm(ann, FANN_TRAIN_RPROP);
fann_set_activation_function_hidden(ann, FANN_SIGMOID_SYMMETRIC);
@@ -111,7 +51,6 @@ int main()
fann_set_activation_steepness_output(ann, 0.5);
fann_set_train_error_function(ann, FANN_ERRORFUNC_LINEAR);
-/* fann_set_train_stop_function(ann, FANN_STOPFUNC_BIT);*/
fann_set_rprop_increase_factor(ann, 1.2);
fann_set_rprop_decrease_factor(ann, 0.5);
@@ -132,17 +71,12 @@ int main()
/*fann_set_callback(ann, print_callback);*/
fann_print_parameters(ann);
- /*fann_print_connections(ann); */
printf("Training network.\n");
fann_cascadetrain_on_data(ann, train_data, max_neurons, neurons_between_reports, desired_error);
- /*fann_train_on_data(ann, train_data, 300, 1, desired_error); */
- /*printf("\nTrain error: %f, Test error: %f\n\n", fann_test_data(ann, train_data), fann_test_data(ann, test_data)); */
-
fann_print_connections(ann);
- /*fann_print_parameters(ann); */
printf("\nTrain error: %f, Test error: %f\n\n", fann_test_data(ann, train_data),
fann_test_data(ann, test_data));
@@ -158,48 +92,3 @@ int main()
return 0;
}
-
-
- /*
- * for(i = 0; i < 6; i++){
- * printf("%.20e, ", ann->activation_values_hidden[i]);
- * }
- * for(i = 0; i < 6; i++){
- * printf("%.20e, ", ann->activation_results_hidden[i]);
- * }
- * printf("\n");
- *
- * for(i = 0; i < 100000; i++)
- * {
- * number = fann_rand(-10.0,10.0);
- * steepness = fann_rand(0.0,2.0);
- * fann_set_activation_steepness_hidden(ann, steepness);
- * fann_set_activation_steepness_output(ann, steepness);
- * v1 = fann_stepwise(
- * ann->activation_values_hidden[0],
- * ann->activation_values_hidden[1],
- * ann->activation_values_hidden[2],
- * ann->activation_values_hidden[3],
- * ann->activation_values_hidden[4],
- * ann->activation_values_hidden[5],
- * ann->activation_results_hidden[0],
- * ann->activation_results_hidden[1],
- * ann->activation_results_hidden[2],
- * ann->activation_results_hidden[3],
- * ann->activation_results_hidden[4],
- * ann->activation_results_hidden[5],
- * -1, 1, number);
- * v1 = fann_activation_new(ann, ann->activation_function_hidden, ann->activation_steepness_hidden, number);
- * number = number*steepness;
- * v2 = fann_stepwise(-2.64665246009826660156e+00, -1.47221946716308593750e+00, -5.49306154251098632812e-01, 5.49306154251098632812e-01, 1.47221934795379638672e+00, 2.64665293693542480469e+00, 4.99999988824129104614e-03, 5.00000007450580596924e-02, 2.50000000000000000000e-01, 7.50000000000000000000e-01, 9.49999988079071044922e-01, 9.95000004768371582031e-01, 0, 1, number);
- * v2 = fann_stepwise(-2.64665293693542480469e+00, -1.47221934795379638672e+00, -5.49306154251098632812e-01, 5.49306154251098632812e-01, 1.47221934795379638672e+00, 2.64665293693542480469e+00, -9.90000009536743164062e-01, -8.99999976158142089844e-01, -5.00000000000000000000e-01, 5.00000000000000000000e-01, 8.99999976158142089844e-01, 9.90000009536743164062e-01, -1, 1, number);
- * if((int)floor(v1*10000.0+0.5) != (int)floor(v2*10000.0+0.5))
- * {
- * printf("steepness = %f, number = %f, v1 = %f, v2 = %f", steepness, number, v1, v2);
- * printf(" **********************");
- * printf("\n");
- * }
- * }
- *
- * exit(0);
- */
diff --git a/src/Makefile.am b/src/Makefile.am
index b893aaf..9805491 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,11 @@ SUBDIRS = include
lib_LTLIBRARIES = libfloatfann.la libdoublefann.la libfixedfann.la libfann.la
-AM_LDFLAGS = -version-info 3:0:2
+AM_LDFLAGS = -version-info 2:0:0
AM_CFLAGS = -D_REENTRANT
libfloatfann_la_SOURCES = floatfann.c
libdoublefann_la_SOURCES = doublefann.c
libfixedfann_la_SOURCES = fixedfann.c
-libfann_la_SOURCES = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c
+libfann_la_SOURCES = floatfann.c
+#libfann_la_SOURCES = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c
diff --git a/src/Makefile.in b/src/Makefile.in
index d163b0c..9c51d62 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -133,13 +133,13 @@ SUBDIRS = include
lib_LTLIBRARIES = libfloatfann.la libdoublefann.la libfixedfann.la libfann.la
-AM_LDFLAGS = -version-info 3:0:2
+AM_LDFLAGS = -version-info 2:0:0
AM_CFLAGS = -D_REENTRANT
libfloatfann_la_SOURCES = floatfann.c
libdoublefann_la_SOURCES = doublefann.c
libfixedfann_la_SOURCES = fixedfann.c
-libfann_la_SOURCES = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c
+libfann_la_SOURCES = floatfann.c
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -153,8 +153,7 @@ am_libdoublefann_la_OBJECTS = doublefann.lo
libdoublefann_la_OBJECTS = $(am_libdoublefann_la_OBJECTS)
libfann_la_LDFLAGS =
libfann_la_LIBADD =
-am_libfann_la_OBJECTS = fann.lo fann_io.lo fann_train.lo \
- fann_train_data.lo fann_error.lo fann_cascade.lo
+am_libfann_la_OBJECTS = floatfann.lo
libfann_la_OBJECTS = $(am_libfann_la_OBJECTS)
libfixedfann_la_LDFLAGS =
libfixedfann_la_LIBADD =
@@ -168,11 +167,7 @@ libfloatfann_la_OBJECTS = $(am_libfloatfann_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/doublefann.Plo ./$(DEPDIR)/fann.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/fann_cascade.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/fann_error.Plo ./$(DEPDIR)/fann_io.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/fann_train.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/fann_train_data.Plo \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/doublefann.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/fixedfann.Plo ./$(DEPDIR)/floatfann.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -246,12 +241,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/doublefann.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann_cascade.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann_error.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann_io.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann_train.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fann_train_data.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixedfann.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/floatfann.Plo at am__quote@
@@ -567,6 +556,7 @@ uninstall-info: uninstall-info-recursive
uninstall-info-am uninstall-info-recursive \
uninstall-libLTLIBRARIES uninstall-recursive
+#libfann_la_SOURCES = fann.c fann_io.c fann_train.c fann_train_data.c fann_error.c fann_cascade.c
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
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