rumale-linear_model 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7999fbdb27dc6ed43710083da0cecf2336bfb08277fa4240be7b56c2603c9f
-  data.tar.gz: 6bc61b3d80fe71c1d7ed806c810a0eb454244033506ab2078ccd0987e7891455
+  metadata.gz: 68480352c1ab25d2242da8364a3377ee6ef0a1241c3299b5ffda0d3b699e81be
+  data.tar.gz: c02626de09115b2ce65dd6d4174d89fe1854a8385c33fa0c942822ba6d0a4c54
 SHA512:
-  metadata.gz: 4c73e2b03dfb0f14c94b880769103bbb05f77de7ac08f8b9af2dddc0ab6bcada758c0c7c51353a79e052e051999b4afc7610012caf4dbb7c4edc505152fdf1d6
-  data.tar.gz: 91ce194539b8abc95fb3ec7335bd4843aea126774ebb566eb9953955f775427afd032f9d02894c8507337d20f03baafa39903eb9dd9f9157ccf6a8d22028fe8b
+  metadata.gz: 23ed6fe1871d0fc6e8f10e32076257624683954f6f13fbd164289297ca845eaceb9829ae64e5a2af66b119bfa9a13cc3d609a767d9e97fc39ec88a59fcceaa7f
+  data.tar.gz: ab43f09a3fcecbe7b8c82a29f33380d363a4bfa056392f83cca931a4d839805250ad05640b0f1219cd78b72e824c6303427b62c02a362a26d08a1c0f9b220bfe

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Atsushi Tatsuma
+Copyright (c) 2022-2023 Atsushi Tatsuma
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/rumale/linear_model/base_estimator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rumale/base/estimator'
+
+module Rumale
+  # This module consists of the classes that implement generalized linear models.
+  module LinearModel
+    # BaseEstimator is an abstract class for implementation of linear model. This class is used internally.
+    class BaseEstimator < Rumale::Base::Estimator
+      # Return the weight vector.
+      # @return [Numo::DFloat] (shape: [n_outputs/n_classes, n_features])
+      attr_reader :weight_vec
+
+      # Return the bias term (a.k.a. intercept).
+      # @return [Numo::DFloat] (shape: [n_outputs/n_classes])
+      attr_reader :bias_term
+
+      # Create an initial linear model.
+
+      private
+
+      def expand_feature(x)
+        n_samples = x.shape[0]
+        Numo::NArray.hstack([x, Numo::DFloat.ones([n_samples, 1]) * @params[:bias_scale]])
+      end
+
+      def split_weight(w)
+        if w.ndim == 1
+          if fit_bias?
+            [w[0...-1].dup, w[-1]]
+          else
+            [w, 0.0]
+          end
+        elsif fit_bias?
+          [w[true, 0...-1].dup, w[true, -1].dup]
+        else
+          [w, Numo::DFloat.zeros(w.shape[0])]
+        end
+      end
+
+      def fit_bias?
+        @params[:fit_bias] == true
+      end
+    end
+  end
+end

data/lib/rumale/linear_model/elastic_net.rb

@@ -1,48 +1,34 @@
 # frozen_string_literal: true
 
 require 'rumale/base/regressor'
+require 'rumale/utils'
 require 'rumale/validation'
-require 'rumale/linear_model/base_sgd'
+
+require_relative 'base_estimator'
 
 module Rumale
   module LinearModel
-    # ElasticNet is a class that implements Elastic-net Regression
-    # with stochastic gradient descent (SGD) optimization.
+    # ElasticNet is a class that implements Elastic-net Regression with cordinate descent optimization.
     #
     # @example
     #   require 'rumale/linear_model/elastic_net'
     #
-    #   estimator =
-    #     Rumale::LinearModel::ElasticNet.new(reg_param: 0.1, l1_ratio: 0.5, max_iter: 1000, batch_size: 50, random_seed: 1)
+    #   estimator = Rumale::LinearModel::ElasticNet.new(reg_param: 0.1, l1_ratio: 0.5)
     #   estimator.fit(training_samples, traininig_values)
     #   results = estimator.predict(testing_samples)
     #
     # *Reference*
