hopfield 1.1 → 1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f1e7bbc674b32b5f95647dcb42109ce6a37bc0b
+  data.tar.gz: 083b4ff167702baf75a0dd050e3fd75de42f1c97
+SHA512:
+  metadata.gz: 110a161f19c05846bde6fa84d4775af490ec44c7c3352b71338ca4c436ce793ac3b27b09e410fc70b85b1337c33c15f59fd9eefd85c339b9a99c57032d1aebd3
+  data.tar.gz: 56c9fb943f7be0e5d23983c5db41e8739b1c10118252828bfa9a21f40af5d42cf69aa59ae1437d28bd70e426b2bbb1e2aa7224dc7d51470345f46544a4d47759

data/README.md

@@ -24,7 +24,7 @@ network.runs # how many propagations it took
 ```
 
 ## TODO
-- Make this a C extension to boost performance
+- Improve C extension to boost performance
 - Turn the random picking of neurons into pseudo randomness to prevent the same neuron to be propagated over and over again
 - Implement the Storkey learning rule to provide an alternative for the already implemented Hebbian learning rule.
 - Release the examples

data/ext/hopfield/extconf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile('hopfield/hopfield')

data/ext/hopfield/hopfield.c

@@ -0,0 +1,47 @@
+#include <ruby.h>
+
+static VALUE m_hopfield;
+
+static VALUE hopfield_calculate_weights_hebbian(VALUE self, VALUE patterns, VALUE neurons_count) {
+  Check_Type(patterns, T_ARRAY);
+  Check_Type(neurons_count, T_FIXNUM);
+  
+  int n_count = FIX2INT(neurons_count);
+  
+  VALUE weights;
+  weights = rb_ary_new2(n_count);
+  for(int i = 0; i < n_count-1; i++) {
+    rb_ary_store(weights, i, rb_ary_new2(n_count));
+  }
+  
+  int patterns_count = (int) RARRAY_LEN(patterns);
+  
+  for(int i = 0; i < n_count; i++) {
+    for(int j = (i+1); j < n_count; j++) {
+      if (j == i)
+        continue;
+      
+      float weight = 0.0;
+      for(int p = 0; p < patterns_count; p ++) {
+        weight += FIX2INT(rb_ary_entry(rb_ary_entry(patterns, p), i)) * FIX2INT(rb_ary_entry(rb_ary_entry(patterns, p), j));
+      }
+      
+      weight = weight / patterns_count;
+      
+      int w_i = (i < j) ? i : j;
+      int w_j = (j > i) ? j : i;
+      
+      rb_ary_store(rb_ary_entry(weights, w_i), w_j, rb_float_new(weight));
+    }
+  }
+  
+  return weights;
+}
+
+/* ruby calls this to load the extension */
+void Init_hopfield(void) {
+  
+  m_hopfield = rb_define_module("Hopfield");
+  
+  rb_define_module_function(m_hopfield, "calculate_weights_hebbian", hopfield_calculate_weights_hebbian, 2);
+}

data/lib/hopfield/training.rb

@@ -5,6 +5,8 @@ module Hopfield
   HEBBIAN_RULE = 1
   STORKEY_RULE = 2
   
+  USE_C_EXTENSION = true
+  
   class Training
     attr_accessor :patterns, :neurons, :weights, :pattern_dimensions,  :rule
     
@@ -48,18 +50,23 @@ module Hopfield
       # Neurons are fully connected; every neuron has a weight value for every other neuron
       case rule
         when Hopfield::HEBBIAN_RULE
-          self.neurons.count.times do |i|
-            for j in ((i+1)...self.neurons.count) do
-              next if i == j
-              weight = 0.0
-              self.patterns.each do |pattern|
-                weight += pattern[i] * pattern[j]
+          if USE_C_EXTENSION
+            self.weights = Hopfield::calculate_weights_hebbian(self.patterns, self.neurons.count)
+          else
+            # Ruby equivalent of the calculate_weights_hebbian C function
+            self.neurons.count.times do |i|
+              for j in ((i+1)...self.neurons.count) do
+                next if i == j
+                weight = 0.0
+                self.patterns.each do |pattern|
+                  weight += pattern[i] * pattern[j]
+                end
+                set_weight(i, j, weight / self.patterns.count)
               end
-              set_weight(i, j, weight / self.patterns.count)
             end
           end
         when Hopfield::STORKEY_RULE
-          
+          # Still has to be implemented in both Ruby and C
         else
           abort 'Unknown learning rule specified, either use Hopfield::STORKEY_RULE or Hopfield::HEBBIAN_RULE'
         end

data/lib/hopfield.rb

@@ -1,4 +1,4 @@
-require 'matrix'
+require 'hopfield/hopfield'
 
 require_relative 'hopfield/neuron'
 require_relative 'hopfield/training'

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hopfield
 version: !ruby/object:Gem::Version
-  version: '1.1'
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Bart Olsthoorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hopfield networks can be used for smart pattern recollections. It's recalling
@@ -48,37 +43,40 @@ description: Hopfield networks can be used for smart pattern recollections. It's
 email:
 - bartolsthoorn@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/hopfield/extconf.rb
 extra_rdoc_files: []
 files:
 - lib/hopfield/network.rb
 - lib/hopfield/neuron.rb
 - lib/hopfield/training.rb
 - lib/hopfield.rb
+- ext/hopfield/hopfield.c
+- ext/hopfield/extconf.rb
 - LICENSE
 - README.md
 homepage: http://github.com/bartolsthoorn/hopfield-ruby
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of a Hopfield Network
 test_files: []