neuro 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,5 @@
+2011-05-22 (0.4.2)
+  * 1.9.2 compatibility
 2009-08-27 (0.4.1)
   * Started using rake-compiler.
   * Some reorganisation of the repository contents, documentation etc.

data/Rakefile

@@ -1,6 +1,7 @@
+# vim: set filetype=ruby et sw=2 ts=2:
+
 begin
   require 'rake/gempackagetask'
-  require 'rake/extensiontask'
 rescue LoadError
 end
 
@@ -21,7 +22,7 @@ task :default => :test
 
 desc "Run unit tests"
 task :test => :compile_ext do
-  sh 'testrb -Iext:lib tests/test_*.rb'
+  sh 'testrb -Iext:lib ./tests/test_*.rb'
 end
 
 desc "Creating documentation"
@@ -51,8 +52,7 @@ task :install => :test do
   install(src, dst, :verbose => true, :mode => 0644)
 end
 
-if defined?(Gem) and defined?(Rake::GemPackageTask) and
-  defined?(Rake::ExtensionTask)
+if defined?(Gem) and defined?(Rake::GemPackageTask)
 then
   spec_src = <<-GEM
     Gem::Specification.new do |s|
@@ -77,7 +77,7 @@ EOF
 
       s.author = "Florian Frank"
       s.email = "flori@ping.de"
-      s.homepage = "http://neuro.rubyforge.org"
+      s.homepage = "http://flori.github.com/#{PKG_NAME}"
       s.rubyforge_project = '#{PKG_NAME}'
     end
   GEM
@@ -94,15 +94,6 @@ EOF
     pkg.need_tar      = true
     pkg.package_files = PKG_FILES
   end
-
-  Rake::ExtensionTask.new do |ext|
-    ext.name            = PKG_NAME
-    ext.gem_spec        = spec
-    ext.cross_compile   = true
-    ext.cross_platform  = 'i386-mswin32'
-    ext.ext_dir         = 'ext'
-    ext.lib_dir         = 'lib'
-  end
 end
 
 desc m = "Writing version information for #{PKG_VERSION}"
@@ -125,7 +116,4 @@ end
 task :default => [ :version, :gemspec, :test ]
 
 desc "Build all gems and archives for a new release."
-task :release => [ :clean, :version, :gemspec, :cross, :native, :gem ] do
-  system "#$0 clean native gem"
-  system "#$0 clean package"
-end
+task :release => [ :clean, :version, :gemspec, :package]

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/ext/neuro.c

@@ -24,7 +24,7 @@ static ID id_to_f, id_class, id_name;
 /* Infrastructure */
 
 typedef struct NodeStruct {
-    int      number_weights;
+    long      number_weights;
     double   *weights;
     double   output;
 } Node;
