numo-liblinear 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b76e6a2a8dcfc5cb643fa0b62cd9ace5b6a76c
-  data.tar.gz: 6d8b6d9ed6a7e069ca8fcb78fb9f8999ccdfe1c5
+  metadata.gz: 25a456af8f35df53f449634445d25b92acbd3b78
+  data.tar.gz: 803d29787ecbe7c9f97c98924315c45ae8a8eba0
 SHA512:
-  metadata.gz: 8efe216d52fc7bba1561f46c3a372e842d6bdaf371c9b71b7662e380a17e9c6396e4a67348156522a41785bf2a12f37675dd137f173a0f52b6c48528c9c70cf7
-  data.tar.gz: e23e845ed639ee5e7fff6cbbbe936feed71f3a7e16429c52a27872b019201818649de57576030fb996cd697ff490588a0ec8e8d1e452eb0d441baa4ea00bcf52
+  metadata.gz: a4cc867afc83ea85f816113136b31454edfacd5eb8471341492dd3bf3e618e1ac95a144f58a024625d0c35cc17e726085c43d7a69c4e36acb058b5348cd68846
+  data.tar.gz: 559931664558ca8979493254037dd275bd1e5d5b892f2a9d53f4d4c1e1bc805faf9466c88787ae31fc8103bdd58f5b7bb277f2d3fb9934b37d5d5d739d9d51a5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.5.0
+- Fix to use LIBLINEAR sparce vector representation for internal processing.
+
 # 0.4.0
 - Add verbose parameter to output learning process messages.
 - Several documentation improvements.

data/ext/numo/liblinear/converter.c

@@ -100,3 +100,28 @@ double** nary_to_dbl_mat(VALUE mat_val)
 
   return mat;
 }
+
+struct feature_node* dbl_vec_to_node(double* const arr, int const size)
+{
+  int i, j;
+  int n_nonzero_elements;
+  struct feature_node* node;
+
+  n_nonzero_elements = 0;
+  for (i = 0; i < size; i++) {
+    if (arr[i] != 0.0) n_nonzero_elements++;
+  }
+
+  node = ALLOC_N(struct feature_node, n_nonzero_elements + 1);
+  for (i = 0, j = 0; i < size; i++) {
+    if (arr[i] != 0.0) {
+      node[j].index = i + 1;
+      node[j].value = arr[i];
+      j++;
+    }
+  }
+  node[n_nonzero_elements].index = -1;
+  node[n_nonzero_elements].value = 0.0;
+
+  return node;
+}

data/ext/numo/liblinear/converter.h

@@ -3,6 +3,7 @@
 
 #include <string.h>
 #include <ruby.h>
+#include <linear.h>
 #include <numo/narray.h>
 #include <numo/template.h>
 
@@ -12,5 +13,6 @@ VALUE dbl_vec_to_nary(double* const arr, int const size);
 double* nary_to_dbl_vec(VALUE vec_val);
 VALUE dbl_mat_to_nary(double** const mat, int const n_rows, int const n_cols);
 double** nary_to_dbl_mat(VALUE mat_val);
+struct feature_node* dbl_vec_to_node(double* const arr, int const size);
 
 #endif /* NUMO_LIBLINEAR_CONVERTER_H */

data/ext/numo/liblinear/liblinearext.c

