[libfann] 02/34: Merge branch 'upstream'

Christian Kastner chrisk-guest at moszumanska.debian.org
Thu Oct 1 18:06:19 UTC 2015


This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch master
in repository libfann.

commit dd679075a9bbbc3496af23e2489dd6192f144e76
Merge: ccf1bff cc192d3
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 14:24:34 2015 +0200

    Merge branch 'upstream'

 .gitignore                                         |    32 +
 AUTHORS                                            |     6 -
 BorlandC++Builder6.0/all.bpg                       |    59 -
 BorlandC++Builder6.0/cascade_train.bpf             |     3 -
 BorlandC++Builder6.0/cascade_train.bpr             |   181 -
 BorlandC++Builder6.0/cascade_train.res             |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/libfann.bpf                   |     9 -
 BorlandC++Builder6.0/libfann.bpr                   |   130 -
 BorlandC++Builder6.0/momentums.bpf                 |     3 -
 BorlandC++Builder6.0/momentums.bpr                 |   181 -
 BorlandC++Builder6.0/momentums.res                 |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/mushroom.bpf                  |     3 -
 BorlandC++Builder6.0/mushroom.bpr                  |   181 -
 BorlandC++Builder6.0/mushroom.res                  |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/robot.bpf                     |     3 -
 BorlandC++Builder6.0/robot.bpr                     |   181 -
 BorlandC++Builder6.0/robot.res                     |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/simple_test.bpf               |     3 -
 BorlandC++Builder6.0/simple_test.bpr               |   181 -
 BorlandC++Builder6.0/simple_test.res               |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/simple_train.bpf              |     3 -
 BorlandC++Builder6.0/simple_train.bpr              |   194 -
 BorlandC++Builder6.0/simple_train.res              |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/steepness_train.bpf           |     3 -
 BorlandC++Builder6.0/steepness_train.bpr           |   181 -
 BorlandC++Builder6.0/steepness_train.res           |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/xor_test.bpf                  |     3 -
 BorlandC++Builder6.0/xor_test.bpr                  |   181 -
 BorlandC++Builder6.0/xor_test.res                  |   Bin 876 -> 0 bytes
 BorlandC++Builder6.0/xor_train.bpf                 |     3 -
 BorlandC++Builder6.0/xor_train.bpr                 |   181 -
 BorlandC++Builder6.0/xor_train.res                 |   Bin 876 -> 0 bytes
 CMakeLists.txt                                     |    55 +
 COPYING => COPYING.txt                             |  1008 +-
 ChangeLog                                          |   123 -
 INSTALL                                            |   182 -
 Makefile.am                                        |    24 -
 Makefile.in                                        |   651 -
 MicrosoftVisualC++.Net/all.ncb                     |   Bin 142336 -> 0 bytes
 MicrosoftVisualC++.Net/all.sln                     |    66 -
 MicrosoftVisualC++.Net/all.suo                     |   Bin 18432 -> 0 bytes
 MicrosoftVisualC++.Net/libfann.vcproj              |   269 -
 MicrosoftVisualC++.Net/simple_test.vcproj          |   181 -
 MicrosoftVisualC++.Net/simple_train.vcproj         |   177 -
 MicrosoftVisualC++.Net/steepness_train.vcproj      |   177 -
 MicrosoftVisualC++.Net/xor.data                    |     9 -
 MicrosoftVisualC++.Net/xor_test.vcproj             |   175 -
 MicrosoftVisualC++.Net/xor_train.vcproj            |   175 -
 MicrosoftVisualC++6.0/README.txt                   |     5 -
 MicrosoftVisualC++6.0/all.dsw                      |   104 -
 MicrosoftVisualC++6.0/libfann.dsp                  |   156 -
 MicrosoftVisualC++6.0/simple_test.dsp              |   110 -
 MicrosoftVisualC++6.0/simple_train.dsp             |   110 -
 MicrosoftVisualC++6.0/steepness_train.dsp          |   110 -
 MicrosoftVisualC++6.0/xor_test.dsp                 |   110 -
 MicrosoftVisualC++6.0/xor_train.dsp                |   110 -
 MicrosoftWindowsDll/examples/examples.ncb          |   Bin 52224 -> 0 bytes
 MicrosoftWindowsDll/examples/examples.sln          |    45 -
 MicrosoftWindowsDll/examples/examples.suo          |   Bin 16384 -> 0 bytes
 MicrosoftWindowsDll/examples/simple_test.vcproj    |   172 -
 MicrosoftWindowsDll/examples/simple_train.vcproj   |   172 -
 MicrosoftWindowsDll/examples/xor_test.vcproj       |   170 -
 MicrosoftWindowsDll/examples/xor_train.vcproj      |   170 -
 MicrosoftWindowsDll/makefile                       |   353 -
 MicrosoftWindowsDll/readme.txt                     |    76 -
 MicrosoftWindowsDll/win32.ncb                      |   Bin 134144 -> 0 bytes
 MicrosoftWindowsDll/win32.sln                      |    54 -
 MicrosoftWindowsDll/win32.suo                      |   Bin 20480 -> 0 bytes
 MicrosoftWindowsDll/windll.vcproj                  |   819 -
 NEWS                                               |     1 -
 README                                             |    40 -
 README.txt                                         |    37 +
 TODO                                               |    68 -
 VS2010/cascade_train/cascade_train.vcxproj         |    92 +
 VS2010/cascade_train/cascade_train.vcxproj.filters |     6 +
 VS2010/fann.sln                                    |   110 +
 VS2010/fanndouble/fanndouble.vcxproj               |   109 +
 VS2010/fanndouble/fanndouble.vcxproj.filters       |    68 +
 VS2010/fannfixed/fannfixed.filters                 |    68 +
 VS2010/fannfixed/fannfixed.vcxproj                 |   109 +
 VS2010/fannfloat/fannfloat.vcxproj                 |   107 +
 VS2010/fannfloat/fannfloat.vcxproj.filters         |    68 +
 VS2010/momentums/momentums.vcxproj                 |    92 +
 VS2010/momentums/momentums.vcxproj.filters         |     6 +
 VS2010/mushroom/mushroom.vcxproj                   |    92 +
 VS2010/mushroom/mushroom.vcxproj.filters           |     6 +
 VS2010/robot/robot.vcxproj                         |    92 +
 VS2010/robot/robot.vcxproj.filters                 |     6 +
 VS2010/scaling_test/scaling_test.vcxproj           |    92 +
 VS2010/scaling_test/scaling_test.vcxproj.filters   |     6 +
 VS2010/scaling_train/scaling_train.vcxproj         |    92 +
 VS2010/scaling_train/scaling_train.vcxproj.filters |     6 +
 .../simple_train_double.vcxproj                    |    93 +
 .../simple_train_double.vcxproj.filters            |     6 +
 .../simple_train_float/simple_train_float.vcxproj  |    97 +
 .../simple_train_float.vcxproj.filters             |     6 +
 VS2010/steepness_train/steepness_train.vcxproj     |    92 +
 .../steepness_train.vcxproj.filters                |     6 +
 VS2010/xor_cpp_sample/xor_cpp_sample.vcxproj       |    92 +
 .../xor_cpp_sample/xor_cpp_sample.vcxproj.filters  |     6 +
 VS2010/xor_test_fixed/xor_test_fixed.vcxproj       |    94 +
 .../xor_test_fixed/xor_test_fixed.vcxproj.filters  |     6 +
 VS2010/xor_test_float/xor_test_float.vcxproj       |    97 +
 .../xor_test_float/xor_test_float.vcxproj.filters  |     6 +
 VS2010/xor_train/xor_train.vcxproj                 |    97 +
 VS2010/xor_train/xor_train.vcxproj.filters         |     6 +
 aclocal.m4                                         |  7267 -------
 benchmarks/.cvsignore                              |    13 -
 benchmarks/Makefile                                |    46 -
 benchmarks/README                                  |    27 -
 benchmarks/benchmark.sh                            |    99 -
 benchmarks/benchmarks.pdf                          |   Bin 649080 -> 0 bytes
 benchmarks/ctimer.h                                |    92 -
 benchmarks/gnuplot                                 |   259 -
 benchmarks/gnuplot.pl                              |   137 -
 benchmarks/parity.c                                |   115 -
 benchmarks/performance.cc                          |   284 -
 benchmarks/quality.cc                              |   704 -
 benchmarks/quality_fixed.c                         |    87 -
 benchmarks/shuffle.c                               |    81 -
 benchmarks/summary.txt                             |   321 -
 benchmarks/summary2tex.pl                          |   160 -
 benchmarks/two-spirals.c                           |   145 -
 cmake/Modules/DefineInstallationPaths.cmake        |   138 +
 cmake/config.h.cmake                               |     8 +
 fann.pc.in => cmake/fann.pc.cmake                  |     8 +-
 config.guess                                       |  1466 --
 config.in                                          |    64 -
 config.sub                                         |  1579 --
 configure                                          | 20419 -------------------
 configure.in                                       |    10 -
 {benchmarks/datasets => datasets}/abelone.test     |     0
 {benchmarks/datasets => datasets}/abelone.train    |     0
 {benchmarks/datasets => datasets}/bank32fm.test    |     0
 {benchmarks/datasets => datasets}/bank32fm.train   |     0
 {benchmarks/datasets => datasets}/bank32nh.test    |     0
 {benchmarks/datasets => datasets}/bank32nh.train   |     0
 {benchmarks/datasets => datasets}/building.test    |     0
 {benchmarks/datasets => datasets}/building.train   |     0
 .../datasets => datasets}/census-house.test        |     0
 .../datasets => datasets}/census-house.train       |     0
 {benchmarks/datasets => datasets}/diabetes.test    |     0
 {benchmarks/datasets => datasets}/diabetes.train   |     0
 {benchmarks/datasets => datasets}/gene.test        |     0
 {benchmarks/datasets => datasets}/gene.train       |     0
 {benchmarks/datasets => datasets}/kin32fm.test     |     0
 {benchmarks/datasets => datasets}/kin32fm.train    |     0
 {benchmarks/datasets => datasets}/mushroom.test    |     0
 {benchmarks/datasets => datasets}/mushroom.train   |     0
 {benchmarks/datasets => datasets}/parity13.test    |     0
 {benchmarks/datasets => datasets}/parity13.train   |     0
 {benchmarks/datasets => datasets}/parity8.test     |     0
 {benchmarks/datasets => datasets}/parity8.train    |     0
 .../datasets => datasets}/pumadyn-32fm.test        |     0
 .../datasets => datasets}/pumadyn-32fm.train       |     0
 {benchmarks/datasets => datasets}/robot.test       |     0
 {benchmarks/datasets => datasets}/robot.train      |     0
 {examples => datasets}/scaling.data                |  4002 ++--
 {benchmarks/datasets => datasets}/soybean.test     |     0
 {benchmarks/datasets => datasets}/soybean.train    |     0
 {benchmarks/datasets => datasets}/thyroid.test     |     0
 {benchmarks/datasets => datasets}/thyroid.train    |     0
 {benchmarks/datasets => datasets}/two-spiral.test  |     0
 {benchmarks/datasets => datasets}/two-spiral.train |     0
 depcomp                                            |   479 -
 doc/advancedusage.txt                              |    84 -
 doc/fixedpointusage.txt                            |   156 -
 doc/gettingstarted.txt                             |    92 -
 doc/installation.txt                               |   117 -
 doc/theory.txt                                     |    33 -
 examples/.gitignore                                |    18 +
 examples/Makefile                                  |    28 +-
 examples/cascade_train.c                           |    98 +-
 examples/momentums.c                               |     8 +-
 examples/mushroom.c                                |     6 +-
 examples/robot.c                                   |     8 +-
 examples/scaling_test.c                            |    16 +-
 examples/scaling_train.c                           |    17 +-
 examples/simple_test.c                             |     2 +-
 examples/simple_train.c                            |     2 +-
 examples/steepness_train.c                         |     2 +-
 examples/xor_test.c                                |     4 +-
 examples/xor_train.c                               |     4 +-
 fann.spec.in                                       |    81 -
 install-sh                                         |   269 -
 ltmain.sh                                          |  6871 -------
 missing                                            |   336 -
 mkinstalldirs                                      |    40 -
 python/INSTALL                                     |    48 -
 python/Makefile                                    |    45 -
 python/README                                      |    31 -
 python/build.bat                                   |     3 -
 python/examples/cascade_train.py                   |    63 -
 python/examples/mushroom.py                        |    57 -
 python/examples/simple_train.py                    |    22 -
 python/pyfann/Makefile                             |    22 -
 python/pyfann/__init__.py                          |     7 -
 python/pyfann/fann_cpp_subclass.h                  |   580 -
 python/pyfann/makefile.msvc                        |    23 -
 python/pyfann/pyfann.i                             |   189 -
 python/setup.py                                    |    50 -
 src/CMakeLists.txt                                 |    54 +
 src/COPYING                                        |   504 -
 src/Makefile.am                                    |    13 -
 src/Makefile.in                                    |   585 -
 src/doublefann.c                                   |     2 +-
 src/fann.c                                         |   307 +-
 src/fann_cascade.c                                 |    37 +-
 src/fann_error.c                                   |     8 +-
 src/fann_io.c                                      |    94 +-
 src/fann_train.c                                   |    87 +-
 src/fann_train_data.c                              |   276 +-
 src/fixedfann.c                                    |     2 +-
 src/floatfann.c                                    |     2 +-
 src/include/CMakeLists.txt                         |     4 +
 src/include/Makefile.am                            |     1 -
 src/include/Makefile.in                            |   406 -
 src/include/compat_time.h                          |   276 +-
 src/include/config.h                               |    65 +-
 src/include/doublefann.h                           |     2 +-
 src/include/fann.h                                 |    12 +-
 src/include/fann_activation.h                      |     2 +-
 src/include/fann_cascade.h                         |    56 +-
 src/include/fann_cpp.h                             |  7171 +++----
 src/include/fann_data.h                            |    31 +-
 src/include/fann_error.h                           |     8 +-
 src/include/fann_internal.h                        |    10 +-
 src/include/fann_io.h                              |     2 +-
 src/include/fann_train.h                           |   109 +-
 src/include/fixedfann.h                            |     2 +-
 src/include/floatfann.h                            |     2 +-
 231 files changed, 9544 insertions(+), 58128 deletions(-)

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