mopti 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e81da580fe5dd2be2958e34bee75fe5c82bb29240edf43bb7d01c89522f863
-  data.tar.gz: 43648573d898ae4fdbce70ce84b6f6dbcfd5109ea95eb743e9fb51fc2101251b
+  metadata.gz: 00c061fd0bbe6751f39dbc139de732990c02915c650b5c25cafb1469162372b3
+  data.tar.gz: c8df3190b009acc36393615791e0baa1045ccc026f3c3c61444b0f96f4afe7ac
 SHA512:
-  metadata.gz: 2de393870f138bfeba855c7d1c95d8263e85a30e0e9fb4a3a65ae6614784531865b32cafc0761ab856331dc66b9f19df4a00c8bfff3ff69eb07a9b850902c718
-  data.tar.gz: a71eead28cac1eb28e4b3154fabd846d11468ae803f5e7cbe5e4cb04faed18d1a468793131e465b282504b71bde2ae03db114fa245f08a8b9d0be99b3f3cbfcf
+  metadata.gz: 5d27e97704610889a028b98541a282292cdea04313b37346af32ecc6732c5d947ee169f558679ab1048f5d4176b34c25d3f0aa7f497c9a0e212252b16863920c
+  data.tar.gz: 14808c545bba9ce60ee1fd0825391ef7cd280fe1a6a4d2afd7de02be101faaa45a7a457d487ff47597e9350e5cb6daef80a6c80330889678f700d14e90a85eea

data/.github/workflows/build.yml

@@ -6,16 +6,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Build and test with Rake
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,13 +1,24 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
 AllCops:
   NewCops: enable
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Exclude:
+    - 'ext/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+    - 'Steepfile'
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
 
 Layout/LineLength:
   Max: 145
-  IgnoredPatterns: ['(\A|\s)#']
+  AllowedPatterns: ['(\A|\s)#']
 
 Metrics/ModuleLength:
   Max: 200
@@ -37,3 +48,9 @@ Metrics/ParameterLists:
 
 Naming/MethodParameterName:
   Enabled: false
+
+Style/SlicingWithRange:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 12

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.2.3
+- Refactor codes and configs with RuboCop.
+
+# 0.2.2
+- Remove dependent gem's type declaration file from installation files.
+
+# 0.2.1
+- Fix version specifier of runtime dependencies.
+
 # 0.2.0
 - Add type declaration files.
 - Refactor some codes with type check.

data/Gemfile

@@ -1,9 +1,15 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mopti.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-gem "rbs", "~> 1.2"
-gem "steep", "~> 0.44"
+gem 'rake', '~> 12.0'
+gem 'rbs', '~> 1.2'
+gem 'rspec', '~> 3.0'
+gem 'rubocop', '~> 1.33'
+gem 'rubocop-performance', '~> 1.14'
+gem 'rubocop-rake', '~> 0.6.0'
+gem 'rubocop-rspec', '~> 2.12'
+gem 'steep', '~> 0.44'

data/LICENSE.txt

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

data/README.md

