ruby-fann 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00c8b18955c60b5065c9a7651e0ec29025875b40d08c7243ae33729def2744d8
-  data.tar.gz: bfaa2fc0c5365e990341b8671cb10bed9305fcedde3a2bc210b62fbcc40cc32d
+  metadata.gz: 63b41957229e899b6498641c04163610daeecd8d7bc989262915ed5284128172
+  data.tar.gz: 4be842a49ec6b57d1e1b7489302b874427faec3e06d439ccc9976be49419287e
 SHA512:
-  metadata.gz: 7032504c501bf7ef8b25a68b38f80c8af1717188a7d10660fe33cbf48ede29a7751abfe2083d048dcc66506ec6fff7893b8b90eda2d9873167a3e95d0d10f41b
-  data.tar.gz: 22c57fa3b15ab68babaa531baa7cee54023a0bb65c423d25dba1a1bae237f9e40b3e6515c2648ff8fdeeee68b3375eee4ac4759bb7d7c1974e2123df119e7908
+  metadata.gz: 753f3252b1e3c9500d455b1d25f72d7ca99935739f18c5c6226cc034c55cb7e0354820b995511690eaca39da9e685e4e6883cb7a5c527ffadee92d729267e171
+  data.tar.gz: a904cd8752595018693c65b996aaf9d6b58917cac4cde6943ca5b847e744269b4224cdd79cb1abc63be169d999ea5f8c9f9ef4e215c5f0a2626427a8c577eb86

data/README.md

@@ -93,6 +93,7 @@ https://github.com/bigohstudios/tictactoe
 3. dignati
 4. Michal Pokorny
 5. Scott Li (locksley)
+6. alex.slotty
 
 ## Contributing
 

data/ext/ruby_fann/extconf.rb

@@ -9,4 +9,4 @@ require 'mkmf'
 #dir_config('fann', '.')
 $objs=["ruby_fann.o", "doublefann.o"]
 have_header("doublefann.h")
-create_makefile("ruby_fann")
+create_makefile("ruby_fann/ruby_fann")

data/ext/ruby_fann/fann_augment.h

@@ -4,7 +4,7 @@
 FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary2(
 	unsigned int num_data,
 	unsigned int num_input,
-  unsigned int num_output)
+  unsigned long num_output)
 {
 	return 0;
 }
@@ -21,9 +21,9 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
     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 = RARRAY_LEN(RARRAY_PTR(inputs)[0]);
-    unsigned int num_output =RARRAY_LEN(RARRAY_PTR(outputs)[0]);
-		unsigned int num_data = RARRAY_LEN(inputs);
+    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));
 		
     if(data == NULL) {
         fann_error(NULL, FANN_E_CANT_ALLOCATE_MEM);
@@ -74,15 +74,15 @@ 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 = RARRAY_PTR(inputs)[i];
-			outputs_i = RARRAY_PTR(outputs)[i];
+			inputs_i = NUM2UINT(RARRAY_PTR(inputs)[i]);
+			outputs_i = NUM2UINT(RARRAY_PTR(inputs)[i]);
 			
 			if(RARRAY_LEN(inputs_i) != num_input) 
 			{
 				rb_raise (
 					rb_eRuntimeError, 
 					"Number of inputs at [%d] is inconsistent: (%d != %d)", 
-					i, RARRAY_LEN(inputs_i), num_input);
+					i,NUM2UINT(RARRAY_LEN(inputs_i)), num_input);
 			}
 			
 			if(RARRAY_LEN(outputs_i) != num_output) 
@@ -90,7 +90,7 @@ FANN_EXTERNAL struct fann_train_data * FANN_API fann_create_train_from_rb_ary(
 				rb_raise (
 					rb_eRuntimeError, 
 					"Number of outputs at [%d] is inconsistent: (%d != %d)", 
-					i, RARRAY_LEN(outputs_i), num_output);
+					i, NUM2UINT(RARRAY_LEN(outputs_i)), num_output);
 			}
 			
 			

data/ext/ruby_fann/fann_data.h

@@ -413,8 +413,8 @@ struct fann_neuron
 	/* Index to the first and last connection
 	 * (actually the last is a past end index)
 	 */
-	unsigned int first_con;
-	unsigned int last_con;
+	long first_con;
+	long last_con;
 	/* The sum of the inputs multiplied with the weights */
 	fann_type sum;
 	/* The value of the activation function applied to the sum */

data/ext/ruby_fann/fann_error.c

@@ -22,6 +22,7 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "ruby.h"
 #include "config.h"
 #include "fann.h"
 
@@ -90,7 +91,7 @@ FANN_EXTERNAL void FANN_API fann_print_error(struct fann_error *errdat)
 /* INTERNAL FUNCTION
    Populate the error information
  */
