ruby-fann 0.7.6 → 0.7.7

data/History.txt

@@ -24,6 +24,10 @@
     * Minor code cleanup & symbol fixage
     * Nicer message for windows users
 
-== 0.7.6 2008-01-14
-  * 1 minor enhancements 
-    * Exception (instead of pukage) if zero-length array given on training data 
+== 0.7.6 2007-01-14
+  * 1 minor bug fix
+    * Exception (instead of pukage) if zero-length array given on training data
+
+== 0.7.7 2007-01-23
+  * 1 minor enhncement
+    * Cull bias neuron(s) from get_neurons function

data/ext/ruby_fann/neural_network.c

@@ -660,10 +660,14 @@ static VALUE get_neurons(VALUE self, VALUE layer)
 	VALUE value_sym = ID2SYM(rb_intern("value"));
 	VALUE connections_sym = ID2SYM(rb_intern("connections"));
 	unsigned int layer_num = 0;
+	
+	
+  int nuke_bias_neuron = (fann_get_network_type(f)==FANN_NETTYPE_LAYER);
 	for(layer_it = f->first_layer; layer_it != f->last_layer; layer_it++)
 	{
 		for(neuron_it = layer_it->first_neuron; neuron_it != layer_it->last_neuron; neuron_it++)
 		{
+      if (nuke_bias_neuron && (neuron_it==(layer_it->last_neuron)-1)) continue;
 			// Create array of connection indicies:
 			VALUE connection_array = rb_ary_new();
 			for (i = neuron_it->first_con; i < neuron_it->last_con; i++) {				
@@ -685,6 +689,18 @@ static VALUE get_neurons(VALUE self, VALUE layer)
 		++layer_num;
 	}
 
+  // switch (fann_get_network_type(ann)) {
+  //     case FANN_NETTYPE_LAYER: {
+  //         /* Report one bias in each layer except the last */
+  //         if (layer_it != ann->last_layer-1)
+  //             *bias = 1;
+  //         else
+  //             *bias = 0;
+  //         break;
+  //     }
+  //     case FANN_NETTYPE_SHORTCUT: {
+
+
 	return neuron_array;	
 }
 

data/lib/ruby_fann/version.rb

@@ -2,7 +2,7 @@ module RubyFann #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 6
+    TINY  = 7
 
     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 8419700
+# node 2898230
 Transform {
-  translation 6.000 46.000 41.000
+  translation 6.000 6.000 89.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -24,9 +24,9 @@ Transform {
     }
   ]
 }
-# node 8417440
+# node 2897300
 Transform {
-  translation 50.000 6.000 32.000
+  translation 28.000 6.000 56.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -44,44 +44,9 @@ Transform {
     }
   ]
 }
