[libfann] 06/242: *** empty log message ***

[Christian Kastner]

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 d2c64e4f13dc8cc77e699a8d69e92cec86b21dfa
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Mon Nov 3 23:37:15 2003 +0000

    *** empty log message ***
---
 README                   | 10 ++++++++++
 src/fann.c               |  4 ++--
 src/include/doublefann.h |  1 +
 src/include/fann.h       | 17 ++++++++++++-----
 src/include/fixedfann.h  |  1 +
 src/include/floatfann.h  |  1 +
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/README b/README
new file mode 100644
index 0000000..0519dc5
--- /dev/null
+++ b/README
@@ -0,0 +1,10 @@
+For documentation please see: doc/fann_doc_complete_1.0.pdf
+
+For installation please see INSTALL
+
+For example programs please see:
+src/test/simple_train.c
+src/test/simple_test_float.c
+
+For the newest version of this library please go to:
+http://sourceforge.net/projects/fann/
diff --git a/src/fann.c b/src/fann.c
index c2ab53d..bb64443 100644
--- a/src/fann.c
+++ b/src/fann.c
@@ -307,8 +307,8 @@ struct fann * fann_create_from_file(const char *configuration_file)
 
 	fann_set_activation_hidden_steepness(ann, activation_hidden_steepness);
 	fann_set_activation_output_steepness(ann, activation_output_steepness);
-	fann_set_activation_hidden(ann, activation_function_hidden);
-	fann_set_activation_output(ann, activation_function_output);
+	fann_set_activation_function_hidden(ann, activation_function_hidden);
+	fann_set_activation_function_output(ann, activation_function_output);
 	
 #ifdef DEBUG
 	printf("creating network with learning rate %f\n", learning_rate);
diff --git a/src/include/doublefann.h b/src/include/doublefann.h
index c513c58..c5f4009 100644
--- a/src/include/doublefann.h
+++ b/src/include/doublefann.h
@@ -25,6 +25,7 @@ typedef double fann_type;
 #define FANNPRINTF "%.20e"
 #define FANNSCANF "%le"
 
+#define FANN_INCLUDE
 #include "fann.h"
 
 #endif
diff --git a/src/include/fann.h b/src/include/fann.h
index 3282132..4ac5edc 100644
--- a/src/include/fann.h
+++ b/src/include/fann.h
@@ -22,12 +22,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    NOT be included directly.
 */
 
+#ifndef FANN_INCLUDE
+#include "floatfann.h"
+#else
+
+
 #include "fann_data.h"
 #include "fann_internal.h"
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 
 /* ----- Initialisation and configuration ----- */
@@ -169,7 +174,7 @@ void fann_randomize_weights(struct fann *ann, fann_type min_weight, fann_type ma
 /* Train one iteration with a set of inputs, and a set of desired outputs.
  */
 void fann_train(struct fann *ann, fann_type *input, fann_type *desired_output);
-#endif
+#endif /* NOT FIXEDFANN */
 
 /* Test with a set of inputs, and a set of desired outputs.
    This operation updates the mean square error, but does not
@@ -208,7 +213,7 @@ void fann_train_on_data(struct fann *ann, struct fann_train_data *data, unsigned
 /* Does the same as train_on_data, but reads the data directly from a file.
  */
 void fann_train_on_file(struct fann *ann, char *filename, unsigned int max_epochs, unsigned int epochs_between_reports, float desired_error);
-#endif
+#endif /* NOT FIXEDFANN */
 
 /* Save the training structure to a file.
  */
@@ -242,8 +247,10 @@ unsigned int fann_get_decimal_point(struct fann *ann);
 /* returns the multiplier that fix point data is multiplied with.
  */
 unsigned int fann_get_multiplier(struct fann *ann);
-#endif
+#endif /* FIXEDFANN */
 
 #ifdef __cplusplus
 }
-#endif
+#endif /* __cplusplus */
+
+#endif /* NOT FANN_INCLUDE */
diff --git a/src/include/fixedfann.h b/src/include/fixedfann.h
index 92e8310..8e2ef53 100644
--- a/src/include/fixedfann.h
+++ b/src/include/fixedfann.h
@@ -25,6 +25,7 @@ typedef int fann_type;
 #define FANNPRINTF "%d"
 #define FANNSCANF "%d"
 
+#define FANN_INCLUDE
 #include "fann.h"
 
 #endif
diff --git a/src/include/floatfann.h b/src/include/floatfann.h
index 714ab43..fc74414 100644
--- a/src/include/floatfann.h
+++ b/src/include/floatfann.h
@@ -25,6 +25,7 @@ typedef float fann_type;
 #define FANNPRINTF "%.20e"
 #define FANNSCANF "%f"
 
+#define FANN_INCLUDE
 #include "fann.h"
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git