ruby-fann 1.2.2 → 1.3.0

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.rb

@@ -1 +1 @@
-require "ruby_fann"
+require 'ruby_fann'

data/lib/ruby_fann.rb

@@ -1,9 +1,9 @@
-require "ruby_fann/version"
-require "ruby_fann/ruby_fann"
+require 'ruby_fann/version'
+require 'ruby_fann/ruby_fann'
 
 # Namespace for ruby-fann functionality.
 #
 # See RubyFann::Shortcut, RubyFann::Standard, and RubyFann::TrainData for details.
-module RubyFann 
-  
+module RubyFann
+
 end

data/lib/ruby_fann/neurotica.rb

@@ -1,43 +1,43 @@
-require "rubygems" 
-require "graphviz"
+require 'rubygems'
+require 'graphviz'
 
 module RubyFann
   # Generates directed graph from a RubyFann neural network.
-  # Requires the GraphViz gem 0.8.0 (or higher) to be installed, 
+  # Requires the GraphViz gem 0.8.0 (or higher) to be installed,
   # as well as graphviz proper 2.14.1 (or higher).
   class Neurotica # :nodoc:
     attr_accessor :connector_colors
     attr_accessor :input_layer_color
     attr_accessor :hidden_layer_colors
     attr_accessor :output_layer_color
-    
+
     # Initialize neurotica grapher with the following args:
     #   :connector_colors    - array of graphviz-friendly color names/numbers
     #   :input_layer_color   - graphviz-friendly color name/number
     #   :hidden_layer_colors - array of graphviz-friendly color names/numbers
     #   :output_layer_color  - graphviz-friendly color name/number
-    def initialize(args={})      
+    def initialize(args = {})
       @connector_colors = args[:connector_colors]
       @input_layer_color = args[:input_layer_color]
       @hidden_layer_colors = args[:hidden_layer_colors]
       @output_layer_color = args[:output_layer_color]
-      @connector_colors ||= ['red', 'blue', 'yellow', 'green', 'orange', 'black', 'pink', 'gold', 'lightblue', 'firebrick4', 'purple']   
+      @connector_colors ||= ['red', 'blue', 'yellow', 'green', 'orange', 'black', 'pink', 'gold', 'lightblue', 'firebrick4', 'purple']
       @input_layer_color ||= 'green'
-      @hidden_layer_colors ||= ['bisque2', 'yellow', 'blue', 'orange', 'khaki3']   
+      @hidden_layer_colors ||= ['bisque2', 'yellow', 'blue', 'orange', 'khaki3']
       @output_layer_color ||= 'purple'
     end
-    
+
     # 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"     
-        shape="point"
+    def graph(neural_net, output_path, args = {})
+      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"     
-        shape="egg"
+        graph_viz = GraphViz::new( 'G', :dim=>'2') # , :size=>'17,11'
+        shape = 'egg'
       end
-      
+
       neurons = neural_net.get_neurons()
       graph_node_hash = {}
       max_layer = neurons.max {|a,b| a[:layer] <=> b[:layer] }[:layer]
@@ -45,59 +45,67 @@ module RubyFann
 
       # Add nodes:
       neurons.each do |neuron|
-        fillcolor = "transparent"  # : "khaki3"
+        fillcolor = 'transparent'  # : "khaki3"
         layer = neuron[:layer]
         fillcolor = case layer
-          when 0: @input_layer_color
-          when max_layer: @output_layer_color
-          else; @hidden_layer_colors[(layer-1) % @hidden_layer_colors.length]
+          when 0
+            @input_layer_color
+          when max_layer
+            @output_layer_color
+          else
+            @hidden_layer_colors[(layer-1) % @hidden_layer_colors.length]
         end
-        
+
         #puts "adding neuron with #{neuron[:value]}"
         node_id = neuron.object_id.to_s
-#        label = (layer==0) ? ("%d-%0.3f-%0.3f" % [neuron[:layer], neuron[:value], neuron[:sum]]) : ("%d-%0.3f-%0.3f" % [neuron[:layer], neuron[:value], neuron[:sum]])       
-        label = (layer==0 || layer==max_layer) ? ("%0.3f" % neuron[:value]) : ("%0.3f" % rand) #neuron[:sum]) 
+#        label = (layer==0) ? ("%d-%0.3f-%0.3f" % [neuron[:layer], neuron[:value], neuron[:sum]]) : ("%d-%0.3f-%0.3f" % [neuron[:layer], neuron[:value], neuron[:sum]])
+        label = (layer == 0 || layer == max_layer) ? ('%0.3f' % neuron[:value]) : ('%0.3f' % rand) #neuron[:sum])
         graph_node_hash[node_id] = graph_viz.add_node(
           node_id,
-          :label=>label,
-          :style=>"filled",
-          :fillcolor=>fillcolor,
-          #:color=>fillcolor,
-          :shape=>shape,
-          :z=>"#{rand(100)}", # TODO
-          # :z=>"0", # TODO
-          # :width=>"1",
-          # :height=>"1",
-          :fontname=>"Verdana"
-        )        
+          label: label,
+          style: 'filled',
+          fillcolor: fillcolor,
+          # color: fillcolor,
+          shape: shape,
+          z: '#{rand(100)}', # TODO
+          # z: '0', # TODO
+          # width: '1',
+          # height: '1',
+          fontname: 'Verdana'
+        )
       end