-# edge 8419700 -> 8417440
- Group { children [
+# node 2897070
 Transform {
-  children [
-    Shape {
-      geometry Cylinder {
-        bottom FALSE top FALSE
-        height 38.822 radius 1.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-Transform {
-  translation 0 24.411 0
-  children [
-    Shape {
-      geometry Cone {bottomRadius 3.500 height 10.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-  ]
-}
-      ]
-      center 0 5.000 0
-      rotation -0.000 0 -22.000 -3.975
-      translation 24.000 17.000 0.000
-    }
-] }
-# node 8418480
-Transform {
-  translation 28.000 46.000 50.000
+  translation 50.000 6.000 0.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -99,44 +64,9 @@ Transform {
     }
   ]
 }
-# edge 8418480 -> 8417440
- Group { children [
-Transform {
-  children [
-    Shape {
-      geometry Cylinder {
-        bottom FALSE top FALSE
-        height 25.133 radius 1.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
+# node 2895200
 Transform {
-  translation 0 17.566 0
-  children [
-    Shape {
-      geometry Cone {bottomRadius 3.500 height 10.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-  ]
-}
-      ]
-      center 0 5.000 0
-      rotation -0.000 0 -11.000 -3.644
-      translation 35.000 17.000 0.000
-    }
-] }
-# node 8418170
-Transform {
-  translation 50.000 46.000 7.000
+  translation 72.000 6.000 96.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -154,44 +84,9 @@ Transform {
     }
   ]
 }
-# edge 8418170 -> 8417440
- Group { children [
-Transform {
-  children [
-    Shape {
-      geometry Cylinder {
-        bottom FALSE top FALSE
-        height 19.035 radius 1.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
+# node 2893280
 Transform {
-  translation 0 14.518 0
-  children [
-    Shape {
-      geometry Cone {bottomRadius 3.500 height 10.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-  ]
-}
-      ]
-      center 0 5.000 0
-      rotation -0.000 0 1.000 -3.142
-      translation 46.000 17.000 0.000
-    }
-] }
-# node 8417870
-Transform {
-  translation 72.000 46.000 50.000
+  translation 94.000 6.000 47.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -209,44 +104,9 @@ Transform {
     }
   ]
 }
-# edge 8417870 -> 8417440
- Group { children [
-Transform {
-  children [
-    Shape {
-      geometry Cylinder {
-        bottom FALSE top FALSE
-        height 24.018 radius 1.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-Transform {
-  translation 0 17.009 0
-  children [
-    Shape {
-      geometry Cone {bottomRadius 3.500 height 10.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-  ]
-}
-      ]
-      center 0 5.000 0
-      rotation -0.000 0 11.000 -3.644
-      translation 57.000 17.000 0.000
-    }
-] }
-# node 8417570
+# node 2892270
 Transform {
-  translation 94.000 46.000 2.000
+  translation 116.000 6.000 38.000
   scale 2.000 2.000 2.000
   children [
     Transform {
@@ -264,41 +124,6 @@ Transform {
     }
   ]
 }
-# edge 8417570 -> 8417440
- Group { children [
-Transform {
-  children [
-    Shape {
-      geometry Cylinder {
-        bottom FALSE top FALSE
-        height 37.531 radius 1.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-Transform {
-  translation 0 23.765 0
-  children [
-    Shape {
-      geometry Cone {bottomRadius 3.500 height 10.000 }
-      appearance Appearance {
-        material Material {
-          ambientIntensity 0.33
-          diffuseColor 0.000 0.000 1.000
-        }
-      }
-    }
-  ]
-}
-      ]
-      center 0 5.000 0
-      rotation -0.000 0 22.000 -3.975
-      translation 68.000 17.000 0.000
-    }
-] }
   ] }
-  Viewpoint {position 1.852 0.963 6.035}
+  Viewpoint {position 2.259 0.222 7.273}
 ] }

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.6</a>
+      <a href="http://rubyforge.org/projects/ruby-fann" class="numbers">0.7.7</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>
 

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, 15, 1.00000000000000000000e+00) (4, 3, 5.00000000000000000000e-01) (5, 5, 5.00000000000000000000e-01) 
-connections (connected_to_neuron, weight)=(0, 1.64060127614348427727e+00) (1, 1.57263750461912477085e+00) (2, -3.68301579404615997415e-04) (0, 1.07756007111791535236e-02) (1, 6.15052708190636995833e-03) (2, -5.73600239194447922841e+01) (3, 1.26449875516921987628e-02) (0, 2.33410030412561697588e-01) (1, 2.40872204847791621107e-01) (2, 2.37685570936397305708e-01) (3, 3.95914595301011544848e+01) (4, 2.38574359126598856129e-01) 
+neurons (num_inputs, activation_function, activation_steepness)=(0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (0, 0, 0.00000000000000000000e+00) (3, 14, 1.00000000000000000000e+00) (4, 3, 1.00000000000000000000e+00) (5, 5, 5.00000000000000000000e-01) 
+connections (connected_to_neuron, weight)=(0, 1.86109735793926978076e+00) (1, 1.53457642869428334542e+00) (2, 1.57379632519913137401e+00) (0, -1.63855205202685857979e-02) (1, -4.37714446815499758081e-02) (2, -1.79293283324296588432e+01) (3, -3.03416410098376498894e-01) (0, 1.77185261840735880368e-01) (1, 1.41681920756182133658e-01) (2, 2.22790414769918176940e-01) (3, 4.00602073083754319782e+01) (4, -7.43623769268710044233e-02) 

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.27441270422940866602e+00) (1, -1.22426116781974170244e+00) (2, -1.77359115369454456435e+00) (0, 1.75865469280423880605e+00) (1, 5.81083794776469098053e-01) (2, -7.07551379257807533385e-01) (0, 2.55797944565093970937e+00) (1, 2.45367366963896449406e+00) (2, 2.60478211460055675275e+00) (3, 3.76234015577947022990e+00) (4, -4.63506819515176449187e+00) (5, 4.70207528005021035966e+00) (6, -6.14161507194542544141e-01) 
+connections (connected_to_neuron, weight)=(0, 2.82674709981290295246e+00) (1, 1.83285679199681794671e+00) (2, 1.79351510444946171674e+00) (0, 1.30190337108136544586e+00) (1, 2.12157151948249156348e+00) (2, -1.35178282494634038891e+00) (0, -1.40745923743137546502e+00) (1, 1.66503130606607463449e+00) (2, -2.25816505377594189952e+00) (3, 3.96208974962423310373e+00) (4, -4.07142363835370790781e+00) (5, 2.94122805959320210434e+00) (6, -8.99181418321290504281e-01) 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-fann
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
-date: 2008-01-14 00:00:00 -06:00
+  version: 0.7.7
+date: 2008-01-23 00:00:00 -06:00
 summary: Bindings to use FANN from within ruby/rails environment.
 require_paths: 
 - lib