-    # - Shalev-Shwartz, S., and Singer, Y., "Pegasos: Primal Estimated sub-GrAdient SOlver for SVM," Proc. ICML'07, pp. 807--814, 2007.
-    # - Tsuruoka, Y., Tsujii, J., and Ananiadou, S., "Stochastic Gradient Descent Training for L1-regularized Log-linear Models with Cumulative Penalty," Proc. ACL'09, pp. 477--485, 2009.
-    # - Bottou, L., "Large-Scale Machine Learning with Stochastic Gradient Descent," Proc. COMPSTAT'10, pp. 177--186, 2010.
-    class ElasticNet < BaseSGD
-      include ::Rumale::Base::Regressor
-
-      # Return the weight vector.
-      # @return [Numo::DFloat] (shape: [n_outputs, n_features])
-      attr_reader :weight_vec
-
-      # Return the bias term (a.k.a. intercept).
-      # @return [Numo::DFloat] (shape: [n_outputs])
-      attr_reader :bias_term
+    # - Friedman, J., Hastie, T., and Tibshirani, R., "Regularization Paths for Generalized Linear Models via Coordinate Descent," Journal of Statistical Software, 33 (1), pp. 1--22, 2010.
+    # - Simon, N., Friedman, J., and Hastie, T., "A Blockwise Descent Algorithm for Group-penalized Multiresponse and Multinomial Regression," arXiv preprint arXiv:1311.6529, 2013.
+    class ElasticNet < Rumale::LinearModel::BaseEstimator
+      include Rumale::Base::Regressor
 
-      # Return the random generator for random sampling.
-      # @return [Random]
-      attr_reader :rng
+      # Return the number of iterations performed in coordinate descent optimization.
+      # @return [Integer]
+      attr_reader :n_iter
 
       # Create a new Elastic-net regressor.
       #
-      # @param learning_rate [Float] The initial value of learning rate.
-      #   The learning rate decreases as the iteration proceeds according to the equation: learning_rate / (1 + decay * t).
-      # @param decay [Float] The smoothing parameter for decreasing learning rate as the iteration proceeds.
-      #   If nil is given, the decay sets to 'reg_param * learning_rate'.
-      # @param momentum [Float] The momentum factor.
       # @param reg_param [Float] The regularization parameter.
       # @param l1_ratio [Float] The elastic-net mixing parameter.
       #   If l1_ratio = 1, the regularization is similar to Lasso.
@@ -52,25 +38,17 @@ module Rumale
       # @param bias_scale [Float] The scale of the bias term.
       # @param max_iter [Integer] The maximum number of epochs that indicates
       #   how many times the whole data is given to the training process.
-      # @param batch_size [Integer] The size of the mini batches.
       # @param tol [Float] The tolerance of loss for terminating optimization.
-      # @param n_jobs [Integer] The number of jobs for running the fit method in parallel.
-      #   If nil is given, the method does not execute in parallel.
-      #   If zero or less is given, it becomes equal to the number of processors.
-      #   This parameter is ignored if the Parallel gem is not loaded.
-      # @param verbose [Boolean] The flag indicating whether to output loss during iteration.
-      # @param random_seed [Integer] The seed value using to initialize the random generator.
-      def initialize(learning_rate: 0.01, decay: nil, momentum: 0.9,
-                     reg_param: 1.0, l1_ratio: 0.5, fit_bias: true, bias_scale: 1.0,
-                     max_iter: 1000, batch_size: 50, tol: 1e-4,
-                     n_jobs: nil, verbose: false, random_seed: nil)
+      def initialize(reg_param: 1.0, l1_ratio: 0.5, fit_bias: true, bias_scale: 1.0, max_iter: 1000, tol: 1e-4)
         super()
-        @params.merge!(method(:initialize).parameters.to_h { |_t, arg| [arg, binding.local_variable_get(arg)] })
-        @params[:decay] ||= @params[:reg_param] * @params[:learning_rate]
-        @params[:random_seed] ||= srand
-        @rng = Random.new(@params[:random_seed])
-        @penalty_type = ELASTICNET_PENALTY
-        @loss_func = ::Rumale::LinearModel::Loss::MeanSquaredError.new
+        @params = {
+          reg_param: reg_param,
+          l1_ratio: l1_ratio,
+          fit_bias: fit_bias,
+          bias_scale: bias_scale,
+          max_iter: max_iter,
+          tol: tol
+        }
       end
 
       # Fit the model with given training data.
@@ -79,25 +57,19 @@ module Rumale
       # @param y [Numo::DFloat] (shape: [n_samples, n_outputs]) The target values to be used for fitting the model.
       # @return [ElasticNet] The learned regressor itself.
       def fit(x, y)
-        x = ::Rumale::Validation.check_convert_sample_array(x)
-        y = ::Rumale::Validation.check_convert_target_value_array(y)
-        ::Rumale::Validation.check_sample_size(x, y)
+        x = Rumale::Validation.check_convert_sample_array(x)
+        y = Rumale::Validation.check_convert_target_value_array(y)
+        Rumale::Validation.check_sample_size(x, y)
 
