minor refactoring

src/fann_train_data.c

@@ -350,7 +350,7 @@ void fann_scale_data(fann_type ** data, unsigned int num_data, unsigned int num_
 					 fann_type new_min, fann_type new_max)
 {
 	unsigned int dat, elem;
-	fann_type old_min, old_max, temp, old_span, new_span, factor;
+	fann_type old_min, old_max, temp;
 
 	old_min = old_max = data[0][0];
 
@@ -369,6 +369,18 @@ void fann_scale_data(fann_type ** data, unsigned int num_data, unsigned int num_
 		}
 	}
 
+	fann_scale_data_to_range(data, num_data, num_elem, old_min, old_max, new_min, new_max);
+}
+
+/*
+ * INTERNAL FUNCTION Scales data to a specific range 
+ */
+FANN_EXTERNAL void FANN_API fann_scale_data_to_range(fann_type ** data, unsigned int num_data, unsigned int num_elem,
+					 fann_type old_min, fann_type old_max, fann_type new_min, fann_type new_max)
+{
+	unsigned int dat, elem;
+	fann_type temp, old_span, new_span, factor;
+
 	old_span = old_max - old_min;
 	new_span = new_max - new_min;
 	factor = new_span / old_span;
@@ -401,6 +413,7 @@ void fann_scale_data(fann_type ** data, unsigned int num_data, unsigned int num_
 	}
 }
 
+
 /*
  * Scales the inputs in the training data to the specified range 
  */
@@ -884,6 +897,21 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_callback(
     return data;
 } 
 
+FANN_EXTERNAL fann_type * FANN_API fann_get_train_input(struct fann_train_data * data, unsigned int position)
+{
+	if(position >= data->num_data)
+		return NULL;
+	return data->input[position];
+}
+
+FANN_EXTERNAL fann_type * FANN_API fann_get_train_output(struct fann_train_data * data, unsigned int position)
+{
+	if(position >= data->num_data)
+		return NULL;
+	return data->output[position];
+}
+
+
 /*
  * INTERNAL FUNCTION Reads training data from a file descriptor. 
  */

src/include/fann_internal.h

@@ -121,6 +121,9 @@ void fann_set_shortcut_connections(struct fann *ann);
 
 int fann_allocate_scale(struct fann *ann);
 
+FANN_EXTERNAL void FANN_API fann_scale_data_to_range(fann_type ** data, unsigned int num_data, unsigned int num_elem,
+					 fann_type old_min, fann_type old_max, fann_type new_min, fann_type new_max);
+
 /* called fann_max, in order to not interferre with predefined versions of max */
 #define fann_max(x, y) (((x) > (y)) ? (x) : (y))
 #define fann_min(x, y) (((x) < (y)) ? (x) : (y))

src/include/fann_train.h

@@ -337,6 +337,26 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_callback(
  */ 
 FANN_EXTERNAL void FANN_API fann_destroy_train(struct fann_train_data *train_data);
 
+/* Function: fann_get_train_input
+   Gets the training input data at the given position
+
+   See also:
+     <fann_get_train_output>
+
+   This function appears in FANN >= 2.3.0
+ */ 
+FANN_EXTERNAL fann_type * FANN_API fann_get_train_input(struct fann_train_data * data, unsigned int position);
+
+/* Function: fann_get_train_output
+   Gets the training output data at the given position
+
+   See also:
+     <fann_get_train_output>
+
+   This function appears in FANN >= 2.3.0
+ */ 
+FANN_EXTERNAL fann_type * FANN_API fann_get_train_output(struct fann_train_data * data, unsigned int position);
+
 
 /* Function: fann_shuffle_train_data