-void fann_error(struct fann_error *errdat, const enum fann_errno_enum errno_f, ...)
+void fann_error(struct fann_error *errdat, enum fann_errno_enum errno_f, ...)
 {
 	va_list ap;
 	char *errstr;
@@ -191,12 +192,13 @@ void fann_error(struct fann_error *errdat, const enum fann_errno_enum errno_f, .
 
 	if(error_log == (FILE *)-1) /* This is the default behavior and will give stderr */
 	{
-		fprintf(stderr, "FANN Error %d: %s", errno_f, errstr);
+		fprintf(stderr, "FANN Error %d: %s, ", errno_f, errstr);
 	}
 	else if(error_log != NULL)
 	{
-		fprintf(error_log, "FANN Error %d: %s", errno_f, errstr);
+		fprintf(error_log, "FANN Error %d: %s, ", errno_f, errstr);
 	}
+	rb_raise (rb_eRuntimeError, errstr);
 }
 
 /* INTERNAL FUNCTION

data/ext/ruby_fann/ruby_fann.c

@@ -278,7 +278,7 @@ static VALUE fann_initialize(VALUE self, VALUE hash)
         Check_Type(num_outputs, T_FIXNUM);
         
         // Initialize layers:
-        unsigned int num_layers=RARRAY_LEN(hidden_neurons) + 2; 
+        unsigned int num_layers=NUM2UINT(RARRAY_LEN(hidden_neurons)) + 2; 
         unsigned int layers[num_layers];
 
         // Input:
@@ -286,7 +286,7 @@ static VALUE fann_initialize(VALUE self, VALUE hash)
         // Output:
         layers[num_layers-1]=NUM2INT(num_outputs);  
         // Hidden:
-        int i;
+        unsigned int i;
         for (i=1; i<=num_layers-2; i++) {
             layers[i]=NUM2UINT(RARRAY_PTR(hidden_neurons)[i-1]);
         }
@@ -691,7 +691,7 @@ static VALUE get_bias_array(VALUE self)
     // Create ruby array & set outputs:
     VALUE arr;
     arr = rb_ary_new();
-    int i;
+    unsigned int i;
     for (i=0; i<num_layers; i++)
     {
         rb_ary_push(arr, INT2NUM(layers[i]));
@@ -803,7 +803,7 @@ static VALUE get_layer_array(VALUE self)
     // Create ruby array & set outputs:
     VALUE arr;
     arr = rb_ary_new();
-    int i;
+    unsigned int i;
     for (i=0; i<num_layers; i++)
     {
         rb_ary_push(arr, INT2NUM(layers[i]));
@@ -1017,7 +1017,7 @@ static VALUE get_train_stop_function(VALUE self)
     {
         ret_val = ID2SYM(rb_intern("mse")); // (rb_str_new2("FANN_NETTYPE_LAYER"));
     }
-    else if(train_stop==FANN_STOPFUNC_BIT)
+    else // if(train_stop==FANN_STOPFUNC_BIT)
     {
         ret_val = ID2SYM(rb_intern("bit")); // (rb_str_new2("FANN_NETTYPE_SHORTCUT"));
     }   
@@ -1066,11 +1066,11 @@ static VALUE run (VALUE self, VALUE inputs)
     Check_Type(inputs, T_ARRAY);
 
   struct fann* f;
-    int i;
+    unsigned int i;
     fann_type* outputs;
         
     // Convert inputs to type needed for NN:
-    unsigned int len = RARRAY_LEN(inputs);
+    unsigned int len = NUM2UINT(RARRAY_LEN(inputs));
     fann_type fann_inputs[len];
     for (i=0; i<len; i++)
     {
@@ -1124,12 +1124,12 @@ static VALUE train(VALUE self, VALUE input, VALUE expected_output)
     struct fann* f;
     Data_Get_Struct(self, struct fann, f);
 
-    unsigned int num_input = RARRAY_LEN(input);
-    unsigned int num_output = RARRAY_LEN(expected_output);
+    unsigned int num_input = NUM2UINT(RARRAY_LEN(input));
+    unsigned int num_output = NUM2UINT(RARRAY_LEN(expected_output));
 
     fann_type data_input[num_input], data_output[num_output];
 
-    int i;
+    unsigned int i;
 
     for (i = 0; i < num_input; i++) {
         data_input[i] = NUM2DBL(RARRAY_PTR(input)[i]);
@@ -1425,9 +1425,9 @@ static VALUE set_cascade_activation_functions(VALUE self, VALUE cascade_activati
     struct fann* f;
     Data_Get_Struct (self, struct fann, f); 
     
-    unsigned int cnt = RARRAY_LEN(cascade_activation_functions);
+    unsigned int cnt = NUM2UINT(RARRAY_LEN(cascade_activation_functions));
     enum fann_activationfunc_enum fann_activation_functions[cnt];
-    int i;
+    unsigned int i;
     for (i=0; i<cnt; i++)
     {
         fann_activation_functions[i] = sym_to_activation_function(RARRAY_PTR(cascade_activation_functions)[i]);
@@ -1449,7 +1449,7 @@ static VALUE get_cascade_activation_functions(VALUE self)
     // Create ruby array & set outputs:
     VALUE arr;
     arr = rb_ary_new();
-    int i;
+    unsigned int i;
     for (i=0; i<cnt; i++)
     {
         rb_ary_push(arr, activation_function_to_sym(fann_functions[i]));
@@ -1489,9 +1489,9 @@ static VALUE set_cascade_activation_steepnesses(VALUE self, VALUE cascade_activa
     struct fann* f;
     Data_Get_Struct (self, struct fann, f); 
     
-    unsigned int cnt = RARRAY_LEN(cascade_activation_steepnesses);
+    unsigned int cnt = NUM2UINT(RARRAY_LEN(cascade_activation_steepnesses));
     fann_type fann_activation_steepnesses[cnt];
-    int i;
+    unsigned int i;
     for (i=0; i<cnt; i++)
     {
         fann_activation_steepnesses[i] = NUM2DBL(RARRAY_PTR(cascade_activation_steepnesses)[i]);
@@ -1513,7 +1513,7 @@ static VALUE get_cascade_activation_steepnesses(VALUE self)
     // Create ruby array & set outputs:
     VALUE arr;
     arr = rb_ary_new();
-    int i;
+    unsigned int i;
     for (i=0; i<cnt; i++)
     {
         rb_ary_push(arr, rb_float_new(fann_steepnesses[i]));

data/lib/ruby_fann/version.rb

@@ -1,8 +1,8 @@
 module RubyFann
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    TINY  = 2
+    MINOR = 4
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-fann
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - tangledpath
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies: []
 description: Bindings to use FANN from within ruby/rails environment
 email: