rubygrad 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f74bc1d833eda69afa375ab9cbdbca37fd201a3635e9c517264b1255102c613
-  data.tar.gz: 72461737f3c24099121b35ddbf26300898ce825b1b18625b7c899ac50941fa18
+  metadata.gz: f05df7e74616deb2db9a7c7340e105e0997268d9d2938d07dbabf51395684fe5
+  data.tar.gz: 6179a5c6a57c37411784195a9ca3a15f73debdd06aaeae46a754ff5857e60770
 SHA512:
-  metadata.gz: e7e42b0f1f0e0895635ec37cccfc950d302690cddc53c432f4a3ce8970b9b3e9f80b58e2dc1d7136ab35cf49277e56ec929eaa473466257aca152611dcaee0d4
-  data.tar.gz: 6d5ba4a6b70f91e7909c6b878c99a8bd8534ddec279f70ac7a0afe395a7c849b9b687101ef0304ccd50fd234e38109be27e1280d63e998cfe6a0f9396315d5f0
+  metadata.gz: 2187327cf7c8b2a8e323b90138c49b7bd6cb5c84ed0e784a5c288556525cf0f8c619dd2aef024b6afaa27aad5b4f2a104457e67dd7158a121f41e9b5dfa631c3
+  data.tar.gz: ebb19b5217fb756fa9072dcf9e2b39ff503f93ac94f782cc45e2ffdc73ee85e6f5c9e471d7995d1017aa0697b97437cf5eb56be1cee34d79e30b0aaf4d5818b9

data/lib/nn.rb

@@ -12,6 +12,8 @@ class Neuron
         @activation_function = activation_function
     end
 
+    attr_reader :weights, :bias
+
     def reset_params
         @initial_weights.each_with_index do |w,i|
             @weights[i].value = w
@@ -26,7 +28,9 @@ class Neuron
         (1...params.size).each { |i| @weights[i - 1].value = params[i] }
     end
 
-    attr_reader :weights, :bias
+    def set_activation_function(activation_function)
+        @activation_function = activation_function
+    end
 
     def parameters
         self.weights + [self.bias]
@@ -71,6 +75,11 @@ class Layer
         self.neurons.each { |n| n.reset_params }
     end
 
+    def set_activation_function(activation_function)
+        @activation_function = activation_function
+        self.neurons.each { |n| n.set_activation_function(activation_function) }
+    end
+
     def calc(inputs)
         outs = []
         self.neurons.each do |neuron|
@@ -86,37 +95,43 @@ class MLP
 
         number_of_layers = layers_config.size - 1 # last param is the activation function
 
-        act = layers_config.last
+        act_array = validate_act_array(layers_config.last, number_of_layers)
 
-        if !act.is_a?(Symbol) and !act.is_a?(Array)
-            raise "Activation function must be passed as the last parameter: #{act.class} expected Symbol or Array of Symbols" 
+        @layers = Array.new(number_of_layers - 1) # input layer is not really a layer object
+        (number_of_layers - 1).times do |i|
+            @layers[i] = Layer.new(layers_config[i], layers_config[i + 1], act_array[i])
         end
 
-        single_activation_function = nil
+        @layers_config = layers_config
+    end
 
-        if act.is_a?(Symbol)
+    private def validate_act_array(act, number_of_layers)
 
-            single_activation_function = act
+        if !act.is_a?(Symbol) and !act.is_a?(Array)
+            raise "Activation function must be passed as the last parameter: #{act.class} expected Symbol or Array of Symbols" 
+        end
 
-        else # is Array
+        if act.is_a?(Array)
 
             if not act.all? { |item| item.is_a?(Symbol) }
                 raise "Array with activation functions must contain symbols: #{act}"
             end
 
             if act.size == 1
-                single_activation_function = act.first
-            elsif act.size != number_of_layers - 1
+                return Array.new(number_of_layers - 1) { act.first } 
+            end
+
+            if act.size != number_of_layers - 1
                 raise "Array size does not match number of layers with activation functions: #{act.size} expected #{number_of_layers - 1}"
             end
-        end
-        
-        @layers = Array.new(number_of_layers - 1) # input layer is not really a layer object
-        (number_of_layers - 1).times do |i|
-            @layers[i] = Layer.new(layers_config[i], layers_config[i + 1], single_activation_function.nil? ? act[i] : single_activation_function)
-        end
 
-        @layers_config = layers_config
+            return act
+
+        else # is a Symbol
+
+            return Array.new(number_of_layers - 1) { act }
+
+        end
     end
 
     attr_reader :layers
@@ -179,6 +194,11 @@ class MLP
         end
     end
 
+    def set_activation_function(activation_function)
+        act_array = validate_act_array(activation_function, @layers_config.size - 1)
+        self.layers.each_with_index { |layer, i| layer.set_activation_function(act_array[i]) }
+    end
+
     def zero_grad
         self.parameters.each { |p| p.grad = 0.0 }
     end

data/mlp_example.rb

@@ -1,4 +1,5 @@
 require 'rubygrad'
+#require_relative 'lib/nn.rb'
 
 # Build a Machine Learning Perceptron with 4 layers
 # First  Layer (Layer 0) => Input Layer  => 3 Neurons => 3 Inputs
@@ -7,6 +8,11 @@ require 'rubygrad'
 # Fourth Layer (Layer 3) => Output Layer => 1 Neuron => 1 Output
 nn = MLP.new(3, 4, 4, 1, :tanh)
 
+nn.show_params
+puts
+nn.show_params(in_words = true)
+puts
+
 # 4 input samples
 x_inputs = [
     [2.0, 3.0, -1.0],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygrad
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sergio Oliveira Jr
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: A port of Andrej Karpathy's micrograd to Ruby.