@@ -3,7 +3,7 @@
 ![Ruby](https://github.com/yoshoku/mopti/workflows/Ruby/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/mopti.svg)](https://badge.fury.io/rb/mopti)
 [![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/mopti/blob/main/LICENSE.txt)
-[![Documentation](http://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/mopti/doc/)
+[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/mopti/doc/)
 
 Mopti is a multivariate optimization library in Ruby.
 Mopti supports Nelder-Mead simplex method and Scaled Conjugate Gradient.

data/Rakefile

@@ -1,6 +1,12 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
+task default: %i[rubocop spec]

data/Steepfile

@@ -1,5 +1,5 @@
 target :lib do
-  signature "sig"
+  signature "sig", "sig-deps"
 
   check "lib"                       # Directory name
 #   check "Gemfile"                   # File name

data/lib/mopti/nelder_mead.rb

@@ -61,7 +61,7 @@ module Mopti
 
       x = @x_init.dup
       n = x.size
-      max_iter = @max_iter || 200 * n
+      max_iter = @max_iter || (200 * n)
 
       alpha = 1.0
       beta = n > 1 ? 1 + 2.fdiv(n) : 2.0
@@ -90,13 +90,13 @@ module Mopti
         break if ((sim[1..-1, true] - sim[0, true]).abs.flatten.max <= @xtol) && ((fsim[0] - fsim[1..-1]).abs.max <= @ftol)
 
         xbar = sim[0...-1, true].sum(0) / n
-        xr = xbar + alpha * (xbar - sim[-1, true])
+        xr = xbar + (alpha * (xbar - sim[-1, true]))
         fr = func(xr, @args)
         n_fev += 1
 
         shrink = true
         if fr < fsim[0]
-          xe = xbar + beta * (xr - xbar)
+          xe = xbar + (beta * (xr - xbar))
           fe = func(xe, @args)
           n_fev += 1
           shrink = false
@@ -112,7 +112,7 @@ module Mopti
           sim[-1, true] = xr
           fsim[-1] = fr
         elsif fr < fsim[-1]
-          xoc = xbar + gamma * (xr - xbar)
+          xoc = xbar + (gamma * (xr - xbar))
           foc = func(xoc, @args)
           n_fev += 1
           if foc <= fr
@@ -121,7 +121,7 @@ module Mopti
             fsim[-1] = foc
           end
         else
-          xic = xbar - gamma * (xr - xbar)
+          xic = xbar - (gamma * (xr - xbar))
           fic = func(xic, @args)
           n_fev += 1
           if fic < fsim[-1]
@@ -133,7 +133,7 @@ module Mopti
 
         if shrink
           (1..n).to_a.each do |j|
-            sim[j, true] = sim[0, true] + delta * (sim[j, true] - sim[0, true])
+            sim[j, true] = sim[0, true] + (delta * (sim[j, true] - sim[0, true]))
             fsim[j] = func(sim[j, true], @args)
             n_fev += 1
           end

data/lib/mopti/scaled_conjugate_gradient.rb

@@ -108,13 +108,13 @@ module Mopti
           break if kappa < 1e-16
 
           sigma = SIGMA_INIT / Math.sqrt(kappa)
-          x_plus = x + sigma * d
+          x_plus = x + (sigma * d)
           j_plus = jacb(x_plus, @args)
           n_jev += 1
           theta = d.dot(j_plus - j_next) / sigma
         end
 
-        delta = theta + beta * kappa
+        delta = theta + (beta * kappa)
         if delta <= 0
           delta = beta * kappa
           # TODO: Investigate the cause of the type error.
@@ -124,7 +124,7 @@ module Mopti
         end
         alpha = -mu / delta
 
-        x_next = x + alpha * d
+        x_next = x + (alpha * d)
         f_next = func(x_next, @args)
         n_fev += 1
 
@@ -165,7 +165,7 @@ module Mopti
           n_successes = 0
         elsif success
           gamma = (j_prev - j_next).dot(j_next) / mu
-          d = -j_next + gamma * d
+          d = -j_next + (gamma * d)
         end
       end
     end

data/lib/mopti/version.rb

@@ -2,5 +2,5 @@
 
 module Mopti
   # The version of Mopti you are using.
-  VERSION = '0.2.0'
+  VERSION = '0.2.3'
 end

data/mopti.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/mopti/version'
 
 Gem::Specification.new do |spec|
@@ -18,15 +20,16 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/yoshoku/mopti'
   spec.metadata['changelog_uri'] = 'https://github.com/yoshoku/mopti/blob/master/CHANGELOG.md'
   spec.metadata['documentation_url'] = 'https://yoshoku.github.io/mopti/doc/'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sig-deps)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
+  spec.add_runtime_dependency 'numo-narray', '>= 0.9.1'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mopti
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - yoshoku
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 description: |
@@ -52,7 +52,6 @@ files:
 - sig/mopti.rbs
 - sig/mopti/nelder_mead.rbs
 - sig/mopti/scaled_conjugate_gradient.rbs
-- sig/patch.rbs
 homepage: https://github.com/yoshoku/mopti
 licenses:
 - BSD-3-Clause
@@ -61,7 +60,8 @@ metadata:
   source_code_uri: https://github.com/yoshoku/mopti
   changelog_uri: https://github.com/yoshoku/mopti/blob/master/CHANGELOG.md
   documentation_url: https://yoshoku.github.io/mopti/doc/
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Multivariate Optimization Library in Ruby.
 test_files: []

data/sig/patch.rbs

@@ -1,20 +0,0 @@
-module Numo
-  class NArray
-    def self.zeros: (*untyped) -> untyped
-    def dot: (untyped b) -> untyped
-    def empty?: () -> bool
-    def ndim: () -> Integer
-    def shape: () -> Array[Integer]
-    def swapaxes: (Integer, Integer) -> untyped
-  end
-
-  class DFloat < NArray
-    def -@: () -> untyped
-    def +: (untyped) -> untyped
-    def -: (untyped) -> untyped
-    def *: (untyped) -> untyped
-    def /: (untyped) -> untyped
-    def []: (*untyped) -> untyped
-    def []=: (*untyped) -> untyped
-  end
-end