rumale-ensemble 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f67ae6338e6907a02b66affa8ad12b22254da82d6a1fdfea092844f8809a51
-  data.tar.gz: 7b301905c59c580ace8f17edc4dd2b526af267493f60f74c294652f6e137fc12
+  metadata.gz: 8760a2022e71904e7a662c1348ec88cfc99a44adce603f6ea17851641206604d
+  data.tar.gz: 524cd4e6f552acc93373dd505fe03a728947d3f0b41e96a3479acd361ae009cf
 SHA512:
-  metadata.gz: 65391ee173334b7b2bc41761fe4a66dd8bd0c1158c948187b9059b78b80c9343393e3a42d52e6906e54388e7e3ce86340eb479a3c443130bdf004b1954570853
-  data.tar.gz: 7f78362e3a06aacc18f1a71a0c0340a5322fd8d78a2acd74ac7e4a8b4bfcd9396b84cfa0dc2a01ad1f872ff057b6847b7cd6c06d3bbab45f0fc9087035715d11
+  metadata.gz: 6e5b5d7544322cbfd5e461c316f585c18204d4728d2b67790a517cfba7a077b86c56ba54e17fc8c5c0a203fe4611ac7119d06d7f058c00c9bf828780f8b70462
+  data.tar.gz: cbd2504c15bc18c7c9641bddd52398e88b51c95692ea680ada8d524e31ec2cc8c2bcfd9593f6d37d811942e07537f8fa1dfbacb82fb3d7232f9300f34368642c

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/ensemble/ada_boost_classifier.rb

@@ -86,7 +86,7 @@ module Rumale
         @estimators = []
         @feature_importances = Numo::DFloat.zeros(n_features)
         @params[:max_features] = n_features unless @params[:max_features].is_a?(Integer)
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         @classes = Numo::Int32.asarray(y.to_a.uniq.sort)
         n_classes = @classes.shape[0]
         sub_rng = @rng.dup

data/lib/rumale/ensemble/ada_boost_regressor.rb

@@ -93,7 +93,7 @@ module Rumale
         # Initialize some variables.
         n_samples, n_features = x.shape
         @params[:max_features] = n_features unless @params[:max_features].is_a?(Integer)
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         observation_weights = Numo::DFloat.zeros(n_samples) + 1.fdiv(n_samples)
         @estimators = []
         @estimator_weights = []

data/lib/rumale/ensemble/extra_trees_classifier.rb

@@ -76,7 +76,7 @@ module Rumale
         # Initialize some variables.
         n_features = x.shape[1]
         @params[:max_features] = Math.sqrt(n_features).to_i if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         @classes = Numo::Int32.asarray(y.to_a.uniq.sort)
         sub_rng = @rng.dup
         # Construct trees.

data/lib/rumale/ensemble/extra_trees_regressor.rb

@@ -72,7 +72,7 @@ module Rumale
         # Initialize some variables.
         n_features = x.shape[1]
         @params[:max_features] = Math.sqrt(n_features).to_i if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         sub_rng = @rng.dup
         # Construct forest.
         rng_seeds = Array.new(@params[:n_estimators]) { sub_rng.rand(::Rumale::Ensemble::Value::SEED_BASE) }

data/lib/rumale/ensemble/gradient_boosting_classifier.rb

@@ -97,7 +97,7 @@ module Rumale
         # initialize some variables.
         n_features = x.shape[1]
         @params[:max_features] = n_features if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         @classes = Numo::Int32[*y.to_a.uniq.sort]
         n_classes = @classes.size
         # train estimator.
@@ -187,7 +187,7 @@ module Rumale
         # initialize some variables.
         estimators = []
         n_samples = x.shape[0]
-        n_sub_samples = [n_samples, [(n_samples * @params[:subsample]).to_i, 1].max].min
+        n_sub_samples = [n_samples, [(n_samples * @params[:subsample]).to_i, 1].max].min # rubocop:disable Style/ComparableClamp
         whole_ids = Array.new(n_samples) { |v| v }
         y_pred = Numo::DFloat.ones(n_samples) * init_pred
         sub_rng = @rng.dup

data/lib/rumale/ensemble/gradient_boosting_regressor.rb

@@ -88,7 +88,7 @@ module Rumale
         # initialize some variables.
         n_features = x.shape[1]
         @params[:max_features] = n_features if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         n_outputs = y.shape[1].nil? ? 1 : y.shape[1]
         # train regressor.
         @base_predictions = n_outputs > 1 ? y.mean(0) : y.mean
@@ -141,7 +141,7 @@ module Rumale
         # initialize some variables.
         estimators = []
         n_samples = x.shape[0]
-        n_sub_samples = [n_samples, [(n_samples * @params[:subsample]).to_i, 1].max].min
+        n_sub_samples = [n_samples, [(n_samples * @params[:subsample]).to_i, 1].max].min # rubocop:disable Style/ComparableClamp
         whole_ids = Array.new(n_samples) { |v| v }
         y_pred = Numo::DFloat.ones(n_samples) * init_pred
         sub_rng = @rng.dup