-        n_outputs = y.shape[1].nil? ? 1 : y.shape[1]
-        n_features = x.shape[1]
+        @n_iter = 0
+        x = expand_feature(x) if fit_bias?
+
+        @weight_vec, @bias_term = if single_target?(y)
+                                    partial_fit(x, y)
+                                  else
+                                    partial_fit_multi(x, y)
+                                  end
 
-        if n_outputs > 1
-          @weight_vec = Numo::DFloat.zeros(n_outputs, n_features)
-          @bias_term = Numo::DFloat.zeros(n_outputs)
-          if enable_parallel?
-            models = parallel_map(n_outputs) { |n| partial_fit(x, y[true, n]) }
-            n_outputs.times { |n| @weight_vec[n, true], @bias_term[n] = models[n] }
-          else
-            n_outputs.times { |n| @weight_vec[n, true], @bias_term[n] = partial_fit(x, y[true, n]) }
-          end
-        else
-          @weight_vec, @bias_term = partial_fit(x, y)
-        end
         self
       end
 
@@ -106,10 +78,89 @@ module Rumale
       # @param x [Numo::DFloat] (shape: [n_samples, n_features]) The samples to predict the values.
       # @return [Numo::DFloat] (shape: [n_samples, n_outputs]) Predicted values per sample.
       def predict(x)
-        x = ::Rumale::Validation.check_convert_sample_array(x)
+        x = Rumale::Validation.check_convert_sample_array(x)
 
         x.dot(@weight_vec.transpose) + @bias_term
       end
+
+      private
+
+      def partial_fit(x, y)
+        l1_reg = @params[:reg_param] * @params[:l1_ratio]
+        l2_reg = @params[:reg_param] * (1.0 - @params[:l1_ratio])
+        n_features = x.shape[1]
+        w = Numo::DFloat.zeros(n_features)
+        x_norms = (x**2).sum(axis: 0)
+        residual = y - x.dot(w)
+
+        @params[:max_iter].times do |iter|
+          w_err = 0.0
+          n_features.times do |j|
+            next if x_norms[j].zero?
+
+            w_prev = w[j]
+
+            residual += w[j] * x[true, j]
+            z = x[true, j].dot(residual)
+            w[j] = soft_threshold(z, l1_reg).fdiv(x_norms[j] + l2_reg)
+            residual -= w[j] * x[true, j]
+
+            w_err = [w_err, (w[j] - w_prev).abs].max
+          end
+
+          @n_iter = iter + 1
+
+          break if w_err <= @params[:tol]
+        end
+
+        split_weight(w)
+      end
+
+      def partial_fit_multi(x, y)
+        l1_reg = @params[:reg_param] * @params[:l1_ratio]
+        l2_reg = @params[:reg_param] * (1.0 - @params[:l1_ratio])
+        n_features = x.shape[1]
+        n_outputs = y.shape[1]
+        w = Numo::DFloat.zeros(n_outputs, n_features)
+        x_norms = (x**2).sum(axis: 0)
+        residual = y - x.dot(w.transpose)
+
+        @params[:max_iter].times do |iter|
+          w_err = 0.0
+          n_features.times do |j|
+            next if x_norms[j].zero?
+
+            w_prev = w[true, j]
+
+            residual += x[true, j].expand_dims(1) * w[true, j]
+            z = x[true, j].dot(residual)
+            w[true, j] = [1.0 - l1_reg.fdiv(Math.sqrt((z**2).sum)), 0.0].max.fdiv(x_norms[j] + l2_reg) * z
+            residual -= x[true, j].expand_dims(1) * w[true, j]
+
+            w_err = [w_err, (w[true, j] - w_prev).abs.max].max
+          end
+
+          @n_iter = iter + 1
+
+          break if w_err <= @params[:tol]
+        end
+
+        split_weight(w)
+      end
+
+      def soft_threshold(z, threshold)
+        sign(z) * [z.abs - threshold, 0].max
+      end
+
+      def sign(z)
+        return 0.0 if z.zero?
+
+        z.positive? ? 1.0 : -1.0
+      end
+
+      def single_target?(y)
+        y.ndim == 1
+      end
     end
   end
 end

data/lib/rumale/linear_model/lasso.rb

@@ -1,72 +1,49 @@
 # frozen_string_literal: true
 
+require 'rumale/base/estimator'
 require 'rumale/base/regressor'
 require 'rumale/validation'
-require 'rumale/linear_model/base_sgd'
+
+require_relative 'base_estimator'
 
 module Rumale
   module LinearModel
