liblinear-ruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac700b40f9f8bc42fbb319f6d510b150740556e7
-  data.tar.gz: 1027bf69f4ab2a882c12b0d569ce952a2729c350
+  metadata.gz: 7da30519f73e2c8623e55d79bbceba8338cf3f14
+  data.tar.gz: 765eda167d95dc14cbeb598d1224fcca8be9b2bb
 SHA512:
-  metadata.gz: 4ea3e62ea0b3977d0a49f5ed700f7e40079c99b144eda439a384cb04de644d21355db4e032f150430c3abc9df4cfea1fdd3828409f119a636dd01fbcc63b254e
-  data.tar.gz: 610cf9eab7d391d5c4ee1767e28accc957c158402a15d5bd637c55eaa1bf960218f5d52581752499ffbb77dab3bd5e65a0e8d14a12ee9772047d14ac76077269
+  metadata.gz: ca676587ed932b52aceac12795055459c2260596c63f1b417e89adb3f0deba84c0222a0f4b2d418f6145d613b5df8fc196820e6e3a2016ac549d3f6a8b20d595
+  data.tar.gz: 1e05e2eeccc9405fba3b6b040421156b139e77d39914998d3ca3fa441c0806437304eaf753cc9244510de12f36897f6c5b2b48ffa08a54bd3bd75b0887e2b83f

data/README.md

@@ -43,6 +43,15 @@ puts model.predict({1=>1, 2=>1, 3=>1, 4=>1, 5=>1}) # => -1.0
 # Analyzing phase
 puts model.coefficient
 puts model.bias
