liblinear-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7efbbe95e53288a0a4be6ae55411f693a16b65
-  data.tar.gz: c7882e4f98923ff2193b9eb797f918bf7a83295d
+  metadata.gz: e70466e2b89a0daa504f9dd8a655d759beb40260
+  data.tar.gz: e414010bb3853f7d2609e9e5a2fe34474d86e784
 SHA512:
-  metadata.gz: 333b9b43537b0b903761a7141b25dce9ef9af61cc04a9b985ad6988c63a9d53c46caa07ff8ed123a295a759ab7bd4dcfcbbf69ccabdaf7529d41f250eea37712
-  data.tar.gz: d94f42793a1b98e6bdf3f33fddded2934806be5e8a9e0913fb8c44a041b59a6c4d7afa4f3d84aa0985ac3b5f5811b61f48d2a01b65e066bb13d0e1c49e2b85b7
+  metadata.gz: 208a81ca1d8ebe5aaf221797417fbb3501a88f3a3d40310c65691980e3808463f5dc67c04cdea3ecf676b46b824d6506d9bfe0fb0f0d123094f39ae391454ec3
+  data.tar.gz: 848111ae60b0ae8422550f719fdf60d2ad701ee07a723da1c9e4c58e50dbce73f977a52eb1dc5ef8b981102d65d606e6333a15fa84fe1e5759f8852a35066ff9

data/lib/liblinear/model.rb

@@ -48,22 +48,35 @@ module Liblinear
     # @param example [Array, Hash]
     # @return [Hash]
     def predict_probability(example)
-      feature_nodes = convert_to_feature_node_array(example, @model.nr_feature, @model.bias)
-      c_double_array = new_double_array(nr_class)
-      Liblinearswig.predict_probability(@model, feature_nodes, c_double_array)
-      probabilities = double_array_c_to_ruby(c_double_array, nr_class)
-      delete_double(c_double_array)
-      feature_node_array_destroy(feature_nodes)
-      probability_list = {}
-      labels.size.times do |i|
-        probability_list[labels[i]] = probabilities[i]
-      end
-      probability_list
+      predict_prob_val(example, :predict_probability)
+    end
+
+    # @param example [Array, Hash]
+    # @return [Hash]
+    def predict_values(example)
+      predict_prob_val(example, :predict_values)
     end
 
     # @param filename [String]
     def save(filename)
       save_model(filename, @model)
     end
+
+    private 
+    # @param example [Array, Hash]
+    # @return [Hash]
+    def predict_prob_val(example, liblinear_func)
+      feature_nodes = convert_to_feature_node_array(example, @model.nr_feature, @model.bias)
+      c_double_array = Liblinearswig.new_double(nr_class)
+      Liblinearswig.send(liblinear_func, @model, feature_nodes, c_double_array)
+      values = double_array_c_to_ruby(c_double_array, nr_class)
+      delete_double(c_double_array)
+      feature_node_array_destroy(feature_nodes)
+      value_list = {}
+      labels.size.times do |i|
+        value_list[labels[i]] = values[i]
+      end
+      value_list
+    end
   end
 end

data/lib/liblinear/version.rb

@@ -1,3 +1,3 @@
 module Liblinear
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/liblinear/model_spec.rb

@@ -53,4 +53,10 @@ describe Liblinear::Model do
       expect(@model.predict_probability([1]).class).to eq(Hash)
     end
   end
+
+  describe '#predict_values' do
+    it 'return predict_values' do
+      expect(@model.predict_values([1]).class).to eq(Hash)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liblinear-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kei Tsuchiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper of LIBLINEAR using SWIG
@@ -143,4 +143,3 @@ test_files:
 - spec/liblinear/parameter_spec.rb
 - spec/liblinear/problem_spec.rb
 - spec/liblinear_spec.rb
-has_rdoc: