ruby-fann 0.7.8 → 0.7.9

data/History.txt

@@ -1,3 +1,10 @@
+== 0.7.9 2008-08-15
+
+* 1 major bug fix:
+  * Fix set_activation_function for correct # of args (2 instead of 1)
+* 1 minor enhancement
+  * Provide support for fann_get_activation_function
+
 == 0.7.8 2007-03-25
 
 * 1 major enhancement:

data/ext/ruby_fann/neural_network.c

@@ -300,7 +300,6 @@ static VALUE fann_initialize(VALUE self, VALUE hash)
   // VALUE callback = rb_funcall(DATA_PTR(self), "training_callback", 0);
   if(rb_respond_to(self, rb_intern("training_callback")))
   {
-    printf("found(%d).\n", ann->callback);
     fann_set_callback(ann, &fann_training_callback);
     fann_set_user_data(ann, self);
     printf("found(%d).\n", ann->callback);
@@ -450,8 +449,10 @@ static VALUE set_activation_function_hidden(VALUE self, VALUE activation_func)
 			:linear, :threshold, :threshold_symmetric, :sigmoid, :sigmoid_stepwise, :sigmoid_symmetric, 
 			:sigmoid_symmetric_stepwise, :gaussian, :gaussian_symmetric, :gaussian_stepwise, :elliot, 
 			:elliot_symmetric, :linear_piece, :linear_piece_symmetric, :sin_symmetric, :cos_symmetric, 
-			:sin, :cos*/
+			:sin, :cos
 			
+      It is not possible to set activation functions for the neurons in the input layer.
+*/			
 static VALUE set_activation_function_layer(VALUE self, VALUE activation_func, VALUE layer)
 {
 	Check_Type(activation_func, T_SYMBOL);
@@ -461,6 +462,23 @@ static VALUE set_activation_function_layer(VALUE self, VALUE activation_func, VA
 	fann_set_activation_function_layer(f, sym_to_activation_function(activation_func), NUM2INT(layer));
 }
 
+/** call-seq: get_activation_function(layer) -> return value 
+ 
+    Get the activation function for neuron number *neuron* in layer number *layer*, 
+    counting the input layer as layer 0. 
+
+    It is not possible to get activation functions for the neurons in the input layer.    
+*/
+static VALUE get_activation_function(VALUE self, VALUE layer, VALUE neuron)
+{
+	Check_Type(layer, T_FIXNUM);
+	Check_Type(neuron, T_FIXNUM);
+	struct fann* f;
+	Data_Get_Struct(self, struct fann, f);
+	fann_type val = fann_get_activation_function(f, NUM2INT(layer), NUM2INT(neuron));
+	return activation_function_to_sym(val);
+}
+
 /** call-seq: set_activation_function_output(activation_func)
 
 	  Set the activation function for the output layer.  activation_func must be one of the following symbols:
@@ -1479,7 +1497,8 @@ void Init_neural_network ()
 	rb_define_method(m_rb_fann_standard_class, "init_weights", init_weights, 1);
 	rb_define_method(m_rb_fann_standard_class, "set_activation_function", set_activation_function, 3);	
 	rb_define_method(m_rb_fann_standard_class, "set_activation_function_hidden", set_activation_function_hidden, 1);	
-	rb_define_method(m_rb_fann_standard_class, "set_activation_function_layer", set_activation_function_layer, 1);	
+	rb_define_method(m_rb_fann_standard_class, "set_activation_function_layer", set_activation_function_layer, 2);	
+	rb_define_method(m_rb_fann_standard_class, "get_activation_function", get_activation_function, 2);	
 	rb_define_method(m_rb_fann_standard_class, "set_activation_function_output", set_activation_function_output, 1);	
 	rb_define_method(m_rb_fann_standard_class, "get_activation_steepness", get_activation_steepness, 2);
 	rb_define_method(m_rb_fann_standard_class, "set_activation_steepness", set_activation_steepness, 3);
@@ -1577,7 +1596,8 @@ void Init_neural_network ()
 	rb_define_method(m_rb_fann_shortcut_class, "init_weights", init_weights, 1);
 	rb_define_method(m_rb_fann_shortcut_class, "set_activation_function", set_activation_function, 3);	
 	rb_define_method(m_rb_fann_shortcut_class, "set_activation_function_hidden", set_activation_function_hidden, 1);	
-	rb_define_method(m_rb_fann_shortcut_class, "set_activation_function_layer", set_activation_function_layer, 1);	
+	rb_define_method(m_rb_fann_shortcut_class, "set_activation_function_layer", set_activation_function_layer, 2);	
+	rb_define_method(m_rb_fann_standard_class, "get_activation_function", get_activation_function, 2);	
 	rb_define_method(m_rb_fann_shortcut_class, "set_activation_function_output", set_activation_function_output, 1);	
 	rb_define_method(m_rb_fann_shortcut_class, "get_activation_steepness", get_activation_steepness, 2);
 	rb_define_method(m_rb_fann_shortcut_class, "set_activation_steepness", set_activation_steepness, 3);

data/lib/ruby_fann/version.rb

@@ -2,7 +2,7 @@ module RubyFann #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/neurotica2.vrml

@@ -4,9 +4,9 @@ Group { children [
     scale 0.028 0.028 0.028
     children [
  Background { skyColor 1.000 1.000 1.000 }
-# node 201760
+# node 1994420
 Transform {
-  translation 6.000 46.000 85.000
+  translation 6.000 46.000 52.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -24,9 +24,9 @@ Transform {
     }
   ]
 }
-# node 200210
+# node 1994000
 Transform {
-  translation 50.000 6.000 30.000
+  translation 50.000 6.000 98.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -44,7 +44,7 @@ Transform {
     }
   ]
 }
-# edge 201760 -> 200210
+# edge 1994420 -> 1994000
  Group { children [
 Transform {
   children [
@@ -79,9 +79,9 @@ Transform {
       translation 24.000 17.000 0.000
     }
 ] }
-# node 201430
+# node 1994200
 Transform {
-  translation 28.000 46.000 32.000
+  translation 28.000 46.000 37.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -99,7 +99,7 @@ Transform {
     }
   ]
 }
-# edge 201430 -> 200210
+# edge 1994200 -> 1994000
  Group { children [
 Transform {
   children [
@@ -134,9 +134,9 @@ Transform {
       translation 35.000 17.000 0.000
     }
 ] }
-# node 201330
+# node 1994150
 Transform {
-  translation 50.000 46.000 63.000
+  translation 50.000 46.000 20.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -154,7 +154,7 @@ Transform {
     }
   ]
 }
-# edge 201330 -> 200210
+# edge 1994150 -> 1994000
  Group { children [
 Transform {
   children [
@@ -189,9 +189,9 @@ Transform {
       translation 46.000 17.000 0.000
     }
 ] }
-# node 200520
+# node 1994100
 Transform {
-  translation 72.000 46.000 55.000
+  translation 72.000 46.000 6.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -209,7 +209,7 @@ Transform {
     }
   ]
 }
-# edge 200520 -> 200210
+# edge 1994100 -> 1994000
  Group { children [
 Transform {
   children [
@@ -244,9 +244,9 @@ Transform {
       translation 57.000 17.000 0.000
     }
 ] }
-# node 200290
+# node 1994050
 Transform {
-  translation 94.000 46.000 53.000
+  translation 94.000 46.000 55.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -264,7 +264,7 @@ Transform {
     }
   ]
 }
-# edge 200290 -> 200210
+# edge 1994050 -> 1994000
  Group { children [
 Transform {
   children [
@@ -300,5 +300,5 @@ Transform {
     }
 ] }
   ] }
-  Viewpoint {position 1.852 0.963 7.072}
+  Viewpoint {position 1.852 0.963 6.184}
 ] }

data/test/test_ruby_fann.rb

@@ -188,6 +188,13 @@ class RubyFannTest < Test::Unit::TestCase
     assert_raises(RuntimeError) { fann.set_activation_function_hidden(:fake) }
     fann.set_activation_function_hidden(:elliot)
   end
+  
+  def test_activation_function_layer
+    fann = RubyFann::Standard.new(:num_inputs=>5, :hidden_neurons=>[2, 8, 4, 3, 4], :num_outputs=>1)
+    fann.set_activation_function_layer(:linear, 1)
+    assert_raises(RuntimeError) { fann.set_activation_function_layer(:fake, 0) }
+    assert_equal(:linear, fann.get_activation_function(1, 0))
+  end
 
   def test_activation_function_output
     fann = RubyFann::Standard.new(:num_inputs=>5, :hidden_neurons=>[2, 8, 4, 3, 4], :num_outputs=>1)  

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>ruby-fann</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ruby-fann"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ruby-fann" class="numbers">0.7.8</a>
+      <a href="http://rubyforge.org/projects/ruby-fann" class="numbers">0.7.9</a>
     </div>
     <p><em>Bindings to use <a href="http://leenissen.dk/fann/"><span class="caps">FANN</span></a> (Fast Artificial Neural Network) from within ruby/rails environment.</em></p>
 
@@ -57,6 +57,12 @@
 	</ul>
 
 
+	<ul>
+	<li>Some Mac <span class="caps">OS X</span> users (possibly that are using, or have used, MacPorts) need to use <strong>sudo env <span class="caps">ARCHFLAGS</span>=&#8221;-arch i386&#8221;</strong> in front of the install command:
+<pre class='syntax'><span class="ident">sudo</span> <span class="ident">env</span> <span class="constant">ARCHFLAGS</span><span class="punct">=&quot;</span><span class="string">-arch i386</span><span class="punct">&quot;</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">ruby</span><span class="punct">-</span><span class="ident">fann</span></pre></li>
+	</ul>
+
+
 	<h2>Requirements:</h2>
 
 
@@ -150,7 +156,7 @@ end
 
 	<p>Comments are welcome. Send an email to <a href="mailto:steven@7bpeople.com">Steven Miers</a> email via the <a href="http://groups.google.com/group/ruby_fann">forum</a></p>
     <p class="coda">
-      <a href="steven@7bpeople.com">Steven Miers</a>, 25th March 2008<br>
+      <a href="steven@7bpeople.com">Steven Miers</a>, 9th April 2008<br>
     </p>
 </div>
 

data/website/index.txt

@@ -14,6 +14,9 @@ h2. Installing
 * Then, install ruby-fann:
 <pre syntax="ruby">[sudo] gem install ruby-fann</pre>
 
+* Some Mac OS X users (possibly that are using, or have used, MacPorts) need to use *sudo env ARCHFLAGS="-arch i386"* in front of the install command:
+<pre syntax="ruby">sudo env ARCHFLAGS="-arch i386" gem install ruby-fann</pre>
+
 h2. Requirements:
 
 * Fann 2.1 or greater (preferably in /usr/local/lib).	

data/xor_cascade.net

@@ -30,5 +30,5 @@ cascade_activation_steepnesses_count=4
 cascade_activation_steepnesses=2.50000000000000000000e-01 5.00000000000000000000e-01 7.50000000000000000000e-01 1.00000000000000000000e+00 
 layer_sizes=3 1 1 1 
 scale_included=0
-neurons (num_inputs, activation_function, activation_steepness)=(0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (3, 8, 7.50000000000000000000e-01) (4, 3, 1.00000000000000000000e+00) (5, 5, 5.00000000000000000000e-01) 
-connections (connected_to_neuron, weight)=(0, 1.17487274070837233175e+00) (1, 5.72167203598355156302e-01) (2, -9.47632295698525028982e-04) (0, -6.26256319600163036121e-03) (1, -5.45082622451080987813e-03) (2, -1.71164041899664596258e+01) (3, 4.09645059009046297316e-01) (0, 1.14152533557484198168e-01) (1, 5.04601192810541165912e-01) (2, 1.60318449249861605388e-01) (3, 6.18285862204485852089e+01) (4, 6.55252632598424034072e-01) 
+neurons (num_inputs, activation_function, activation_steepness)=(0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (3, 15, 7.50000000000000000000e-01) (4, 3, 1.00000000000000000000e+00) (5, 5, 5.00000000000000000000e-01) 
+connections (connected_to_neuron, weight)=(0, 2.10286480710118617310e+00) (1, 2.04373163145531488993e+00) (2, 4.63108727828299038265e-01) (0, 8.37135096431359040925e-03) (1, 4.53412101729364080960e-03) (2, -1.60546889498873532887e+01) (3, -5.16049715334957539992e-02) (0, 8.95993205212286980554e-01) (1, 3.52223488932136952201e-01) (2, -5.61956417965705057327e-01) (3, 4.08175747120339238450e+01) (4, -5.73087151679878559207e-01) 

data/xor_float.net

@@ -31,4 +31,4 @@ cascade_activation_steepnesses=2.50000000000000000000e-01 5.00000000000000000000
 layer_sizes=3 4 2 
 scale_included=0
 neurons (num_inputs, activation_function, activation_steepness)=(0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (3, 5, 1.00000000000000000000e+00) (3, 5, 1.00000000000000000000e+00) (3, 5, 1.00000000000000000000e+00) (0, 5, 1.00000000000000000000e+00) (4, 5, 1.00000000000000000000e+00) (0, 5, 1.00000000000000000000e+00) 
-connections (connected_to_neuron, weight)=(0, -1.16530225097567696757e+00) (1, 1.28392029697533782695e+00) (2, -1.86287924359784518025e+00) (0, -1.54401822430982371692e+00) (1, -2.14060738181401077895e+00) (2, 1.32833706012518493189e+00) (0, 2.19704260703105402897e+00) (1, 1.68408615028061281471e+00) (2, 1.42573306421817536105e+00) (3, 2.17038801863726327213e+00) (4, 4.85232503890282362846e+00) (5, 4.87237610174419533138e+00) (6, -2.15603708927686987806e+00) 
+connections (connected_to_neuron, weight)=(0, 2.36087072243863227428e+00) (1, 2.23300336307513402900e+00) (2, 1.96336343675226854266e+00) (0, 2.50794112269722768715e+00) (1, 2.44626718636426510045e+00) (2, -1.88110670483874753423e+00) (0, 1.92424255389214260425e+00) (1, 1.85908978706197380859e+00) (2, 1.86489077619511700590e+00) (3, 3.92070597842786483511e+00) (4, -4.51811730870642414004e+00) (5, 6.57427812243734366326e-01) (6, -4.31244371074561883006e+00) 

metadata

@@ -1,34 +1,30 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: ruby-fann
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
-date: 2008-03-25 00:00:00 -05:00
-summary: Bindings to use FANN from within ruby/rails environment.
-require_paths: 
-- lib
-- ext
-email: steven@7bpeople.com
-homepage: http://ruby-fann.rubyforge.org
-rubyforge_project: ruby-fann
-description: Bindings to use FANN from within ruby/rails environment.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.7.9
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Steven Miers
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-08-15 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: Bindings to use FANN from within ruby/rails environment.
+email: steven@7bpeople.com
+executables: []
+
+extensions: 
+- ext/ruby_fann/extconf.rb
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
+- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -69,25 +65,36 @@ files:
 - xor.train
 - xor_cascade.net
 - xor_float.net
-test_files: 
-- test/test_helper.rb
-- test/test_neurotica.rb
-- test/test_ruby_fann.rb
-- test/test_ruby_fann_functional.rb
+has_rdoc: true
+homepage: http://ruby-fann.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
-executables: []
-
-extensions: 
-- ext/ruby_fann/extconf.rb
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-fann
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Bindings to use FANN from within ruby/rails environment.
+test_files: 
+- test/test_helper.rb
+- test/test_neurotica.rb
+- test/test_ruby_fann.rb
+- test/test_ruby_fann_functional.rb