ruby-fann 0.7.3 → 0.7.4

data/History.txt

@@ -12,3 +12,8 @@
 
   * 1 minor enhancement
     * Directives to build native extensions
+
+== 0.7.4 2007-12-19
+
+  * 1 minor enhancement
+    * Nicer message if FANN not installed

data/ext/ruby_fann/Makefile

@@ -43,7 +43,7 @@ LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 RUBY_EXTCONF_H = 
 CFLAGS   =  -fno-common -g -O2  -fno-common -pipe -fno-common 
 INCFLAGS = -I. -I. -I/usr/local/lib/ruby/1.8/i686-darwin8.11.1 -I.
-CPPFLAGS =  
+CPPFLAGS =  -I/usr/funk/include 
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS = -L.   
 LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
@@ -68,8 +68,8 @@ COPY = cp
 
 preload = 
 
-libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
+libpath = . $(libdir) /usr/funk/lib
+LIBPATH =  -L"." -L"$(libdir)" -L"/usr/funk/lib"
 DEFFILE = 
 
 CLEANFILES = mkmf.log

data/ext/ruby_fann/extconf.rb

@@ -1,5 +1,8 @@
 require 'mkmf'
-dir_config("ruby_fann")
-find_library("doublefann", "fann_create_standard", "/usr/local/lib")
-#create_makefile("ruby-fann")
+lib = dir_config('fann', '/usr/local')
+if !have_library("doublefann", "fann_create_standard")
+  puts "FANN must be installed and available in /usr/local or passed in with --with-fann-dir "
+  exit 1
+end
+#find_library("doublefann", "fann_create_standard", "/usr/local/lib")
 create_makefile("neural_network")

data/lib/ruby_fann/version.rb

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

data/test/test_ruby_fann_functional.rb

@@ -73,7 +73,7 @@ class RubyFannFunctionalTest < Test::Unit::TestCase
 private
   def verify_training_data(nn, training, input_data, output_data, expected_error=0.002)
     mse = nn.test_data(training)
-  	puts("Tested network. %f\n", mse)
+  	puts("Tested network. %f\n" % mse)
 
     calc_out = []
   	0.upto(input_data.length-1) do |i| 

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

@@ -1,5 +1,5 @@
 FANN_FLO_2.1
-num_layers=4
+num_layers=3
 learning_rate=0.700000
 connection_rate=1.000000
 network_type=1
@@ -28,7 +28,7 @@ cascade_activation_functions_count=10
 cascade_activation_functions=3 5 7 8 10 11 14 15 16 17 
 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 
+layer_sizes=3 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, 14, 7.50000000000000000000e-01) (4, 7, 1.00000000000000000000e+00) (5, 5, 5.00000000000000000000e-01) 
-connections (connected_to_neuron, weight)=(0, 1.69368225817805306832e+00) (1, 2.08920519418653682919e+00) (2, 2.08209278669541841822e+00) (0, 3.34013988327298427805e+00) (1, 2.93217698586362640611e+00) (2, 3.22640486156344952207e+00) (3, 3.11359130974472542164e+00) (0, 3.15916855833715426449e-01) (1, 2.36476269687895951366e-01) (2, -2.40909157788608524475e-01) (3, 4.02651493128943016586e+01) (4, -2.06887458728570478028e-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, 5, 5.00000000000000000000e-01) 
+connections (connected_to_neuron, weight)=(0, 2.11189032829451006634e+00) (1, 1.38897825390983808980e+00) (2, 1.15236450682683587432e-02) (0, 2.72835175674095875564e-01) (1, 1.20351296053197442948e-01) (2, 3.97426992279901469818e-01) (3, 5.69930004183144021113e+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.77563726355814255342e+00) (1, 1.70865512093591309650e+00) (2, -1.35620772409434886541e+00) (0, 2.54763445407383049002e+00) (1, 2.38503950578006485017e+00) (2, 1.82714622361575518283e+00) (0, 2.23745614983482665750e+00) (1, 2.06383714945245611005e+00) (2, -2.08187721657654112306e+00) (3, -2.44900226502112489113e-01) (4, 4.89073018141245707824e+00) (5, -4.73615236757579260995e+00) (6, -4.61604992747759812488e+00) 
+connections (connected_to_neuron, weight)=(0, -3.16705915187245290454e+00) (1, -4.14808474757160297486e+02) (2, -1.49899501759802666889e+00) (0, -1.37559342196213130194e+00) (1, 9.92224239227251642026e-02) (2, -1.38055639686059938853e+00) (0, 1.78027947081140469621e+00) (1, 9.49321928628780314918e-02) (2, 1.77664309963691202654e+00) (3, 3.99985246158351248624e+00) (4, 3.92276033365987188972e+01) (5, 3.86637639535680861513e+01) (6, 3.20449395370871137345e-01) 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-fann
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 date: 2007-12-19 00:00:00 -06:00
 summary: Bindings to use FANN from within ruby/rails environment.
 require_paths: