svmkit 0.1.3 → 0.2.0

data/lib/svmkit/preprocessing/standard_scaler.rb

@@ -15,17 +15,16 @@ module SVMKit
       include Base::Transformer
 
       # Return the vector consists of the mean value for each feature.
-      # @return [NMatrix] (shape: [1, n_features])
+      # @return [Numo::DFloat] (shape: [n_features])
       attr_reader :mean_vec
 
       # Return the vector consists of the standard deviation for each feature.
-      # @return [NMatrix] (shape: [1, n_features])
+      # @return [Numo::DFloat] (shape: [n_features])
       attr_reader :std_vec
 
       # Create a new normalizer for centering and scaling to unit variance.
-      #
-      # @overload new() -> StandardScaler
-      def initialize(_params = {})
+      def initialize()
+        self.params = {}
         @mean_vec = nil
         @std_vec = nil
       end
@@ -34,47 +33,47 @@ module SVMKit
       #
       # @overload fit(x) -> StandardScaler
       #
-      # @param x [NMatrix] (shape: [n_samples, n_features])
+      # @param x [Numo::DFloat] (shape: [n_samples, n_features])
       #   The samples to calculate the mean values and standard deviations.
       # @return [StandardScaler]
       def fit(x, _y = nil)
         @mean_vec = x.mean(0)
-        @std_vec = x.std(0)
+        @std_vec = x.stddev(0)
         self
       end
 
       # Calculate the mean values and standard deviations, and then normalize samples using them.
       #
-      # @overload fit_transform(x) -> NMatrix
+      # @overload fit_transform(x) -> Numo::DFloat
       #
-      # @param x [NMatrix] (shape: [n_samples, n_features])
+      # @param x [Numo::DFloat] (shape: [n_samples, n_features])
       #   The samples to calculate the mean values and standard deviations.
-      # @return [NMatrix] The scaled samples.
+      # @return [Numo::DFloat] The scaled samples.
       def fit_transform(x, _y = nil)
         fit(x).transform(x)
       end
 
       # Perform standardization the given samples.
       #
-      # @param x [NMatrix] (shape: [n_samples, n_features]) The samples to be scaled.
-      # @return [NMatrix] The scaled samples.
+      # @param x [Numo::DFloat] (shape: [n_samples, n_features]) The samples to be scaled.
+      # @return [Numo::DFloat] The scaled samples.
       def transform(x)
         n_samples, = x.shape
-        (x - @mean_vec.repeat(n_samples, 0)) / @std_vec.repeat(n_samples, 0)
+        (x - @mean_vec.tile(n_samples, 1)) / @std_vec.tile(n_samples, 1)
       end
 
       # Dump marshal data.
       # @return [Hash] The marshal data about StandardScaler.
       def marshal_dump
-        { mean_vec: Utils.dump_nmatrix(@mean_vec),
-          std_vec: Utils.dump_nmatrix(@std_vec) }
+        { mean_vec: @mean_vec,
+          std_vec: @std_vec }
       end
 
       # Load marshal data.
       # @return [nil]
       def marshal_load(obj)
-        @mean_vec = Utils.restore_nmatrix(obj[:mean_vec])
-        @std_vec = Utils.restore_nmatrix(obj[:std_vec])
+        @mean_vec = obj[:mean_vec]
+        @std_vec = obj[:std_vec]
         nil
       end
     end

data/lib/svmkit/version.rb

@@ -1,5 +1,5 @@
 # SVMKit is an experimental library of machine learning in Ruby.
 module SVMKit
   # @!visibility private
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/svmkit.gemspec

@@ -1,7 +1,6 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
 require 'svmkit/version'
 
 SVMKit::DESCRIPTION = <<MSG
@@ -28,10 +27,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  #spec.add_runtime_dependency 'nmatrix', '~> 0.2.3'
+  spec.required_ruby_version = '>= 2.1'
+
+  spec.add_runtime_dependency 'numo-narray', '>= 0.9.0.5'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'nmatrix', '~> 0.2.3'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
+  spec.add_development_dependency 'numo-narray', '~> 0.9.0.9'
+
+  spec.post_install_message = <<-EOF
+*************************************************************************
+Thank you for installing SVMKit!!
+
+Note that the SVMKit has been changed to use Numo::NArray for
+linear algebra library from version 0.2.0.
+*************************************************************************
+EOF
+
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: svmkit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-05 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.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: nmatrix
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+- !ruby/object:Gem::Dependency
+  name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.9.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.9.0.9
 description: |
   SVMKit is a library for machine learninig in Ruby.
   SVMKit implements machine learning algorithms with an interface similar to Scikit-Learn in Python.
@@ -92,23 +120,29 @@ files:
 - lib/svmkit/base/base_estimator.rb
 - lib/svmkit/base/classifier.rb
 - lib/svmkit/base/transformer.rb
+- lib/svmkit/dataset.rb
 - lib/svmkit/kernel_approximation/rbf.rb
 - lib/svmkit/kernel_machine/kernel_svc.rb
 - lib/svmkit/linear_model/logistic_regression.rb
-- lib/svmkit/linear_model/pegasos_svc.rb
+- lib/svmkit/linear_model/svc.rb
 - lib/svmkit/multiclass/one_vs_rest_classifier.rb
 - lib/svmkit/pairwise_metric.rb
 - lib/svmkit/preprocessing/l2_normalizer.rb
 - lib/svmkit/preprocessing/min_max_scaler.rb
 - lib/svmkit/preprocessing/standard_scaler.rb
-- lib/svmkit/utils.rb
 - lib/svmkit/version.rb
 - svmkit.gemspec
 homepage: https://github.com/yoshoku/svmkit
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message: |
+  *************************************************************************
+  Thank you for installing SVMKit!!
+
+  Note that the SVMKit has been changed to use Numo::NArray for
+  linear algebra library from version 0.2.0.
+  *************************************************************************
 rdoc_options: []
 require_paths:
 - lib
@@ -116,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/svmkit/utils.rb

@@ -1,24 +0,0 @@
-module SVMKit
-  # Module for utility methods.
-  module Utils
-    class << self
-      # Dump an NMatrix object converted to a Ruby Hash.
-      #
-      # @param mat [NMatrix] An NMatrix object converted to a Ruby Hash.
-      # @return [Hash] A Ruby Hash containing matrix information.
-      def dump_nmatrix(mat)
-        return nil if mat.class != NMatrix
-        { shape: mat.shape, array: mat.to_flat_a, dtype: mat.dtype, stype: mat.stype }
-      end
-
-      # Return the results of converting the dumped data into an NMatrix object.
-      #
-      # @param dmp [Hash] A Ruby Hash about NMatrix object created with SVMKit::Utils.dump_nmatrix method.
-      # @return [NMatrix] An NMatrix object restored from the given Hash.
-      def restore_nmatrix(dmp = {})
-        return nil unless dmp.class == Hash && %i[shape array dtype stype].all?(&dmp.method(:has_key?))
-        NMatrix.new(dmp[:shape], dmp[:array], dtype: dmp[:dtype], stype: dmp[:stype])
-      end
-    end
-  end
-end