-            
+
       previous_neurons = nil
       layer_neurons = nil
       0.upto(max_layer) do |layer|
         previous_neurons = layer_neurons
-        layer_neurons = neurons.find_all{|n| n[:layer]==layer}
-        
+        layer_neurons = neurons.find_all { |n| n[:layer] == layer }
+
         if previous_neurons
           previous_neurons.each do |pn|
             node_id = pn.object_id.to_s
-            
+
             layer_neurons.each do |n|
               dest_id = n.object_id.to_s
               graph_viz.add_edge(
-                graph_node_hash[node_id], 
-                graph_node_hash[dest_id], 
-                :weight=>"10",
-                :color=>"#{connector_colors[layer % connector_colors.length]}"
-              )                      
+                graph_node_hash[node_id],
+                graph_node_hash[dest_id],
+                weight: '10',
+                color: "#{connector_colors[layer % connector_colors.length]}"
+              )
             end
           end
         end
-        
-      end      
-            
-      graph_viz.output(:file=>output_path)
-      
+
+      end
+
+      if args[:three_dimensional]
+        graph_viz.output(vrml: output_path)
+      else
+        graph_viz.output(png: output_path)
+      end
+
+
     end
   end
 end

data/lib/ruby_fann/version.rb

@@ -1,8 +1,8 @@
-module RubyFann #:nodoc:
-  module VERSION #:nodoc:
+module RubyFann
+  module VERSION
     MAJOR = 1
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 0
 
     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.2
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - tangledpath
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies: []
 description: Bindings to use FANN from within ruby/rails environment
 email:
@@ -21,56 +20,55 @@ extra_rdoc_files:
 - README.md
 - ext/ruby_fann/ruby_fann.c
 files:
-- lib/ruby-fann.rb
-- lib/ruby_fann/neurotica.rb
-- lib/ruby_fann/version.rb
-- lib/ruby_fann.rb
-- ext/ruby_fann/doublefann.c
-- ext/ruby_fann/fann.c
-- ext/ruby_fann/fann_cascade.c
-- ext/ruby_fann/fann_error.c
-- ext/ruby_fann/fann_io.c
-- ext/ruby_fann/fann_train.c
-- ext/ruby_fann/fann_train_data.c
-- ext/ruby_fann/ruby_fann.c
+- README.md
 - ext/ruby_fann/config.h
+- ext/ruby_fann/doublefann.c
 - ext/ruby_fann/doublefann.h
+- ext/ruby_fann/extconf.rb
+- ext/ruby_fann/fann.c
 - ext/ruby_fann/fann.h
 - ext/ruby_fann/fann_activation.h
 - ext/ruby_fann/fann_augment.h
+- ext/ruby_fann/fann_cascade.c
 - ext/ruby_fann/fann_cascade.h
 - ext/ruby_fann/fann_data.h
+- ext/ruby_fann/fann_error.c
 - ext/ruby_fann/fann_error.h
 - ext/ruby_fann/fann_internal.h
+- ext/ruby_fann/fann_io.c
 - ext/ruby_fann/fann_io.h
+- ext/ruby_fann/fann_train.c
 - ext/ruby_fann/fann_train.h
+- ext/ruby_fann/fann_train_data.c
 - ext/ruby_fann/ruby_compat.h
-- ext/ruby_fann/extconf.rb
-- README.md
+- ext/ruby_fann/ruby_fann.c
+- lib/ruby-fann.rb
+- lib/ruby_fann.rb
+- lib/ruby_fann/neurotica.rb
+- lib/ruby_fann/version.rb
 homepage: http://github.com/tangledpath/ruby-fann
 licenses: []
-post_install_message: 
+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: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubyforge_project: ruby-fann
+rubygems_version: 2.6.10
+signing_key:
+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
@@ -78,4 +76,3 @@ summary: Bindings to use FANN from within ruby/rails environment.  Fann is a is
   neural networks a breeze using ruby, with the added benefit that most of the heavy
   lifting is done natively.
 test_files: []
-has_rdoc: true