ruby-fann 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c291587d1ebb0faf402b6d8dfa9e7629c5fc02e14b43c138c641945b899f434
-  data.tar.gz: ea97a950c60a26d63dbaecc12bf79ac3ecd8ed9b4a27d12e87c39add9228a5c2
+  metadata.gz: 1513ab175dd525a96a3846565c6b54a2d5bf44af679144a4f7e877dd8e948e03
+  data.tar.gz: 9942ab1a6cd7112ec21fa4d7912f8f72e62a18ab429948cc507c73a8af5efb73
 SHA512:
-  metadata.gz: a309c2c124032e56f5532608d3979f4c039902a8ab31f05422c8385b8975baca1dce3596c7ffa8b0a2f125d4f78691699509a6bb2ecbb22278ff8d0a032e2fca
-  data.tar.gz: 4a3e11465e2d660bb09442cb7dab7ef572c21aea8427b18fc6bdb70afad986e213703cac02b43bed9fa4d59d0e40f9958e91610c6261ff56e87aa340d85edc84
+  metadata.gz: 5b0a6b6909f6d19b005454dfddf77570493ddf3618c7b51e6fd36c99b09bfa3858b489cfca80829253f1c1ed79c953cbae21b6f4a24eddd34cd37d31920d529d
+  data.tar.gz: 8776e0c70509d821e032b2e9b1bf7c0a323609e3bf69a7cd294ebbb192c57236c06e5cffcb869f79291d3fabe5ef17f6553cd078419f88283cdff05f33ff17d4

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