-    # Lasso is a class that implements Lasso Regression
-    # with stochastic gradient descent (SGD) optimization.
+    # Lasso is a class that implements Lasso Regression with coordinate descent optimization.
     #
     # @example
     #   require 'rumale/linear_model/lasso'
     #
-    #   estimator =
-    #     Rumale::LinearModel::Lasso.new(reg_param: 0.1, max_iter: 1000, batch_size: 20, random_seed: 1)
+    #   estimator = Rumale::LinearModel::Lasso.new(reg_param: 0.1)
     #   estimator.fit(training_samples, traininig_values)
     #   results = estimator.predict(testing_samples)
     #
     # *Reference*
-    # - Shalev-Shwartz, S., and Singer, Y., "Pegasos: Primal Estimated sub-GrAdient SOlver for SVM," Proc. ICML'07, pp. 807--814, 2007.
-    # - Tsuruoka, Y., Tsujii, J., and Ananiadou, S., "Stochastic Gradient Descent Training for L1-regularized Log-linear Models with Cumulative Penalty," Proc. ACL'09, pp. 477--485, 2009.
-    # - Bottou, L., "Large-Scale Machine Learning with Stochastic Gradient Descent," Proc. COMPSTAT'10, pp. 177--186, 2010.
-    class Lasso < BaseSGD
-      include ::Rumale::Base::Regressor
-
-      # Return the weight vector.
-      # @return [Numo::DFloat] (shape: [n_outputs, n_features])
-      attr_reader :weight_vec
-
-      # Return the bias term (a.k.a. intercept).
-      # @return [Numo::DFloat] (shape: [n_outputs])
-      attr_reader :bias_term
+    # - Friedman, J., Hastie, T., and Tibshirani, R., "Regularization Paths for Generalized Linear Models via Coordinate Descent," Journal of Statistical Software, 33 (1), pp. 1--22, 2010.
+    # - Simon, N., Friedman, J., and Hastie, T., "A Blockwise Descent Algorithm for Group-penalized Multiresponse and Multinomial Regression," arXiv preprint arXiv:1311.6529, 2013.
+    class Lasso < Rumale::LinearModel::BaseEstimator
+      include Rumale::Base::Regressor
 
-      # Return the random generator for random sampling.
-      # @return [Random]
-      attr_reader :rng
+      # Return the number of iterations performed in coordinate descent optimization.
+      # @return [Integer]
+      attr_reader :n_iter
 
       # Create a new Lasso regressor.
       #
-      # @param learning_rate [Float] The initial value of learning rate.
-      #   The learning rate decreases as the iteration proceeds according to the equation: learning_rate / (1 + decay * t).
-      # @param decay [Float] The smoothing parameter for decreasing learning rate as the iteration proceeds.
-      #   If nil is given, the decay sets to 'reg_param * learning_rate'.
-      # @param momentum [Float] The momentum factor.
       # @param reg_param [Float] The regularization parameter.
       # @param fit_bias [Boolean] The flag indicating whether to fit the bias term.
       # @param bias_scale [Float] The scale of the bias term.
       # @param max_iter [Integer] The maximum number of epochs that indicates
       #   how many times the whole data is given to the training process.
-      # @param batch_size [Integer] The size of the mini batches.
       # @param tol [Float] The tolerance of loss for terminating optimization.
-      # @param n_jobs [Integer] The number of jobs for running the fit method in parallel.
-      #   If nil is given, the method does not execute in parallel.
-      #   If zero or less is given, it becomes equal to the number of processors.
-      #   This parameter is ignored if the Parallel gem is not loaded.
-      # @param verbose [Boolean] The flag indicating whether to output loss during iteration.
-      # @param random_seed [Integer] The seed value using to initialize the random generator.
-      def initialize(learning_rate: 0.01, decay: nil, momentum: 0.9,
-                     reg_param: 1.0, fit_bias: true, bias_scale: 1.0,
-                     max_iter: 1000, batch_size: 50, tol: 1e-4,
-                     n_jobs: nil, verbose: false, random_seed: nil)
+      def initialize(reg_param: 1.0, fit_bias: true, bias_scale: 1.0, max_iter: 1000, tol: 1e-4)
         super()
-        @params.merge!(method(:initialize).parameters.to_h { |_t, arg| [arg, binding.local_variable_get(arg)] })
-        @params[:decay] ||= @params[:reg_param] * @params[:learning_rate]
-        @params[:random_seed] ||= srand
-        @rng = Random.new(@params[:random_seed])
-        @penalty_type = L1_PENALTY
-        @loss_func = ::Rumale::LinearModel::Loss::MeanSquaredError.new
+        @params = {
+          reg_param: reg_param,
+          fit_bias: fit_bias,
+          bias_scale: bias_scale,
+          max_iter: max_iter,
+          tol: tol
+        }
       end
 
       # Fit the model with given training data.
