[libfann] 223/242: *** empty log message ***
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:48 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 505f1c5c595405b6be936a2856c68f5277344a43
Author: Steffen Nissen <lukesky at diku.dk>
Date: Tue Dec 13 22:48:26 2005 +0000
*** empty log message ***
---
Makefile.am | 10 ++++---
Makefile.in | 5 +++-
TODO | 4 +--
benchmarks/benchmark.sh | 36 +++++++++++------------
debian/changelog | 6 ++++
debian/control | 72 ++++++++++++++++++++++++++--------------------
debian/docs | 3 +-
debian/rules | 4 +--
examples/mushroom.c | 3 +-
examples/robot.c | 2 +-
examples/steepness_train.c | 6 ++--
examples/xor_test.c | 12 ++++----
examples/xor_train.c | 6 ++--
src/include/config.h | 2 +-
14 files changed, 96 insertions(+), 75 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 02ea1bd..25f500a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,12 @@ pkgconfig_DATA = fann.pc
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 \
- debian/libfann1.dirs debian/libfann1.files debian/libfann1.install \
- debian/rules win32_dll/makefile win32_dll/readme.txt win32_dll/win32.ncb \
+ debian/docs debian/libfann2-dev.dirs debian/libfann2-dev.examples \
+ debian/libfann2-dev.files debian/libfann2-dev.install \
+ debian/libfann2.dirs debian/libfann2.files debian/libfann2.install \
+ debian/libfann2-py.dirs debian/libfann2-py.files \
+ debian/libfann2-py.install debian/rules win32_dll/makefile \
+ win32_dll/readme.txt win32_dll/win32.ncb \
win32_dll/win32.sln win32_dll/win32.suo win32_dll/windll.vcproj \
win32_dll/examples/examples.ncb win32_dll/examples/examples.sln \
win32_dll/examples/examples.suo win32_dll/examples/simple_test.vcproj \
diff --git a/Makefile.in b/Makefile.in
index b3e47ca..b53f832 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,7 +148,8 @@ EXTRA_DIST = benchmarks examples MSVC++ vs.net2003 src/include/config.h \
win32_dll/examples/simple_train.vcproj win32_dll/examples/xor_test.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
+ doc/fixedpointusage.txt doc/installation.txt doc/fann_en.pdf \
+ python
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -579,6 +580,8 @@ dist-hook:
rm -rf `find $(distdir) -name "*~" -o -name ".#*"`
(cd $(distdir)/examples && make clean)
rm -rf `find $(distdir)/examples -name CVS`
+ (cd $(distdir)/python && make clean)
+ rm -rf `find $(distdir)/python -name CVS`
(cd $(distdir)/benchmarks && make clean)
rm -rf `find $(distdir)/benchmarks -name CVS`
rm -rf `find $(distdir)/MSVC++ -name CVS`
diff --git a/TODO b/TODO
index 14ea85f..504390a 100644
--- a/TODO
+++ b/TODO
@@ -48,8 +48,8 @@ Things TODO when releasing a new version (mostly for fann developers)
#Example of make command
rm -rf fann-2.0.0.* test && mkdir test && ./configure && make distclean && ./configure && 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
+ pbuilder update --distribution unstable
+ pdebuild
exit
cd .. && cp /var/cache/pbuilder/result/*deb . && lintian *deb
diff --git a/benchmarks/benchmark.sh b/benchmarks/benchmark.sh
index 839c767..ea48526 100755
--- a/benchmarks/benchmark.sh
+++ b/benchmarks/benchmark.sh
@@ -2,7 +2,7 @@
date;
-max_seconds_training=200;
+max_seconds_training=300;
secs_between_reports=0.1;
function benchmark_algorithm() {
@@ -26,49 +26,49 @@ function benchmark_problem() {
#algo="fann_incremental_stepwise"; benchmark_algorithm;
#comment out two following lines if the libraries are not available
-# algo="lwnn"; benchmark_algorithm;
-# algo="jneural"; benchmark_algorithm;
+ algo="lwnn"; benchmark_algorithm;
+ algo="jneural"; benchmark_algorithm;
}
#comment out some of the lines below if some of the problems should not be benchmarked
prob="building"; n1=16; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="diabetes"; n1=4; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="gene"; n1=4; n2=2; sec_train=$max_seconds_training;
benchmark_problem;
prob="mushroom"; n1=32; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="parity8"; n1=16; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="parity13"; n1=26; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="pumadyn-32fm"; n1=10; n2=0; sec_train=30;
-#benchmark_problem;
+benchmark_problem;
prob="robot"; n1=96; n2=0; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="soybean"; n1=16; n2=8; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="thyroid"; n1=16; n2=8; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
prob="two-spiral"; n1=20; n2=10; sec_train=$max_seconds_training;
-#benchmark_problem;
+benchmark_problem;
-#./performance fann fann_performance.out 1 2048 2 20
-#./performance fann_stepwise fann_stepwise_performance.out 1 2048 2 20
-#./performance_fixed fann fann_fixed_performance.out 1 2048 2 20
-#./performance lwnn lwnn_performance.out 1 2048 2 20
-#./performance jneural jneural_performance.out 1 256 2 20
+./performance fann fann_performance.out 1 2048 2 20
+./performance fann_stepwise fann_stepwise_performance.out 1 2048 2 20
+./performance_fixed fann fann_fixed_performance.out 1 2048 2 20
+./performance lwnn lwnn_performance.out 1 2048 2 20
+./performance jneural jneural_performance.out 1 256 2 20
gnuplot < gnuplot
diff --git a/debian/changelog b/debian/changelog
index 311e019..e41b8c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libfann2 (2.0.0-1) unstable; urgency=low
+
+ * Debian package for version 2.0.0
+
+ -- Steffen Nissen <sn at leenissen.dk> Tue, 13 Dec 2005 23:25:14 +0100
+
libfann1 (1.2.0-2) unstable; urgency=low
* Added python bindings package
diff --git a/debian/control b/debian/control
index 4dfa284..5de65f5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,55 +1,65 @@
-Source: libfann1
+Source: libfann2
Section: libdevel
Priority: optional
Maintainer: Steffen Nissen <lukesky at diku.dk>
Standards-Version: 3.6.0
Build-Depends: docbook-utils, debhelper (>= 4.0.0), python-dev
-Package: libfann1-dev
+Package: libfann2-dev
Section: libdevel
Architecture: any
-Depends: libfann1 (= ${Source-Version})
-Description: Fast Artificial Neural Network Library, Development files
- Fast Artificial Neural Network Library implements multilayer
- 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.
- .
- A reference manual accompanies the library with examples and
- recommendations on how to use the library.
+Depends: libfann2 (= ${Source-Version})
+Description: Fast Artificial Neural Network Library is a free open
+ source neural network library, which implements multilayer 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, C++, .NET, Python, Delphi, Octave, Ruby,
+ Pure Data and Mathematica bindings are available. A reference manual
+ accompanies the library with examples and recommendations on how to
+ use the library. A graphical user interface is also available for the
+ library.
.
This package contains the header files and static libraries which is
needed for developing the libfann applications.
-Package: libfann1
+Package: libfann2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: libfann1-dev (= ${Source-Version})
-Description: Fast Artificial Neural Network Library (fann)
- Fast Artificial Neural Network Library implements multilayer
- 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.
+Suggests: libfann2-dev (= ${Source-Version})
+Description: Fast Artificial Neural Network Library is a free open
+ source neural network library, which implements multilayer 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, C++, .NET, Python, Delphi, Octave, Ruby,
+ Pure Data and Mathematica bindings are available. A reference manual
+ accompanies the library with examples and recommendations on how to
+ use the library. A graphical user interface is also available for the
+ library.
.
This package contains the shared libraries.
-Package: libfann1-py
+Package: libfann2-py
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, libfann1
-Suggests: libfann1-dev (= ${Source-Version})
+Depends: ${shlibs:Depends}, libfann2
+Suggests: libfann2-dev (= ${Source-Version})
Description: Python FANN Bindings (pyfann)
- Fast Artificial Neural Network Library implements multilayer
- 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.
+ Fast Artificial Neural Network Library is a free open
+ source neural network library, which implements multilayer 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, C++, .NET, Python, Delphi, Octave, Ruby,
+ Pure Data and Mathematica bindings are available. A reference manual
+ accompanies the library with examples and recommendations on how to
+ use the library. A graphical user interface is also available for the
+ library.
.
This package contains the python wrapper.
diff --git a/debian/docs b/debian/docs
index a6320e6..82fb619 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,5 +2,6 @@ NEWS
README
TODO
AUTHORS
+ChangeLog
doc/fann_doc_complete_1.0.pdf
-doc/html
+doc/*txt
diff --git a/debian/rules b/debian/rules
index 962b7a5..15ab8fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,10 +43,8 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- cd doc && $(MAKE) html
-
$(MAKE)
-
+
cd python && make build
touch build-stamp
diff --git a/examples/mushroom.c b/examples/mushroom.c
index c36cb8d..350d673 100644
--- a/examples/mushroom.c
+++ b/examples/mushroom.c
@@ -54,10 +54,11 @@ int main()
test_data = fann_read_train_from_file("../benchmarks/datasets/mushroom.test");
fann_reset_MSE(ann);
- for(i = 0; i < test_data->num_data; i++)
+ for(i = 0; i < fann_length_train_data(test_data); i++)
{
fann_test(ann, test_data->input[i], test_data->output[i]);
}
+
printf("MSE error on test data: %f\n", fann_get_MSE(ann));
printf("Saving network.\n");
diff --git a/examples/robot.c b/examples/robot.c
index f584b45..711f57d 100644
--- a/examples/robot.c
+++ b/examples/robot.c
@@ -50,7 +50,7 @@ int main()
test_data = fann_read_train_from_file("../benchmarks/datasets/robot.test");
fann_reset_MSE(ann);
- for(i = 0; i < test_data->num_data; i++)
+ for(i = 0; i < fann_length_train_data(test_data); i++)
{
fann_test(ann, test_data->input[i], test_data->output[i]);
}
diff --git a/examples/steepness_train.c b/examples/steepness_train.c
index 2ce2c99..8a1b21d 100644
--- a/examples/steepness_train.c
+++ b/examples/steepness_train.c
@@ -98,12 +98,12 @@ int main()
fann_set_activation_function_hidden(ann, FANN_THRESHOLD_SYMMETRIC);
fann_set_activation_function_output(ann, FANN_THRESHOLD_SYMMETRIC);
- for(i = 0; i != data->num_data; i++)
+ for(i = 0; i != fann_length_train_data(data); i++)
{
calc_out = fann_run(ann, data->input[i]);
printf("XOR test (%f, %f) -> %f, should be %f, difference=%f\n",
- data->input[i][0], data->input[i][1], *calc_out, data->output[i][0],
- (float) fann_abs(*calc_out - data->output[i][0]));
+ data->input[i][0], data->input[i][1], calc_out[0], data->output[i][0],
+ (float) fann_abs(calc_out[0] - data->output[i][0]));
}
diff --git a/examples/xor_test.c b/examples/xor_test.c
index e4e3753..928d0c6 100644
--- a/examples/xor_test.c
+++ b/examples/xor_test.c
@@ -55,24 +55,24 @@ int main()
data = fann_read_train_from_file("xor.data");
#endif
- for(i = 0; i < data->num_data; i++)
+ for(i = 0; i < fann_length_train_data(data); i++)
{
fann_reset_MSE(ann);
calc_out = fann_test(ann, data->input[i], data->output[i]);
#ifdef FIXEDFANN
printf("XOR test (%d, %d) -> %d, should be %d, difference=%f\n",
- data->input[i][0], data->input[i][1], *calc_out, data->output[i][0],
- (float) fann_abs(*calc_out - data->output[i][0]) / fann_get_multiplier(ann));
+ data->input[i][0], data->input[i][1], calc_out[0], data->output[i][0],
+ (float) fann_abs(calc_out[0] - data->output[i][0]) / fann_get_multiplier(ann));
- if((float) fann_abs(*calc_out - data->output[i][0]) / fann_get_multiplier(ann) > 0.2)
+ if((float) fann_abs(calc_out[0] - data->output[i][0]) / fann_get_multiplier(ann) > 0.2)
{
printf("Test failed\n");
ret = -1;
}
#else
printf("XOR test (%f, %f) -> %f, should be %f, difference=%f\n",
- data->input[i][0], data->input[i][1], *calc_out, data->output[i][0],
- (float) fann_abs(*calc_out - data->output[i][0]));
+ data->input[i][0], data->input[i][1], calc_out[0], data->output[i][0],
+ (float) fann_abs(calc_out[0] - data->output[i][0]));
#endif
}
diff --git a/examples/xor_train.c b/examples/xor_train.c
index e1381e4..d2418d0 100644
--- a/examples/xor_train.c
+++ b/examples/xor_train.c
@@ -69,12 +69,12 @@ int main()
printf("Testing network. %f\n", fann_test_data(ann, data));
- for(i = 0; i < data->num_data; i++)
+ for(i = 0; i < fann_length_train_data(data); i++)
{
calc_out = fann_run(ann, data->input[i]);
printf("XOR test (%f,%f) -> %f, should be %f, difference=%f\n",
- data->input[i][0], data->input[i][1], *calc_out, data->output[i][0],
- fann_abs(*calc_out - data->output[i][0]));
+ data->input[i][0], data->input[i][1], calc_out[0], data->output[i][0],
+ fann_abs(calc_out[0] - data->output[i][0]));
}
printf("Saving network.\n");
diff --git a/src/include/config.h b/src/include/config.h
index 9009a41..701126a 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -59,7 +59,7 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "2.0.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
--
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