brainz 0.1.1 → 0.1.2

data/Manifest

@@ -3,6 +3,7 @@ README.rdoc
 Rakefile
 brainz.gemspec
 examples/and.rb
+examples/multi_layer_xor.rb
 examples/sign.rb
 examples/xor.rb
 lib/brainz.rb
@@ -18,6 +19,7 @@ lib/ext/array.rb
 spec/array_spec.rb
 spec/brainz_spec.rb
 spec/loader_spec.rb
+spec/neuron_spec.rb
 spec/spec_helper.rb
 spec/temp/brainz.b
 Manifest

data/brainz.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "brainz"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vilius Luneckas"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-26"
   s.description = "Simple artificial intelligence"
   s.email = "vilius.luneckas@gmail.com"
   s.extra_rdoc_files = ["LICENSE", "README.rdoc", "lib/brainz.rb", "lib/brainz/backpropagation.rb", "lib/brainz/brainz.rb", "lib/brainz/layer.rb", "lib/brainz/loader.rb", "lib/brainz/network.rb", "lib/brainz/neuron.rb", "lib/brainz/synapse.rb", "lib/brainz/version.rb", "lib/ext/array.rb"]
-  s.files = ["LICENSE", "README.rdoc", "Rakefile", "brainz.gemspec", "examples/and.rb", "examples/sign.rb", "examples/xor.rb", "lib/brainz.rb", "lib/brainz/backpropagation.rb", "lib/brainz/brainz.rb", "lib/brainz/layer.rb", "lib/brainz/loader.rb", "lib/brainz/network.rb", "lib/brainz/neuron.rb", "lib/brainz/synapse.rb", "lib/brainz/version.rb", "lib/ext/array.rb", "spec/array_spec.rb", "spec/brainz_spec.rb", "spec/loader_spec.rb", "spec/spec_helper.rb", "spec/temp/brainz.b", "Manifest"]
+  s.files = ["LICENSE", "README.rdoc", "Rakefile", "brainz.gemspec", "examples/and.rb", "examples/multi_layer_xor.rb", "examples/sign.rb", "examples/xor.rb", "lib/brainz.rb", "lib/brainz/backpropagation.rb", "lib/brainz/brainz.rb", "lib/brainz/layer.rb", "lib/brainz/loader.rb", "lib/brainz/network.rb", "lib/brainz/neuron.rb", "lib/brainz/synapse.rb", "lib/brainz/version.rb", "lib/ext/array.rb", "spec/array_spec.rb", "spec/brainz_spec.rb", "spec/loader_spec.rb", "spec/neuron_spec.rb", "spec/spec_helper.rb", "spec/temp/brainz.b", "Manifest"]
   s.homepage = "https://github.com/ViliusLuneckas/brainz/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Brainz", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/multi_layer_xor.rb

@@ -0,0 +1,14 @@
+require_relative '../lib/brainz'
+
+
+brainz = Brainz::Brainz.new
+
+brainz.num_hidden = [4, 7, 3]
+
+brainz.teach(learning_rate: 0.2, momentum: 0.05, wanted_error: 0.01) do |iteration, error|
+  that(a: 1, b: 1).is(0)
+  that(1, 0).is(1)
+  that(0, 1).is(1)
+  that(0, 0).is(0)
+end
+p "Learning took #{brainz.last_iterations}, error: #{brainz.error}, time: #{brainz.learning_time} s."

data/lib/brainz/backpropagation.rb

@@ -2,9 +2,7 @@ module Brainz
   module Algorithms
     module Backpropagation
       def update(input)
-        @network ||= ::Brainz::Network.new(
-            @num_input, [num_hidden, @num_output * 2], @num_output, momentum: momentum, learning_rate: learning_rate
-        )
+        initialize_network unless @network
         @network.update(input)
         self
       end
@@ -12,6 +10,12 @@ module Brainz
       def fix_weights(targets)
         @network.fix_weights(targets)
       end
+
+      def initialize_network
+        @network ||= ::Brainz::Network.new(
+            num_input, num_hidden, num_output, momentum: momentum, learning_rate: learning_rate
+        )
+      end
     end
   end
 end

data/lib/brainz/brainz.rb

@@ -22,7 +22,7 @@ module Brainz
     end
 
     def num_hidden
-      @num_hidden || (num_input + num_output) * 2 / 3
+      @num_hidden || [(num_input + num_output) * 2 / 3]
     end
 
     def learning_cycle

data/lib/brainz/version.rb

@@ -1,3 +1,3 @@
 module Brainz
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/brainz_spec.rb

@@ -47,9 +47,9 @@ describe Brainz::Brainz do
   end
 
   describe "#num_hidden" do
-    it "should return 7" do
+    it "should return [7]" do
       subject.stubs(num_input: 5, num_output: 6)
-      subject.num_hidden.should == 7
+      subject.num_hidden.should == [7]
     end
   end
 

data/spec/neuron_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../spec/spec_helper'
+
+describe Brainz::Neuron do
+  before do
+    brainz = Brainz::Brainz.new
+    brainz.stubs(num_input: 2, num_output: 2, learning_rate: 1.66, momentum: 0.123)
+    brainz.initialize_network
+    @neuron = brainz.network.input.neurons.first
+  end
+
+  it "should get learning rate from brainz" do
+    @neuron.learning_rate.should == 1.66
+  end
+
+  it "should get momentum from brainz" do
+    @neuron.momentum.should == 0.123
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainz
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - brainz.gemspec
 - examples/and.rb
+- examples/multi_layer_xor.rb
 - examples/sign.rb
 - examples/xor.rb
 - lib/brainz.rb
@@ -81,6 +82,7 @@ files:
 - spec/array_spec.rb
 - spec/brainz_spec.rb
 - spec/loader_spec.rb
+- spec/neuron_spec.rb
 - spec/spec_helper.rb
 - spec/temp/brainz.b
 - Manifest