@@ -75,25 +52,19 @@ module Rumale
       # @param y [Numo::DFloat] (shape: [n_samples, n_outputs]) The target values to be used for fitting the model.
       # @return [Lasso] The learned regressor itself.
       def fit(x, y)
-        x = ::Rumale::Validation.check_convert_sample_array(x)
-        y = ::Rumale::Validation.check_convert_target_value_array(y)
-        ::Rumale::Validation.check_sample_size(x, y)
+        x = Rumale::Validation.check_convert_sample_array(x)
+        y = Rumale::Validation.check_convert_target_value_array(y)
+        Rumale::Validation.check_sample_size(x, y)
 
-        n_outputs = y.shape[1].nil? ? 1 : y.shape[1]
-        n_features = x.shape[1]
+        @n_iter = 0
+        x = expand_feature(x) if fit_bias?
+
+        @weight_vec, @bias_term = if single_target?(y)
+                                    partial_fit(x, y)
+                                  else
+                                    partial_fit_multi(x, y)
+                                  end
 
-        if n_outputs > 1
-          @weight_vec = Numo::DFloat.zeros(n_outputs, n_features)
-          @bias_term = Numo::DFloat.zeros(n_outputs)
-          if enable_parallel?
-            models = parallel_map(n_outputs) { |n| partial_fit(x, y[true, n]) }
-            n_outputs.times { |n| @weight_vec[n, true], @bias_term[n] = models[n] }
-          else
-            n_outputs.times { |n| @weight_vec[n, true], @bias_term[n] = partial_fit(x, y[true, n]) }
-          end
-        else
-          @weight_vec, @bias_term = partial_fit(x, y)
-        end
         self
       end
 
@@ -102,10 +73,85 @@ module Rumale
       # @param x [Numo::DFloat] (shape: [n_samples, n_features]) The samples to predict the values.
       # @return [Numo::DFloat] (shape: [n_samples, n_outputs]) Predicted values per sample.
       def predict(x)
-        x = ::Rumale::Validation.check_convert_sample_array(x)
+        x = Rumale::Validation.check_convert_sample_array(x)
 
         x.dot(@weight_vec.transpose) + @bias_term
       end
+
+      private
+
+      def partial_fit(x, y)
+        n_features = x.shape[1]
+        w = Numo::DFloat.zeros(n_features)
+        x_norms = (x**2).sum(axis: 0)
+        residual = y - x.dot(w)
+
+        @params[:max_iter].times do |iter|
+          w_err = 0.0
+          n_features.times do |j|
+            next if x_norms[j].zero?
+
+            w_prev = w[j]
+
+            residual += w[j] * x[true, j]
+            z = x[true, j].dot(residual)
+            w[j] = soft_threshold(z, @params[:reg_param]).fdiv(x_norms[j])
+            residual -= w[j] * x[true, j]
+
+            w_err = [w_err, (w[j] - w_prev).abs].max
+          end
+
+          @n_iter = iter + 1
+
+          break if w_err <= @params[:tol]
+        end
+
+        split_weight(w)
+      end
+
+      def partial_fit_multi(x, y)
+        n_features = x.shape[1]
+        n_outputs = y.shape[1]
+        w = Numo::DFloat.zeros(n_outputs, n_features)
+        x_norms = (x**2).sum(axis: 0)
+        residual = y - x.dot(w.transpose)
+
+        @params[:max_iter].times do |iter|
+          w_err = 0.0
+          n_features.times do |j|
+            next if x_norms[j].zero?
+
+            w_prev = w[true, j]
+
+            residual += x[true, j].expand_dims(1) * w[true, j]
+            z = x[true, j].dot(residual)
+            w[true, j] = [1.0 - @params[:reg_param].fdiv(Math.sqrt((z**2).sum)), 0.0].max.fdiv(x_norms[j]) * z
+            residual -= x[true, j].expand_dims(1) * w[true, j]
+
+            w_err = [w_err, (w[true, j] - w_prev).abs.max].max
+          end
+
+          @n_iter = iter + 1
+
+          break if w_err <= @params[:tol]
+        end
+
+        split_weight(w)
+      end
+
+      def soft_threshold(z, threshold)
+        sign(z) * [z.abs - threshold, 0].max
+      end
+
+      def sign(z)
+        return 0.0 if z.zero?
+
+        z.positive? ? 1.0 : -1.0
+      end
+
+      def single_target?(y)
+        y.ndim == 1
+      end
     end
   end
 end