ruby-fann 1.2.4 → 1.2.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjMyNmI4NDY5MjgwMDgzYjkxMDFjOTNkMGE5ZmI4ZWI2Mjc0MjQ0Zg==
+  data.tar.gz: !binary |-
+    MGU3NjUxNmEyZTFhOTRkMzI2OWU0Zjk5YzQzYjA1MTMxMjlkZGEwYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MGU5YmI0MWI3NDI2NDE4NGU1Y2FhYjcwMTgzOGJkZDM3MDUyNmE3NTA0OGEz
+    MmU4NzU3Y2UyMDIwNmNhMjE5MDNiYTMwNjRmY2I4NGQwNzhlZWUzMjM5YWMx
+    YWYzOWZlY2Q3NmNiN2I5OGVkNTgzOWRiODY1ZWUzMmU1MTk0YWM=
+  data.tar.gz: !binary |-
+    ZjQyOTI0NjU0NDQ5YWE0MmQ3ZDE0ZTMwMDgyMmM0YTkyZWQ5MTFkODVmM2Ji
+    YmE3YTU1YWEyZmI1ZjkyNDNmZDE0N2MyNzVjOTc2NGFjZmViM2EyZTI2N2Iy
+    ZDZlYjg0ZjI4NGRiNDUzMTJhZjFkNTllOGM5OWE2ZGQ5ZTUyMzQ=

data/README.md

@@ -1,6 +1,6 @@
-# Ruby::Fann
+# RubyFann
 
-Bindings to use FANN from within ruby/rails environment.  Fann is a is a free open source neural network library, which implements multilayer artificial neural networks with support for 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 that binds to FANN (Fast Artificial Neural Network) from within a ruby/rails environment.  FANN is a is a free open source neural network library, which implements multilayer artificial neural networks with support for 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.
 
 ## Installation
 
@@ -21,6 +21,9 @@ Or install it yourself as:
 First, Go here & read about FANN. You don't need to install it before using the gem, but understanding FANN will help you understand what you can do with the ruby-fann gem:
 http://leenissen.dk/fann/
 
+ruby-fann RDocs:
+http://ruby-fann.rubyforge.org/
+
 ### Example training & subsequent execution:
   
 ```ruby
@@ -67,13 +70,15 @@ class MyFann < RubyFann::Standard
   end
 end
 ```
-### A sample project using Ruby Fann to play tic-tac-toe
+### A sample project using RubyFann to play tic-tac-toe
 https://github.com/bigohstudios/tictactoe
 
-## Documentation
-http://ruby-fann.rubyforge.org/
-
-
+## Contributors
+1. Steven Miers
+2. Ole Krüger
+3. dignati
+4. Michal Pokorný
+5. Scott Li (locksley)
 
 ## Contributing
 

data/ext/ruby_fann/ruby_fann.c

@@ -1111,7 +1111,38 @@ static VALUE init_weights(VALUE self, VALUE train_data)
     return self;    
 }
 
+/** call-seq: train(input, expected_output)
 
+    Train with a single input-output pair.
+        input - The inputs given to the network
+        expected_output - The outputs expected.  */
+static VALUE train(VALUE self, VALUE input, VALUE expected_output)
+{
+    Check_Type(input, T_ARRAY);
+    Check_Type(expected_output, T_ARRAY);
+
+    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);
+
+    fann_type data_input[num_input], data_output[num_output];
+
+    int i;
+
+    for (i = 0; i < num_input; i++) {
+        data_input[i] = NUM2DBL(RARRAY_PTR(input)[i]);
+    }
+
+    for (i = 0; i < num_output; i++) {
+        data_output[i] = NUM2DBL(RARRAY_PTR(expected_output)[i]);
+    }
+
+    fann_train(f, data_input, data_output);
+
+    return rb_int_new(0);
+}
 
 /** call-seq: train_on_data(train_data, max_epochs, epochs_between_reports, desired_error)
 
@@ -1559,6 +1590,7 @@ void Init_ruby_fann ()
     rb_define_method(m_rb_fann_standard_class, "print_parameters", print_parameters, 0);
     rb_define_method(m_rb_fann_standard_class, "randomize_weights", randomize_weights, 2);
     rb_define_method(m_rb_fann_standard_class, "run", run, 1);
+    rb_define_method(m_rb_fann_standard_class, "train", train, 2);
     rb_define_method(m_rb_fann_standard_class, "train_on_data", train_on_data, 4);
     rb_define_method(m_rb_fann_standard_class, "train_epoch", train_epoch, 1);
     rb_define_method(m_rb_fann_standard_class, "test_data", test_data, 1);  
@@ -1658,6 +1690,7 @@ void Init_ruby_fann ()
     rb_define_method(m_rb_fann_shortcut_class, "print_parameters", print_parameters, 0);
     rb_define_method(m_rb_fann_shortcut_class, "randomize_weights", randomize_weights, 2);
     rb_define_method(m_rb_fann_shortcut_class, "run", run, 1);
+    rb_define_method(m_rb_fann_shortcut_class, "train", train, 2);
     rb_define_method(m_rb_fann_shortcut_class, "train_on_data", train_on_data, 4);
     rb_define_method(m_rb_fann_shortcut_class, "train_epoch", train_epoch, 1);
     rb_define_method(m_rb_fann_shortcut_class, "test_data", test_data, 1);  

data/lib/ruby_fann/neurotica.rb

@@ -30,11 +30,11 @@ module RubyFann
     # Generate output graph with given neural network to the given output path (PNG)
     #   If args[:three_dimensional] is set, then a 3d VRML graph will be generated (experimental)
     def graph(neural_net, output_path, args={})
-      if(args[:three_dimensional])
-        graph_viz = GraphViz::new( "G", :output => "vrml", :dim=>'3') # , :size=>"17,11"     
+      if (args[:three_dimensional])
+        graph_viz = GraphViz::new( "G", :dim=>'3') # , :size=>"17,11"     
         shape="point"
       else
-        graph_viz = GraphViz::new( "G", :output => "png", :dim=>'2') # , :size=>"17,11"     
+        graph_viz = GraphViz::new( "G", :dim=>'2') # , :size=>"17,11"     
         shape="egg"
       end
       
@@ -98,8 +98,13 @@ module RubyFann
         end
         
       end      
-            
-      graph_viz.output(:file=>output_path)
+      
+      if (args[:three_dimensional])
+        graph_viz.output(:vrml=>output_path)
+      else
+        graph_viz.output(:png=>output_path)
+      end
+      
       
     end
   end

data/lib/ruby_fann/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-fann
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.2.5
 platform: ruby
 authors:
 - tangledpath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Bindings to use FANN from within ruby/rails environment
 email:
@@ -49,28 +48,27 @@ files:
 - README.md
 homepage: http://github.com/tangledpath/ruby-fann
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-fann
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bindings to use FANN from within ruby/rails environment.  Fann is a is a
   free open source neural network library, which implements multilayer artificial
   neural networks with support for both fully connected and sparsely connected networks.  It