@@ -282,18 +282,12 @@ VALUE numo_liblinear_predict(VALUE self, VALUE x_val, VALUE param_hash, VALUE mo
   x_pt = (double*)na_get_pointer_for_read(x_val);
 
   /* Predict values. */
-  x_nodes = ALLOC_N(struct feature_node, n_features + 1);
-  x_nodes[n_features].index = -1;
-  x_nodes[n_features].value = 0.0;
   for (i = 0; i < n_samples; i++) {
-    for (j = 0; j < n_features; j++) {
-      x_nodes[j].index = j + 1;
-      x_nodes[j].value = (double)x_pt[i * n_features + j];
-    }
+    x_nodes = dbl_vec_to_node(&x_pt[i * n_features], n_features);
     y_pt[i] = predict(model, x_nodes);
+    xfree(x_nodes);
   }
 
-  xfree(x_nodes);
   xfree_model(model);
   xfree_parameter(param);
 
@@ -365,34 +359,22 @@ VALUE numo_liblinear_decision_function(VALUE self, VALUE x_val, VALUE param_hash
 
   /* Predict values. */
   if (model->nr_class == 2 && model->param.solver_type != MCSVM_CS) {
-    x_nodes = ALLOC_N(struct feature_node, n_features + 1);
-    x_nodes[n_features].index = -1;
-    x_nodes[n_features].value = 0.0;
     for (i = 0; i < n_samples; i++) {
-      for (j = 0; j < n_features; j++) {
-        x_nodes[j].index = j + 1;
-        x_nodes[j].value = (double)x_pt[i * n_features + j];
-      }
+      x_nodes = dbl_vec_to_node(&x_pt[i * n_features], n_features);
       predict_values(model, x_nodes, &y_pt[i]);
+      xfree(x_nodes);
     }
-    xfree(x_nodes);
   } else {
     y_cols = (int)y_shape[1];
     dec_values = ALLOC_N(double, y_cols);
-    x_nodes = ALLOC_N(struct feature_node, n_features + 1);
-    x_nodes[n_features].index = -1;
-    x_nodes[n_features].value = 0.0;
     for (i = 0; i < n_samples; i++) {
-      for (j = 0; j < n_features; j++) {
-        x_nodes[j].index = j + 1;
-        x_nodes[j].value = (double)x_pt[i * n_features + j];
-      }
+      x_nodes = dbl_vec_to_node(&x_pt[i * n_features], n_features);
       predict_values(model, x_nodes, dec_values);
+      xfree(x_nodes);
       for (j = 0; j < y_cols; j++) {
         y_pt[i * y_cols + j] = dec_values[j];
       }
     }
-    xfree(x_nodes);
     xfree(dec_values);
   }
 
@@ -461,20 +443,14 @@ VALUE numo_liblinear_predict_proba(VALUE self, VALUE x_val, VALUE param_hash, VA
 
     /* Predict values. */
     probs = ALLOC_N(double, model->nr_class);
-    x_nodes = ALLOC_N(struct feature_node, n_features + 1);
-    x_nodes[n_features].index = -1;
-    x_nodes[n_features].value = 0.0;
     for (i = 0; i < n_samples; i++) {
-      for (j = 0; j < n_features; j++) {
-        x_nodes[j].index = j + 1;
-        x_nodes[j].value = (double)x_pt[i * n_features + j];
-      }
+      x_nodes = dbl_vec_to_node(&x_pt[i * n_features], n_features);
       predict_probability(model, x_nodes, probs);
+      xfree(x_nodes);
       for (j = 0; j < model->nr_class; j++) {
         y_pt[i * model->nr_class + j] = probs[j];
       }
     }
-    xfree(x_nodes);
     xfree(probs);
   }
 

data/ext/numo/liblinear/problem.c

@@ -29,9 +29,12 @@ struct problem* dataset_to_problem(VALUE x_val, VALUE y_val)
   narray_t* x_nary;
   double* x_pt;
   double* y_pt;
-  int i, j;
+  int i, j, k;
   int n_samples;
   int n_features;
+  int n_nonzero_features;
+  int is_padded;
+  int last_feature_id;
 
   GetNArray(x_val, x_nary);
   n_samples = (int)NA_SHAPE(x_nary)[0];
@@ -46,14 +49,39 @@ struct problem* dataset_to_problem(VALUE x_val, VALUE y_val)
   problem->x = ALLOC_N(struct feature_node*, n_samples);
   problem->y = ALLOC_N(double, n_samples);
 
+  is_padded = 0;
   for (i = 0; i < n_samples; i++) {
-    problem->x[i] = ALLOC_N(struct feature_node, n_features + 1);
+    n_nonzero_features = 0;
     for (j = 0; j < n_features; j++) {
-      problem->x[i][j].index = j + 1;
-      problem->x[i][j].value = x_pt[i * n_features + j];
+      if (x_pt[i * n_features + j] != 0.0) {
+        n_nonzero_features++;
+        last_feature_id = j + 1;
+      }
+    }
+    if (is_padded == 0 && last_feature_id == n_features) {
+      is_padded = 1;
+    }
+    if (is_padded == 1) {
+      problem->x[i] = ALLOC_N(struct feature_node, n_nonzero_features + 1);
+    } else {
+      problem->x[i] = ALLOC_N(struct feature_node, n_nonzero_features + 2);
+    }
+    for (j = 0, k = 0; j < n_features; j++) {
+      if (x_pt[i * n_features + j] != 0.0) {
+        problem->x[i][k].index = j + 1;
+        problem->x[i][k].value = x_pt[i * n_features + j];
+        k++;
+      }
+    }
+    if (is_padded == 1) {
+      problem->x[i][n_nonzero_features].index = -1;
+      problem->x[i][n_nonzero_features].value = 0.0;
+    } else {
+      problem->x[i][n_nonzero_features].index = n_features;
+      problem->x[i][n_nonzero_features].value = 0.0;
+      problem->x[i][n_nonzero_features + 1].index = -1;
+      problem->x[i][n_nonzero_features + 1].value = 0.0;
     }
-    problem->x[i][n_features].index = -1;
-    problem->x[i][n_features].value = 0.0;
     problem->y[i] = y_pt[i];
   }
 

data/lib/numo/liblinear/version.rb

@@ -3,6 +3,6 @@
 module Numo
   module Liblinear
     # The version of Numo::Liblienar you are using.
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/numo-liblinear.gemspec

@@ -32,6 +32,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/numo/liblinear/extconf.rb']
 
+  spec.metadata      = {
+    'homepage_uri' => 'https://github.com/yoshoku/numo-liblinear',
+    'source_code_uri' => 'https://github.com/yoshoku/numo-liblinear',
+    'documentation_uri' => 'https://yoshoku.github.io/numo-liblinear/doc/'
+  }
+
   spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-liblinear
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -119,7 +119,10 @@ files:
 homepage: https://github.com/yoshoku/numo-liblinear
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/yoshoku/numo-liblinear
+  source_code_uri: https://github.com/yoshoku/numo-liblinear
+  documentation_uri: https://yoshoku.github.io/numo-liblinear/doc/
 post_install_message: 
 rdoc_options: []
 require_paths: