[libfann] 04/133: Merge commit 'upstream/2.1.0.beta'

Christian Kastner chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:07:43 UTC 2014


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

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

commit 4f73521a86b04abb72b9d9b7cded173b285fb70f
Merge: b64c7b2 a3c4599
Author: Christian Kastner <debian at kvr.at>
Date:   Mon Jun 7 13:11:06 2010 +0200

    Merge commit 'upstream/2.1.0.beta'
    
    Conflicts:
    	config.guess

 AUTHORS                                            |     5 +
 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 0 -> 876 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 0 -> 876 bytes
 BorlandC++Builder6.0/mushroom.bpf                  |     3 +
 BorlandC++Builder6.0/mushroom.bpr                  |   181 +
 BorlandC++Builder6.0/mushroom.res                  |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/robot.bpf                     |     3 +
 BorlandC++Builder6.0/robot.bpr                     |   181 +
 BorlandC++Builder6.0/robot.res                     |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/simple_test.bpf               |     3 +
 BorlandC++Builder6.0/simple_test.bpr               |   181 +
 BorlandC++Builder6.0/simple_test.res               |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/simple_train.bpf              |     3 +
 BorlandC++Builder6.0/simple_train.bpr              |   194 +
 BorlandC++Builder6.0/simple_train.res              |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/steepness_train.bpf           |     3 +
 BorlandC++Builder6.0/steepness_train.bpr           |   181 +
 BorlandC++Builder6.0/steepness_train.res           |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/xor_test.bpf                  |     3 +
 BorlandC++Builder6.0/xor_test.bpr                  |   181 +
 BorlandC++Builder6.0/xor_test.res                  |   Bin 0 -> 876 bytes
 BorlandC++Builder6.0/xor_train.bpf                 |     3 +
 BorlandC++Builder6.0/xor_train.bpr                 |   181 +
 BorlandC++Builder6.0/xor_train.res                 |   Bin 0 -> 876 bytes
 ChangeLog                                          |    48 +-
 Makefile.am                                        |    32 +-
 Makefile.in                                        |   323 +-
 MicrosoftVisualC++.Net/all.ncb                     |   Bin 0 -> 142336 bytes
 MicrosoftVisualC++.Net/all.sln                     |    66 +
 MicrosoftVisualC++.Net/all.suo                     |   Bin 0 -> 18432 bytes
 MicrosoftVisualC++.Net/libfann.vcproj              |   269 +
 .../simple_test.vcproj                             |    41 +-
 .../simple_train.vcproj                            |    37 +-
 .../steepness_train.vcproj                         |   103 +-
 MicrosoftVisualC++.Net/xor.data                    |     9 +
 .../xor_test.vcproj                                |    35 +-
 .../xor_train.vcproj                               |    35 +-
 MicrosoftVisualC++6.0/README.txt                   |     5 +
 {MSVC++ => MicrosoftVisualC++6.0}/all.dsw          |     0
 {MSVC++ => MicrosoftVisualC++6.0}/libfann.dsp      |    32 +-
 {MSVC++ => MicrosoftVisualC++6.0}/simple_test.dsp  |     0
 {MSVC++ => MicrosoftVisualC++6.0}/simple_train.dsp |     7 +-
 .../steepness_train.dsp                            |     7 +-
 {MSVC++ => MicrosoftVisualC++6.0}/xor_test.dsp     |     7 +-
 {MSVC++ => MicrosoftVisualC++6.0}/xor_train.dsp    |     7 +-
 .../examples/examples.ncb                          |   Bin
 .../examples/examples.sln                          |     0
 .../examples/examples.suo                          |   Bin
 .../examples/simple_test.vcproj                    |     0
 .../examples/simple_train.vcproj                   |     0
 .../examples/xor_test.vcproj                       |     0
 .../examples/xor_train.vcproj                      |     0
 {win32_dll => MicrosoftWindowsDll}/makefile        |    26 +-
 {win32_dll => MicrosoftWindowsDll}/readme.txt      |   152 +-
 MicrosoftWindowsDll/win32.ncb                      |   Bin 0 -> 134144 bytes
 {win32_dll => MicrosoftWindowsDll}/win32.sln       |     0
 {win32_dll => MicrosoftWindowsDll}/win32.suo       |   Bin 20480 -> 20480 bytes
 {win32_dll => MicrosoftWindowsDll}/windll.vcproj   |    17 +-
 README                                             |    10 +-
 TODO                                               |    34 +-
 aclocal.m4                                         | 12352 +++++-----
 benchmarks/.cvsignore                              |    14 +-
 benchmarks/Makefile                                |    12 +-
 benchmarks/benchmark.sh                            |    56 +-
 benchmarks/benchmarks.pdf                          |   Bin 815106 -> 649080 bytes
 benchmarks/ctimer.h                                |     0
 benchmarks/datasets/abelone.test                   |  4179 ++++
 benchmarks/datasets/abelone.train                  |  4177 ++++
 benchmarks/datasets/bank32fm.test                  |  4097 ++++
 benchmarks/datasets/bank32fm.train                 |  4097 ++++
 benchmarks/datasets/bank32nh.test                  |  4097 ++++
 benchmarks/datasets/bank32nh.train                 |  4097 ++++
 benchmarks/datasets/building.test                  |  8416 +++----
 benchmarks/datasets/building.train                 |  8416 +++----
 benchmarks/datasets/census-house.test              | 22785 +++++++++++++++++
 benchmarks/datasets/census-house.train             | 22785 +++++++++++++++++
 benchmarks/datasets/diabetes.test                  |     0
 benchmarks/datasets/diabetes.train                 |     0
 benchmarks/datasets/gene.test                      |  3174 +--
 benchmarks/datasets/gene.train                     |  3176 +--
 benchmarks/datasets/kin32fm.test                   |  4097 ++++
 benchmarks/datasets/kin32fm.train                  |  4097 ++++
 benchmarks/datasets/mushroom.test                  |     0
 benchmarks/datasets/mushroom.train                 |     0
 benchmarks/datasets/parity13.test                  | 24576 ++++++++++++-------
 benchmarks/datasets/parity13.train                 | 16382 ++++++------
 benchmarks/datasets/parity8.test                   |   768 +-
 benchmarks/datasets/parity8.train                  |   510 +-
 benchmarks/datasets/pumadyn-32fm.test              |  2048 +-
 benchmarks/datasets/pumadyn-32fm.train             |  2048 +-
 benchmarks/datasets/robot.test                     |  1188 +-
 benchmarks/datasets/robot.train                    |   748 +-
 benchmarks/datasets/soybean.test                   |   682 +-
 benchmarks/datasets/soybean.train                  |   684 +-
 benchmarks/datasets/thyroid.test                   |     0
 benchmarks/datasets/thyroid.train                  |     0
 benchmarks/datasets/two-spiral.test                |  1158 +-
 benchmarks/datasets/two-spiral.train               |   582 +-
 benchmarks/gnuplot                                 |    70 +-
 benchmarks/gnuplot.pl                              |   137 +
 benchmarks/parity.c                                |    95 +-
 benchmarks/performance.cc                          |   191 +-
 benchmarks/quality.cc                              |   659 +-
 benchmarks/quality_fixed.c                         |    52 +-
 benchmarks/shuffle.c                               |    98 +-
 benchmarks/summary.txt                             |   321 +
 benchmarks/summary2tex.pl                          |   160 +
 benchmarks/two-spirals.c                           |   158 +-
 config.guess                                       |   543 +-
 config.in                                          |     0
 config.sub                                         |    87 +-
 configure                                          |  6486 +++--
 configure.in                                       |     2 +-
 debian/changelog                                   |    12 +
 debian/compat                                      |     0
 debian/control                                     |    75 +-
 debian/copyright                                   |     0
 debian/docs                                        |     4 +-
 debian/{libfann1-dev.dirs => libfann2-dev.dirs}    |     0
 ...libfann1-dev.examples => libfann2-dev.examples} |     0
 debian/{libfann1-dev.files => libfann2-dev.files}  |     0
 .../{libfann1-dev.install => libfann2-dev.install} |     0
 debian/libfann2-py.dirs                            |     0
 debian/libfann2-py.files                           |     1 +
 debian/libfann2-py.install                         |     1 +
 debian/{libfann1.dirs => libfann2.dirs}            |     0
 debian/{libfann1.files => libfann2.files}          |     0
 debian/{libfann1.install => libfann2.install}      |     0
 debian/rules                                       |    12 +-
 doc/Makefile                                       |    50 -
 doc/advancedusage.txt                              |    84 +
 doc/fann.xml                                       |  5366 ----
 doc/fann_doc_complete_1.0.pdf                      |   Bin 568375 -> 0 bytes
 doc/fann_en.pdf                                    |   Bin 0 -> 952598 bytes
 doc/fixedpointusage.txt                            |   156 +
 doc/gettingstarted.txt                             |    92 +
 doc/html/b3048.html                                |   808 -
 doc/html/c104.html                                 |   287 -
 doc/html/c13.html                                  |   179 -
 doc/html/c189.html                                 |   245 -
 doc/html/c225.html                                 |   213 -
 doc/html/c2519.html                                |   267 -
 doc/html/c253.html                                 |   201 -
 doc/html/c3037.html                                |   168 -
 doc/html/index.html                                |  1027 -
 doc/html/r1007.html                                |   184 -
 doc/html/r1024.html                                |   184 -
 doc/html/r1040.html                                |   198 -
 doc/html/r1060.html                                |   184 -
 doc/html/r1076.html                                |   198 -
 doc/html/r1096.html                                |   184 -
 doc/html/r1112.html                                |   202 -
 doc/html/r1133.html                                |   184 -
 doc/html/r1149.html                                |   201 -
 doc/html/r1170.html                                |   196 -
 doc/html/r1191.html                                |   187 -
 doc/html/r1209.html                                |   181 -
 doc/html/r1224.html                                |   190 -
 doc/html/r1242.html                                |   181 -
 doc/html/r1257.html                                |   190 -
 doc/html/r1275.html                                |   180 -
 doc/html/r1290.html                                |   189 -
 doc/html/r1308.html                                |   180 -
 doc/html/r1323.html                                |   189 -
 doc/html/r1341.html                                |   179 -
 doc/html/r1356.html                                |   188 -
 doc/html/r1374.html                                |   179 -
 doc/html/r1389.html                                |   188 -
 doc/html/r1407.html                                |   179 -
 doc/html/r1422.html                                |   180 -
 doc/html/r1437.html                                |   180 -
 doc/html/r1452.html                                |   179 -
 doc/html/r1467.html                                |   182 -
 doc/html/r1483.html                                |   182 -
 doc/html/r1501.html                                |   180 -
 doc/html/r1516.html                                |   185 -
 doc/html/r1533.html                                |   175 -
 doc/html/r1547.html                                |   175 -
 doc/html/r1561.html                                |   190 -
 doc/html/r1580.html                                |   177 -
 doc/html/r1597.html                                |   724 -
 doc/html/r1837.html                                |   300 -
 doc/html/r1900.html                                |   244 -
 doc/html/r1936.html                                |   229 -
 doc/html/r1970.html                                |   215 -
 doc/html/r1996.html                                |   253 -
 doc/html/r2030.html                                |   252 -
 doc/html/r2077.html                                |   206 -
 doc/html/r2099.html                                |   279 -
 doc/html/r2173.html                                |   195 -
 doc/html/r2195.html                                |   197 -
 doc/html/r2216.html                                |   214 -
 doc/html/r2242.html                                |   188 -
 doc/html/r2262.html                                |   217 -
 doc/html/r2289.html                                |   232 -
 doc/html/r2321.html                                |   198 -
 doc/html/r2344.html                                |   205 -
 doc/html/r2369.html                                |   179 -
 doc/html/r2384.html                                |   179 -
 doc/html/r2403.html                                |   183 -
 doc/html/r2419.html                                |   183 -
 doc/html/r2437.html                                |   191 -
 doc/html/r2455.html                                |   209 -
 doc/html/r2478.html                                |   191 -
 doc/html/r2496.html                                |   208 -
 doc/html/r2555.html                                |   286 -
 doc/html/r258.html                                 |   221 -
 doc/html/r2597.html                                |   304 -
 doc/html/r2641.html                                |   204 -
 doc/html/r2664.html                                |   225 -
 doc/html/r2688.html                                |   216 -
 doc/html/r2714.html                                |   220 -
 doc/html/r2740.html                                |   183 -
 doc/html/r2756.html                                |   198 -
 doc/html/r2777.html                                |   199 -
 doc/html/r2798.html                                |   199 -
 doc/html/r2819.html                                |   183 -
 doc/html/r2835.html                                |   191 -
 doc/html/r285.html                                 |   240 -
 doc/html/r2854.html                                |   192 -
 doc/html/r2873.html                                |   192 -
 doc/html/r2892.html                                |   193 -
 doc/html/r2911.html                                |   192 -
 doc/html/r2930.html                                |   191 -
 doc/html/r2949.html                                |   202 -
 doc/html/r2971.html                                |   202 -
 doc/html/r2993.html                                |   201 -
 doc/html/r3015.html                                |   201 -
 doc/html/r315.html                                 |   212 -
 doc/html/r339.html                                 |   202 -
 doc/html/r361.html                                 |   180 -
 doc/html/r376.html                                 |   196 -
 doc/html/r396.html                                 |   212 -
 doc/html/r421.html                                 |   228 -
 doc/html/r448.html                                 |   211 -
 doc/html/r474.html                                 |   195 -
 doc/html/r494.html                                 |   222 -
 doc/html/r519.html                                 |   179 -
 doc/html/r536.html                                 |   198 -
 doc/html/r557.html                                 |   195 -
 doc/html/r577.html                                 |   182 -
 doc/html/r593.html                                 |   184 -
 doc/html/r611.html                                 |   202 -
 doc/html/r629.html                                 |   191 -
 doc/html/r648.html                                 |   200 -
 doc/html/r670.html                                 |   179 -
 doc/html/r685.html                                 |   211 -
 doc/html/r709.html                                 |   185 -
 doc/html/r726.html                                 |   244 -
 doc/html/r761.html                                 |   282 -
 doc/html/r806.html                                 |   242 -
 doc/html/r841.html                                 |   277 -
 doc/html/r886.html                                 |   183 -
 doc/html/r902.html                                 |   195 -
 doc/html/r922.html                                 |   182 -
 doc/html/r940.html                                 |   176 -
 doc/html/r954.html                                 |   187 -
 doc/html/r972.html                                 |   196 -
 doc/html/r993.html                                 |   175 -
 doc/html/x100.html                                 |   153 -
 doc/html/x141.html                                 |   165 -
 doc/html/x148.html                                 |   188 -
 doc/html/x1499.html                                |   183 -
 doc/html/x1595.html                                |   178 -
 doc/html/x161.html                                 |   238 -
 doc/html/x181.html                                 |   151 -
 doc/html/x184.html                                 |   157 -
 doc/html/x1994.html                                |   173 -
 doc/html/x203.html                                 |   252 -
 doc/html/x2169.html                                |   288 -
 doc/html/x217.html                                 |   168 -
 doc/html/x2399.html                                |   210 -
 doc/html/x241.html                                 |   160 -
 doc/html/x246.html                                 |   172 -
 doc/html/x2553.html                                |   258 -
 doc/html/x26.html                                  |   297 -
 doc/html/x472.html                                 |   168 -
 doc/html/x534.html                                 |   173 -
 doc/html/x609.html                                 |   218 -
 doc/html/x68.html                                  |   317 -
 doc/html/x938.html                                 |   318 -
 doc/installation.txt                               |   117 +
 doc/style.css                                      |    44 -
 doc/theory.txt                                     |    33 +
 examples/Makefile                                  |    54 +-
 examples/cascade_train.c                           |   108 +
 examples/momentums.c                               |    59 +
 examples/mushroom.c                                |    36 +-
 examples/robot.c                                   |    31 +-
 examples/scaling.data                              |  2001 ++
 examples/scaling_test.c                            |    44 +
 examples/scaling_train.c                           |    42 +
 examples/simple_test.c                             |     7 +-
 examples/simple_train.c                            |    20 +-
 examples/steepness_train.c                         |    71 +-
 examples/xor_sample.cpp                            |   152 +
 examples/xor_test.c                                |    20 +-
 examples/xor_train.c                               |    57 +-
 fann.pc.in                                         |     0
 fann.spec.in                                       |     0
 ltmain.sh                                          |  1265 +-
 python/INSTALL                                     |    48 +
 python/Makefile                                    |    45 +
 python/README                                      |    47 +-
 python/__init__.py                                 |    11 -
 python/examples/cascade_train.py                   |    63 +
 python/examples/mushroom.py                        |    41 +-
 python/examples/simple_train.py                    |    12 +-
 python/fann.py                                     |   384 -
 python/fann_helper.c                               |    70 -
 python/libfann.i                                   |    82 -
 python/libfann.py                                  |   459 -
 python/libfann.pyc                                 |   Bin 26911 -> 0 bytes
 python/makefile.gnu                                |    21 -
 python/pyfann/Makefile                             |    22 +
 python/pyfann/__init__.py                          |     7 +
 python/pyfann/fann_cpp_subclass.h                  |   580 +
 python/{ => pyfann}/makefile.msvc                  |     4 +-
 python/pyfann/pyfann.i                             |   189 +
 python/setup.py                                    |    65 +-
 src/Makefile.am                                    |     6 +-
 src/Makefile.in                                    |   317 +-
 src/doublefann.c                                   |     3 +-
 src/fann.c                                         |  1618 +-
 src/fann_cascade.c                                 |  1031 +
 src/fann_error.c                                   |    97 +-
 src/fann_io.c                                      |   728 +-
 src/fann_options.c                                 |   475 -
 src/fann_train.c                                   |   905 +-
 src/fann_train_data.c                              |  1231 +-
 src/fixedfann.c                                    |     3 +-
 src/floatfann.c                                    |     3 +-
 src/include/Makefile.am                            |     2 +-
 src/include/Makefile.in                            |   156 +-
 src/include/compat_time.h                          |   202 +-
 src/include/config.h                               |     2 +-
 src/include/doublefann.h                           |     1 +
 src/include/fann.h                                 |  1101 +-
 src/include/fann_activation.h                      |   203 +-
 src/include/fann_cascade.h                         |   503 +
 src/include/fann_cpp.h                             |  3471 +++
 src/include/fann_data.h                            |   706 +-
 src/include/fann_errno.h                           |    81 -
 src/include/fann_error.h                           |   161 +
 src/include/fann_internal.h                        |   103 +-
 src/include/fann_io.h                              |   100 +
 src/include/fann_train.h                           |  1203 +
 src/include/fixedfann.h                            |     1 +
 src/include/floatfann.h                            |     1 +
 win32_dll/win32.ncb                                |   Bin 84992 -> 0 bytes
 357 files changed, 150627 insertions(+), 85151 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