@@ -46,10 +46,10 @@ typedef struct NetworkStruct {
 
 /* Node methods */
 
-static Node *Node_create(int weights)
+static Node *Node_create(long weights)
 {
     Node *node;
-    int i;
+    long i;
     assert(weights > 0);
     node = ALLOC(Node);
     MEMZERO(node, Node, 1);
@@ -63,17 +63,17 @@ static Node *Node_create(int weights)
 
 static Node *Node_from_hash(VALUE hash)
 {
+    long i, len;
     Node *node;
     VALUE weights = rb_hash_aref(hash, SYM("weights"));
     VALUE output = rb_hash_aref(hash, SYM("output"));
-    int i, len;
     Check_Type(output, T_FLOAT);
     Check_Type(weights, T_ARRAY);
-    len = RARRAY(weights)->len;
+    len = RARRAY_LEN(weights);
     node = Node_create(len);
-    node->output = RFLOAT(output)->value;
+    node->output = RFLOAT_VALUE(output);
     for (i = 0; i < len; i++)
-        node->weights[i] = RFLOAT(rb_ary_entry(weights, i))->value;
+        node->weights[i] = RFLOAT_VALUE(rb_ary_entry(weights, i));
     return node;
 }
 
@@ -88,7 +88,7 @@ static void Node_destroy(Node *node)
 static VALUE Node_to_hash(Node *node)
 {
     VALUE result = rb_hash_new(), weights = rb_ary_new2(node->number_weights);
-    int i;
+    long i;
     rb_hash_aset(result, SYM("output"), rb_float_new(node->output));
     for (i = 0; i < node->number_weights; i++)
         rb_ary_store(weights, i, rb_float_new(node->weights[i]));
@@ -138,7 +138,7 @@ static void Network_init_weights(Network *network)
         network->output_layer[i] = Node_create(network->hidden_size);
 }
 
-static void Network_debug_error(Network *network, int count, float error, float
+static void Network_debug_error(Network *network, long count, double error, double
         max_error)
 {
     VALUE argv[5];
@@ -192,10 +192,10 @@ static void transform_data(double *data_vector, VALUE data)
 {
     int i;
     VALUE current;
-    for (i = 0; i < RARRAY(data)->len; i++) {
+    for (i = 0; i < RARRAY_LEN(data); i++) {
         current = rb_ary_entry(data, i);
         CAST2FLOAT(current);
-        data_vector[i] = RFLOAT(current)->value;
+        data_vector[i] = RFLOAT_VALUE(current);
     }
 }
 
@@ -237,25 +237,25 @@ static VALUE rb_network_learn(VALUE self, VALUE data, VALUE desired, VALUE
     Network *network;
     double max_error_float, eta_float, error, sum,
         *output_delta, *hidden_delta;
-    int i, j, count;
+    long i, j, count;
 
     Data_Get_Struct(self, Network, network);
 
 	Check_Type(data, T_ARRAY);
-    if (RARRAY(data)->len != network->input_size)
+    if (RARRAY_LEN(data) != network->input_size)
         rb_raise(rb_cNeuroError, "size of data != input_size");
     transform_data(network->tmp_input, data);
 
 	Check_Type(desired, T_ARRAY);
-    if (RARRAY(desired)->len != network->output_size)
+    if (RARRAY_LEN(desired) != network->output_size)
         rb_raise(rb_cNeuroError, "size of desired != output_size");
     transform_data(network->tmp_output, desired);
     CAST2FLOAT(max_error);
-    max_error_float = RFLOAT(max_error)->value;
+    max_error_float = RFLOAT_VALUE(max_error);
     if (max_error_float <= 0) rb_raise(rb_cNeuroError, "max_error <= 0");
     max_error_float *= 2.0;
     CAST2FLOAT(eta);
-    eta_float = RFLOAT(eta)->value;
+    eta_float = RFLOAT_VALUE(eta);
     if (eta_float <= 0) rb_raise(rb_cNeuroError, "eta <= 0");
 
     output_delta = ALLOCA_N(double, network->output_size);
@@ -322,12 +322,12 @@ static VALUE rb_network_decide(VALUE self, VALUE data)
 {
     Network *network;
     VALUE result;
-    int i;
+    long i;
 
     Data_Get_Struct(self, Network, network);
 
 	Check_Type(data, T_ARRAY);
-    if (RARRAY(data)->len != network->input_size)
+    if (RARRAY_LEN(data) != network->input_size)
         rb_raise(rb_cNeuroError, "size of data != input_size");
     transform_data(network->tmp_input, data);
     feed;
@@ -515,7 +515,7 @@ static void rb_network_mark(Network *network)
 
 static void rb_network_free(Network *network)
 {
-    int i;
+    long i;
     for (i = 0; i < network->hidden_size; i++)
         Node_destroy(network->hidden_layer[i]);
     MEMZERO(network->hidden_layer, Node*, network->hidden_size);

data/lib/neuro/version.rb

@@ -1,6 +1,6 @@
 module Neuro
   # Neuro version
-  VERSION         = '0.4.1'
+  VERSION         = '0.4.2'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/neuro.gemspec

@@ -1,6 +1,6 @@
     Gem::Specification.new do |s|
       s.name = 'neuro'
-      s.version = '0.4.1'
+      s.version = '0.4.2'
       s.summary = "Neural Network Extension for Ruby"
       s.description = <<EOF
 A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
@@ -20,6 +20,6 @@ EOF
 
       s.author = "Florian Frank"
       s.email = "flori@ping.de"
-      s.homepage = "http://neuro.rubyforge.org"
+      s.homepage = "http://flori.github.com/neuro"
       s.rubyforge_project = 'neuro'
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neuro
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  hash: 11
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 +02:00
-default_executable: 
+date: 2011-05-22 00:00:00 Z
 dependencies: []
 
 description: |
@@ -32,15 +37,13 @@ files:
 - ext/extconf.rb
 - ext/neuro.c
 - install.rb
-- lib/neuro.so
 - lib/neuro/display.rb
 - lib/neuro/version.rb
 - neuro.gemspec
 - tests/test_even_odd.rb
 - tests/test_parity.rb
 - doc-main.txt
-has_rdoc: true
-homepage: http://neuro.rubyforge.org
+homepage: http://flori.github.com/neuro
 licenses: []
 
 post_install_message: 
@@ -54,21 +57,27 @@ require_paths:
 - ext
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: neuro
-rubygems_version: 1.3.4
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Neural Network Extension for Ruby