nn 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8f441634517a886dbdcee8b7186c5d02710c84dc52b381bb29d0d219f958f3
-  data.tar.gz: 3af1f9f95a8727aec20100b1d82ef598dda3857915641a3b73ba16cf372841de
+  metadata.gz: 8afd54182615146fe3023709fdcecdbdf8ef1857e048611efcde6abab91f00fc
+  data.tar.gz: 4d1f66eadf5c5c33ba416d30a7898af4f999c5a541d6018d914f10b3d0840285
 SHA512:
-  metadata.gz: 2774e79cddbc52530d9f00cd34bb981f7beaa7f6d1c402b6205a41dbe7949fb40dedd2e6c97e9f1a38abc64b5e3bf1bffc40843c943bd0f88dcba2e9bd52f202
-  data.tar.gz: c45b37a70bfddb2a31f1682d4268e943098e228b16102d61b74d2d26dd526b2fd491c4ec4d7a4758cfe838a7511061d4e87b263652acb46a5e29e14d298676bf
+  metadata.gz: de6ec3e4db6512fb71d20ac10db29eae197a57e5893befce8ab3493d2a4f22fc1d6b0a4c7779ff2031114d3541068c5095da32b35daad35348e50c0209794b87
+  data.tar.gz: 6f0aa482117bd51dcc255e923450646dbf5ae2df3506b1da466a162285824b3924602b79f19aaf255b6bf741f3fc706ab0c5daccf8aef1c7353e3087a0efb9cf

data/document.txt

@@ -35,7 +35,7 @@ initialize(num_nodes,
            learning_rate: 0.01,
            batch_size: 1,
            activation: [:relu, :identity],
-           momentum: 0,
+           momentum: 0.9,
            weight_decay: 0,
            use_dropout: false,
            dropout_ratio: 0.5,
@@ -52,7 +52,8 @@ initialize(num_nodes,
   Float dropout_ratio  ドロップアウトさせるノードの比率
   bool use_batch_norm  バッチノーマライゼーションを使用するか否か
 
-train(x_train, y_train, x_test, y_test, epoch,
+train(x_train, y_train, x_test, y_test, epochs,
+      learning_rate_decay: 0,
       save_dir: nil,
       save_interval: 1,
       test: nil,
@@ -62,7 +63,8 @@ train(x_train, y_train, x_test, y_test, epoch,
 学習を行います。
   Array<Array<Numeric>> | SFloat x_train  トレーニング用入力データ。
   Array<Array<Numeric>> | SFloat y_train　トレーニング用正解データ。
-  Integer epoch  学習回数。入力データすべてを見たタイミングを1エポックとします。
+  Integer epochs  学習回数。入力データすべてを見たタイミングを1エポックとします。
+  Float learning_rate_decay  1エポックごとに学習率を減衰される値。
   String save_dir  学習中にセーブを行う場合、セーブするディレクトリを指定します。nilの場合、セーブを行いません。
   Integer save_interval  学習中にセーブするタイミングをエポック単位で指定します。
   Array<Array<Array<Numeric>> | SFloat> test  テストで使用するデータ。[x_test, y_test]の形式で指定してください。
@@ -209,4 +211,4 @@ end
 2018/3/14 バージョン1.3公開
 2018/3/18 バージョン1.4公開
 2018/3/22 バージョン1.5公開
-2018/3/27 RubyGemに公開
+2018/4/15 バージョン1.6公開

data/lib/nn.rb

@@ -2,7 +2,7 @@ require "numo/narray"
 require "json"
 
 class NN
-  VERSION = "1.5"
+  VERSION = "1.6"
 
   include Numo
 
@@ -22,7 +22,7 @@ class NN
                  learning_rate: 0.01,
                  batch_size: 1,
                  activation: %i(relu identity),
-                 momentum: 0,
+                 momentum: 0.9,
                  weight_decay: 0,
                  use_dropout: false,
                  dropout_ratio: 0.5,
@@ -64,29 +64,37 @@ class NN
     nn
   end
 
-  def train(x_train, y_train, epoch,
-            save_dir: nil, save_interval: 1, test: nil, border: nil, tolerance: 0.5, &block)
+  def train(x_train, y_train, epochs,
+            learning_rate_decay: 0,
+            save_dir: nil,
+            save_interval: 1,
+            test: nil,
+            border: nil,
+            tolerance: 0.5,
+            &block)
     num_train_data = x_train.is_a?(SFloat) ? x_train.shape[0] : x_train.length
-    (epoch * num_train_data / @batch_size).times do |count|
-      loss = learn(x_train, y_train, &block)
-      if loss.nan?
-        puts "loss is nan"
-        break
-      end
-      if (count + 1) % (num_train_data / @batch_size) == 0
-        now_epoch = (count + 1) / (num_train_data / @batch_size)
-        if save_dir && now_epoch % save_interval == 0
-          save("#{save_dir}/epoch#{now_epoch}.json")
-        end
-        msg = "epoch #{now_epoch}/#{epoch} loss: #{loss}"
-        if test
-          acc = accurate(*test, tolerance, &block)
-          puts "#{msg} accurate: #{acc}"
-          break if border && acc >= border
-        else
-          puts msg
+    (1..epochs).each do |epoch|
+      loss = nil
+      (num_train_data.to_f / @batch_size).ceil.times do
+        loss = learn(x_train, y_train, &block)
+        if loss.nan?
+          puts "loss is nan"
+          break
         end
       end
+      if save_dir && epoch % save_interval == 0
+        save("#{save_dir}/epoch#{epoch}.json")
+      end
+      msg = "epoch #{epoch}/#{epochs} loss: #{loss}"
+      if test
+        acc = accurate(*test, tolerance, &block)
+        puts "#{msg} accurate: #{acc}"
+        break if border && acc >= border
+      else
+        puts msg
+      end
+      @learning_rate -= learning_rate_decay
+      @learning_rate = 1e-7 if @learning_rate < 1e-7
     end
   end
 
@@ -99,7 +107,7 @@ class NN
   def accurate(x_test, y_test, tolerance = 0.5, &block)
     correct = 0
     num_test_data = x_test.is_a?(SFloat) ? x_test.shape[0] : x_test.length
-    (num_test_data / @batch_size).times do |i|
+    (num_test_data.to_f / @batch_size).ceil.times do |i|
       x = SFloat.zeros(@batch_size, @num_nodes.first)
       y = SFloat.zeros(@batch_size, @num_nodes.last)
       @batch_size.times do |j|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nn
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - unagiootoro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -69,7 +69,6 @@ files:
 - document.txt
 - lib/nn.rb
 - lib/nn/mnist.rb
-- lib/nn/version.rb
 - nn.gemspec
 homepage: https://github.com/unagiootoro/nn.git
 licenses:

data/lib/nn/version.rb

@@ -1,2 +0,0 @@
-require "nn"
-