data/lib/rumale/ensemble/random_forest_classifier.rb

@@ -86,7 +86,7 @@ module Rumale
         # Initialize some variables.
         n_samples, n_features = x.shape
         @params[:max_features] = Math.sqrt(n_features).to_i if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         @classes = Numo::Int32.asarray(y.to_a.uniq.sort)
         sub_rng = @rng.dup
         rngs = Array.new(@params[:n_estimators]) { Random.new(sub_rng.rand(::Rumale::Ensemble::Value::SEED_BASE)) }

data/lib/rumale/ensemble/random_forest_regressor.rb

@@ -81,7 +81,7 @@ module Rumale
         # Initialize some variables.
         n_samples, n_features = x.shape
         @params[:max_features] = Math.sqrt(n_features).to_i if @params[:max_features].nil?
-        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min
+        @params[:max_features] = [[1, @params[:max_features]].max, n_features].min # rubocop:disable Style/ComparableClamp
         single_target = y.shape[1].nil?
         sub_rng = @rng.dup
         rngs = Array.new(@params[:n_estimators]) { Random.new(sub_rng.rand(::Rumale::Ensemble::Value::SEED_BASE)) }

data/lib/rumale/ensemble/stacking_classifier.rb

@@ -15,11 +15,11 @@ module Rumale
     #   require 'rumale/ensemble/stacking_classifier'
     #
     #   estimators = {
-    #     lgr: Rumale::LinearModel::LogisticRegression.new(reg_param: 1e-2, random_seed: 1),
+    #     lgr: Rumale::LinearModel::LogisticRegression.new(reg_param: 1e-2),
     #     mlp: Rumale::NeuralNetwork::MLPClassifier.new(hidden_units: [256], random_seed: 1),
     #     rnd: Rumale::Ensemble::RandomForestClassifier.new(random_seed: 1)
     #   }
-    #   meta_estimator = Rumale::LinearModel::LogisticRegression.new(random_seed: 1)
+    #   meta_estimator = Rumale::LinearModel::LogisticRegression.new
     #   classifier = Rumale::Ensemble::StackedClassifier.new(
     #     estimators: estimators, meta_estimator: meta_estimator, random_seed: 1
     #   )

data/lib/rumale/ensemble/stacking_regressor.rb

@@ -18,7 +18,7 @@ module Rumale
     #     mlp: Rumale::NeuralNetwork::MLPRegressor.new(hidden_units: [256], random_seed: 1),
     #     rnd: Rumale::Ensemble::RandomForestRegressor.new(random_seed: 1)
     #   }
-    #   meta_estimator = Rumale::LinearModel::Ridge.new(random_seed: 1)
+    #   meta_estimator = Rumale::LinearModel::Ridge.new
     #   regressor = Rumale::Ensemble::StackedRegressor.new(
     #     estimators: estimators, meta_estimator: meta_estimator, random_seed: 1
     #   )

data/lib/rumale/ensemble/version.rb

@@ -5,6 +5,6 @@ module Rumale
   # This module consists of the classes that implement ensemble-based methods.
   module Ensemble
     # @!visibility private
-    VERSION = '0.24.0'
+    VERSION = '0.26.0'
   end
 end

data/lib/rumale/ensemble/voting_classifier.rb

@@ -13,7 +13,7 @@ module Rumale
     #   require 'rumale/ensemble/voting_classifier'
     #
     #   estimators = {
-    #     lgr: Rumale::LinearModel::LogisticRegression.new(reg_param: 1e-2, random_seed: 1),
+    #     lgr: Rumale::LinearModel::LogisticRegression.new(reg_param: 1e-2),
     #     mlp: Rumale::NeuralNetwork::MLPClassifier.new(hidden_units: [256], random_seed: 1),
     #     rnd: Rumale::Ensemble::RandomForestClassifier.new(random_seed: 1)
     #   }

data/lib/rumale/ensemble/voting_regressor.rb

@@ -12,7 +12,7 @@ module Rumale
     #   require 'rumale/ensemble/voting_regressor'
     #
     #   estimators = {
-    #     rdg: Rumale::LinearModel::Ridge.new(reg_param: 1e-2, random_seed: 1),
+    #     rdg: Rumale::LinearModel::Ridge.new(reg_param: 0.1),
     #     mlp: Rumale::NeuralNetwork::MLPRegressor.new(hidden_units: [256], random_seed: 1),
     #     rnd: Rumale::Ensemble::RandomForestRegressor.new(random_seed: 1)
     #   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumale-ensemble
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rumale-linear_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rumale-model_selection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rumale-preprocessing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rumale-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 description: |
   Rumale::Ensemble provides ensemble learning algorithms,
   such as AdaBoost, Gradient Tree Boosting, and Random Forest,