+
+# Cross Validation
+fold = 2
+cv = Liblinear::CrossValidator.new(prob, param, fold)
+cv.execute
+
+puts cv.accuracy                        # for classification
+puts cv.mean_squared_error              # for regression
+puts cv.squared_correlation_coefficient # for regression
 ```
 ## Usage
 

data/lib/liblinear.rb

@@ -1,6 +1,7 @@
 $: << File.expand_path(File.join(__FILE__, '..', '..', 'ext'))
 
 require 'liblinearswig'
+require 'liblinear/cross_validator'
 require 'liblinear/error'
 require 'liblinear/model'
 require 'liblinear/parameter'

data/lib/liblinear/cross_validator.rb

@@ -0,0 +1,58 @@
+module Liblinear
+  class CrossValidator
+    include Liblinear
+    include Liblinearswig
+
+    # @param prob [LibLinear::Problem]
+    # @param param [Liblinear::Parameter]
+    # @param fold [Integer]
+    def initialize(prob, param, fold)
+      @prob = prob
+      @param = param
+      @fold = fold
+    end
+
+    # @return [Array <Integer, Double>]
+    def execute
+      target = new_double_array(@prob.labels.size.times.map { 0.0 })
+      cross_validation(@prob.prob, @param.param, @fold, target)
+      @predictions = double_array_c_to_ruby(target, @prob.labels.size)
+    end
+
+    # @return [Double]
+    def accuracy
+      total_correct = 0
+      @prob.labels.size.times do |i|
+        total_correct += 1 if @predictions[i] == @prob.labels[i].to_f
+      end
+      total_correct.to_f / @prob.labels.size.to_f
+    end
+
+    # @return [Double]
+    def mean_squared_error
+      total_error = 0.0
+      @prob.labels.size.times do |i|
+        total_error += (@prob.labels[i].to_f - @predictions[i].to_f) ** 2
+      end
+      total_error / @prob.labels.size.to_f
+    end
+
+    # @return [Double]
+    def squared_correlation_coefficient
+      sum_x = 0.0
+      sum_y = 0.0
+      sum_xx = 0.0
+      sum_yy = 0.0
+      sum_xy = 0.0
+      @prob.labels.size.times do |i|
+        sum_x += @predictions[i].to_f
+        sum_y += @prob.labels[i].to_f
+        sum_xx += @predictions[i].to_f ** 2
+        sum_yy += @prob.labels[i].to_f ** 2
+        sum_xy += @predictions[i].to_f * @prob.labels[i].to_f
+      end
+      ((@prob.labels.size * sum_xy - sum_x * sum_y) ** 2) /
+        ((@prob.labels.size * sum_xx - sum_x ** 2) * (@prob.labels.size * sum_yy - sum_y ** 2))
+    end
+  end
+end

data/lib/liblinear/model.rb

@@ -13,9 +13,9 @@ module Liblinear
         unless arg_1.is_a?(Liblinear::Problem) && arg_2.is_a?(Liblinear::Parameter)
           raise ArgumentError, 'arguments must be [Liblinear::Problem] and [Liblinear::Parameter]'
         end
-        error_msg = check_parameter(arg_1.prob, arg_2.params)
+        error_msg = check_parameter(arg_1.prob, arg_2.param)
         raise InvalidParameter, error_msg if error_msg
-        @model = train(arg_1.prob, arg_2.params)
+        @model = train(arg_1.prob, arg_2.param)
       else
         raise ArgumentError, 'argument must be [String]' unless arg_1.is_a?(String)
         @model = load_model(arg_1)

data/lib/liblinear/parameter.rb

@@ -2,11 +2,11 @@ module Liblinear
   class Parameter
     include Liblinear
     include Liblinearswig
-    attr_accessor :params
+    attr_accessor :param
 
-    # @param params [Hash]
-    def initialize(params = {})
-      @params = Liblinearswig::Parameter.new
+    # @param param [Hash]
+    def initialize(param = {})
+      @param = Liblinearswig::Parameter.new
       self.solver_type = 1
       self.C = 1
       self.eps = 0.1
@@ -14,28 +14,28 @@ module Liblinear
       self.nr_weight = 0
       self.weight_label = []
       self.weight = []
-      params.each do |k, v|
+      param.each do |k, v|
         self.send("#{k}=", v)
       end
     end
 
-    # @params weigt_label [Array <Integer>]
+    # @param weigt_label [Array <Integer>]
     def weight_label=(weight_label)
-      free_int_array(@params.weight_label)
-      @params.weight_label = new_int_array(weight_label)
+      free_int_array(@param.weight_label)
+      @param.weight_label = new_int_array(weight_label)
     end
 
-    # @params weight [Array <Double>]
+    # @param weight [Array <Double>]
     def weight=(weight)
-      free_double_array(@params.weight)
-      @params.weight = new_double_array(weight)
+      free_double_array(@param.weight)
+      @param.weight = new_double_array(weight)
     end
 
     def method_missing(m, *args)
       if m.to_s.index('=')
-        @params.send(m.to_sym, args.first)
+        @param.send(m.to_sym, args.first)
       else
-        @params.send(m.to_sym)
+        @param.send(m.to_sym)
       end
     end
   end

data/lib/liblinear/problem.rb

@@ -3,6 +3,7 @@ module Liblinear
     include Liblinear
     include Liblinearswig
     attr_accessor :prob
+    attr_reader :labels, :examples
 
     # @param labels [Array <Double>]
     # @param examples [Array <Double, Hash>]
@@ -13,7 +14,8 @@ module Liblinear
         raise ArgumentError, 'labels and examples must be same size'
       end
       @prob = Liblinearswig::Problem.new
-      @c_label = new_double_array(labels)
+      @labels = labels
+      c_labels = new_double_array(@labels)
       @examples = examples
       @bias = bias
       @max_example_index = max_index(@examples)
@@ -23,7 +25,7 @@ module Liblinear
       set_example_matrix
 
       @prob.tap do |p|
-        p.y = @c_label
+        p.y = c_labels
         p.x = @example_matrix
         p.bias = bias
         p.l = examples.size

data/lib/liblinear/version.rb

@@ -1,3 +1,3 @@
 module Liblinear
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/liblinear/cross_validator_spec.rb

@@ -0,0 +1,33 @@
+$: << File.expand_path(File.join(__FILE__, '..', '..', '..', 'lib'))
+require 'liblinear'
+
+describe Liblinear::CrossValidator do
+  before do
+    @prob = Liblinear::Problem.new([1, 2], [[1],[2]])
+    @param_1 = Liblinear::Parameter.new
+    @param_2 = Liblinear::Parameter.new({ solver_type: Liblinear::L2R_L2LOSS_SVR })
+
+    @cv_classification = Liblinear::CrossValidator.new(@prob, @param_1, 2)
+    @cv_classification.execute
+    @cv_regression = Liblinear::CrossValidator.new(@prob, @param_2, 2)
+    @cv_regression.execute
+  end
+
+  describe '#accuracy' do
+    it 'returns accuracy' do
+      expect(@cv_classification.accuracy.class).to eq(Float)
+    end
+  end
+
+  describe '#mean_squared_error' do
+    it 'returns mean_squared_error' do
+      expect(@cv_regression.mean_squared_error.class).to eq(Float)
+    end
+  end
+
+  describe 'squared_correlation_coefficient' do
+    it 'returns squared_correlation_coefficient' do
+      expect(@cv_regression.squared_correlation_coefficient.class).to eq(Float)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liblinear-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kei Tsuchiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - ext/tron.cpp
 - ext/tron.h
 - lib/liblinear.rb
+- lib/liblinear/cross_validator.rb
 - lib/liblinear/error.rb
 - lib/liblinear/model.rb
 - lib/liblinear/parameter.rb
@@ -110,6 +111,7 @@ files:
 - liblinear-1.95/windows/train.exe
 - liblinear-1.95/windows/train.mexw64
 - liblinear-ruby.gemspec
+- spec/liblinear/cross_validator_spec.rb
 - spec/liblinear/model_spec.rb
 - spec/liblinear/parameter_spec.rb
 - spec/liblinear/problem_spec.rb
@@ -139,6 +141,7 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper of LIBLINEAR using SWIG
 test_files:
+- spec/liblinear/cross_validator_spec.rb
 - spec/liblinear/model_spec.rb
 - spec/liblinear/parameter_spec.rb
 - spec/liblinear/problem_spec.rb