ruby-fann 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b41957229e899b6498641c04163610daeecd8d7bc989262915ed5284128172
-  data.tar.gz: 4be842a49ec6b57d1e1b7489302b874427faec3e06d439ccc9976be49419287e
+  metadata.gz: 1513ab175dd525a96a3846565c6b54a2d5bf44af679144a4f7e877dd8e948e03
+  data.tar.gz: 9942ab1a6cd7112ec21fa4d7912f8f72e62a18ab429948cc507c73a8af5efb73
 SHA512:
-  metadata.gz: 753f3252b1e3c9500d455b1d25f72d7ca99935739f18c5c6226cc034c55cb7e0354820b995511690eaca39da9e685e4e6883cb7a5c527ffadee92d729267e171
-  data.tar.gz: a904cd8752595018693c65b996aaf9d6b58917cac4cde6943ca5b847e744269b4224cdd79cb1abc63be169d999ea5f8c9f9ef4e215c5f0a2626427a8c577eb86
+  metadata.gz: 5b0a6b6909f6d19b005454dfddf77570493ddf3618c7b51e6fd36c99b09bfa3858b489cfca80829253f1c1ed79c953cbae21b6f4a24eddd34cd37d31920d529d
+  data.tar.gz: 8776e0c70509d821e032b2e9b1bf7c0a323609e3bf69a7cd294ebbb192c57236c06e5cffcb869f79291d3fabe5ef17f6553cd078419f88283cdff05f33ff17d4

data/README.md

@@ -9,7 +9,7 @@ Neural Networks in `ruby`
 
 [![Gem Version](https://badge.fury.io/rb/ruby-fann.png)](http://badge.fury.io/rb/ruby-fann)
 
-RubyFann, or "ruby-fann" is a ruby gem that binds to FANN (Fast Artificial Neural Network) from within a ruby/rails environment.  FANN is a is a free (native) open source neural network library, which implements multilayer artificial neural networks, supporting both fully-connected and sparsely-connected networks.  It is easy to use, versatile, well documented, and fast.  `RubyFann` makes working with neural networks a breeze using `ruby`, with the added benefit that most of the heavy lifting is done natively.
+RubyFann, or "ruby-fann" is a Ruby Gem (no Rails required) that binds to FANN (Fast Artificial Neural Network) from within a ruby/rails environment.  FANN is a is a free native open source neural network library, which implements multilayer artificial neural networks, supporting both fully-connected and sparsely-connected networks.  It is easy to use, versatile, well documented, and fast.  `RubyFann` makes working with neural networks a breeze using `ruby`, with the added benefit that most of the heavy lifting is done natively.
 
 A talk given by our friend Ethan from Big-Oh Studios at Lone Star Ruby 2013: http://confreaks.com/videos/2609-lonestarruby2013-neural-networks-with-rubyfann
 

data/ext/ruby_fann/fann_augment.h

@@ -10,21 +10,23 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary2(
 }
 
 /*
- * Copied from fann_create_train_from_callback/file & modified to ease 
+ * Copied from fann_create_train_from_callback/file & modified to ease
  * allocating from ruby arrays:
  */
 FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
-	VALUE inputs, 
-	VALUE outputs 
+	VALUE inputs,
+	VALUE outputs
 )
 {
     unsigned int i, j;
     fann_type *data_input, *data_output;
     struct fann_train_data *data = (struct fann_train_data *)malloc(sizeof(struct fann_train_data));
-    unsigned int num_input = NUM2UINT(RARRAY_LEN(RARRAY_PTR(inputs)[0]));
-    unsigned int num_output = NUM2UINT(RARRAY_LEN(RARRAY_PTR(outputs)[0]));
-	unsigned int num_data = NUM2UINT(RARRAY_LEN(inputs));
-		
+
+    long num_input = RARRAY_LEN(RARRAY_PTR(inputs)[0]);
+    long num_output = RARRAY_LEN(RARRAY_PTR(outputs)[0]);
+	long num_data = RARRAY_LEN(inputs);
+
+
     if(data == NULL) {
         fann_error(NULL, FANN_E_CANT_ALLOCATE_MEM);
         return NULL;
@@ -35,7 +37,6 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
     data->num_data     = num_data;
     data->num_input    = num_input;
     data->num_output = num_output;
-
     data->input = (fann_type **) calloc(num_data, sizeof(fann_type *));
     if(data->input == NULL)
     {
@@ -51,7 +52,6 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
         fann_destroy_train(data);
         return NULL;
     }
-
     data_input = (fann_type *) calloc(num_input * num_data, sizeof(fann_type));
     if(data_input == NULL)
     {
@@ -74,26 +74,26 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
 			data->input[i] = data_input;
 			data_input += num_input;
 
-			inputs_i = NUM2UINT(RARRAY_PTR(inputs)[i]);
-			outputs_i = NUM2UINT(RARRAY_PTR(inputs)[i]);
-			
-			if(RARRAY_LEN(inputs_i) != num_input) 
+			inputs_i = RARRAY_PTR(inputs)[i];
+			outputs_i = RARRAY_PTR(outputs)[i];
+
+			if(RARRAY_LEN(inputs_i) != num_input)
 			{
 				rb_raise (
-					rb_eRuntimeError, 
-					"Number of inputs at [%d] is inconsistent: (%d != %d)", 
-					i,NUM2UINT(RARRAY_LEN(inputs_i)), num_input);
+					rb_eRuntimeError,
+					"Number of inputs at [%d] is inconsistent: (%du != %d)",
+					i,RARRAY_LEN(inputs_i)), num_input;
 			}
-			
-			if(RARRAY_LEN(outputs_i) != num_output) 
+
+			if(RARRAY_LEN(outputs_i) != num_output)
 			{
 				rb_raise (
-					rb_eRuntimeError, 
-					"Number of outputs at [%d] is inconsistent: (%d != %d)", 
-					i, NUM2UINT(RARRAY_LEN(outputs_i)), num_output);
+					rb_eRuntimeError,
+					"Number of outputs at [%d] is inconsistent: (%d != %d)",
+					i, RARRAY_LEN(outputs_i)), num_output;
 			}
-			
-			
+
+
 			for(j = 0; j != num_input; j++)
 			{
 				data->input[i][j]=NUM2DBL(RARRAY_PTR(inputs_i)[j]);
@@ -101,12 +101,12 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
 
 			data->output[i] = data_output;
 			data_output += num_output;
-			
+
 			for(j = 0; j != num_output; j++)
 			{
 				data->output[i][j]=NUM2DBL(RARRAY_PTR(outputs_i)[j]);
 			}
 		}
-		
+
     return data;
 }