rumale 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e459906ed25e84791a9d872e9536d633d9db2b
-  data.tar.gz: ea80195eeacbaf3ed7fccaf828e3e809baa862a7
+  metadata.gz: 8e895ca9462569e1ec2b3b9c1cb985aebd7d4b19
+  data.tar.gz: 9374969bd955cada6ba54ec6edf1d7bc174a5102
 SHA512:
-  metadata.gz: 639d266a1045d9ee1fbf37f770bf6171ff8afc5a8183441fbaf0283af7a17dc2e6e05ee44cb601c8b9ea301d5f46d914fc77601fd60345b904aff509f07e5277
-  data.tar.gz: 7010cbf3f11f0139a0dda334cfce4f3fd8ffe059eb776f93e7aba32f91c3f517c8fe4723975ef2036e9981131d741345bab4158ce8354431a8a8b57000dacc2f
+  metadata.gz: 7e9eadf3404e74ee887007a1fb1df4e2b933f10394c1a61afdd8400492afcc4fbb40479c453983d2349db5d5c7cd52ab280a9ef28aa26d91b19cb41253bdb233
+  data.tar.gz: 674bf164a3f1be2971fa2f882999ed34a22773d15674d6c2c24da66af888be855ffd3daa1d66a08ee7ec4bc99c87e864ffe61ebb7d6356dfae78a0a20e97c3a9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.4
+- Remove unused parameter on Nadam.
+- Fix condition to stop growing tree about decision tree.
+
 # 0.8.3
 - Add optimizer class for AdaGrad.
 - Add evaluator class for ROC AUC.

data/README.md

@@ -1,5 +1,7 @@
 # Rumale
 
+![Rumale](https://dl.dropboxusercontent.com/s/joxruk2720ur66o/rumale_header_400.png)
+
 [![Build Status](https://travis-ci.org/yoshoku/rumale.svg?branch=master)](https://travis-ci.org/yoshoku/rumale)
 [![Coverage Status](https://coveralls.io/repos/github/yoshoku/rumale/badge.svg?branch=master)](https://coveralls.io/github/yoshoku/rumale?branch=master)
 [![Gem Version](https://badge.fury.io/rb/rumale.svg)](https://badge.fury.io/rb/rumale)

data/lib/rumale/optimizer/nadam.rb

@@ -9,7 +9,7 @@ module Rumale
     # Nadam is a class that implements Nadam optimizer.
     #
     # @example
-    #   optimizer = Rumale::Optimizer::Nadam.new(learning_rate: 0.01, momentum: 0.9, decay1: 0.9, decay2: 0.999)
+    #   optimizer = Rumale::Optimizer::Nadam.new(learning_rate: 0.01, decay1: 0.9, decay2: 0.999)
     #   estimator = Rumale::LinearModel::LinearRegression.new(optimizer: optimizer, random_seed: 1)
     #   estimator.fit(samples, values)
     #
@@ -22,15 +22,13 @@ module Rumale
       # Create a new optimizer with Nadam
       #
       # @param learning_rate [Float] The initial value of learning rate.
-      # @param momentum [Float] The initial value of momentum.
       # @param decay1 [Float] The smoothing parameter for the first moment.
       # @param decay2 [Float] The smoothing parameter for the second moment.
-      def initialize(learning_rate: 0.01, momentum: 0.9, decay1: 0.9, decay2: 0.999)
-        check_params_float(learning_rate: learning_rate, momentum: momentum, decay1: decay1, decay2: decay2)
-        check_params_positive(learning_rate: learning_rate, momentum: momentum, decay1: decay1, decay2: decay2)
+      def initialize(learning_rate: 0.01, decay1: 0.9, decay2: 0.999)
+        check_params_float(learning_rate: learning_rate, decay1: decay1, decay2: decay2)
+        check_params_positive(learning_rate: learning_rate, decay1: decay1, decay2: decay2)
         @params = {}
         @params[:learning_rate] = learning_rate
-        @params[:momentum] = momentum
         @params[:decay1] = decay1
         @params[:decay2] = decay2
         @fst_moment = nil

data/lib/rumale/tree/base_decision_tree.rb

@@ -67,21 +67,25 @@ module Rumale
       end
 
       def grow_node(depth, x, y, whole_impurity)
+        # intialize node.
+        n_samples, n_features = x.shape
+        node = Node.new(depth: depth, impurity: whole_impurity, n_samples: n_samples)
+
+        # terminate growing.
         unless @params[:max_leaf_nodes].nil?
           return nil if @n_leaves >= @params[:max_leaf_nodes]
         end
 
-        n_samples, n_features = x.shape
-        return nil if n_samples <= @params[:min_samples_leaf]
-
-        node = Node.new(depth: depth, impurity: whole_impurity, n_samples: n_samples)
-
-        return put_leaf(node, y) if stop_growing?(y)
+        return nil if n_samples < @params[:min_samples_leaf]
+        return put_leaf(node, y) if n_samples == @params[:min_samples_leaf]
 
         unless @params[:max_depth].nil?
           return put_leaf(node, y) if depth == @params[:max_depth]
         end
 
+        return put_leaf(node, y) if stop_growing?(y)
+
+        # calculate optimal parameters.
         feature_id, threshold, left_ids, right_ids, left_impurity, right_impurity, gain =
           rand_ids(n_features).map { |f_id| [f_id, *best_split(x[true, f_id], y, whole_impurity)] }.max_by(&:last)
 

data/lib/rumale/tree/decision_tree_regressor.rb

@@ -111,7 +111,7 @@ module Rumale
       private
 
       def stop_growing?(y)
-        (y - y.mean(0)).sum.abs.zero?
+        y.to_a.uniq.size == 1
       end
 
       def put_leaf(node, y)

data/lib/rumale/version.rb

@@ -3,5 +3,5 @@
 # Rumale is a machine learning library in Ruby.
 module Rumale
   # The version of Rumale you are using.
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumale
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray