liblinear-ruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe141358d47228659a23f83ea68a49dc09fc1401
-  data.tar.gz: 2165c62af5e42c40836eb17131f668e44a0c3311
+  metadata.gz: 30ae94e9df20dcf3cc8cb98ca9aaeff3afda748f
+  data.tar.gz: ec8e813c7fa4f3a33038d1a1b11e637adc2cd115
 SHA512:
-  metadata.gz: 723448dcbff38bee0b668ee62d53c07ebbcd0d86feff6022480ab4a5904b39f8ef79bc5440baef3c38f55e120d58ce22327dd69d070cc36454d6dca6afe9c1d6
-  data.tar.gz: cd6f6aaaf33b0cf5d5400328b59341f80561eab64aece3e24c7dde2466800b5b4176e8dd81fcf26fba66eb8d3d444c607288dc2be842e122b1af47f3eb7db8ec
+  metadata.gz: 40c2879b5c2c4d0e8fb674d7b30462bdeb64ca40c5c7abc83d5be765398748905de6e1ba1f5f14c4b4c59b886ac0f6b8e827ccdb73b16302b0605e60cc36186f
+  data.tar.gz: a2d726b56e487a894d88f63de52b6026eaadaeafd4db91b7f2854de7623becf079e4262db5f9ab2ee2a5834ac0a4f81439604962d0aef0e07dd65939d9912623

data/README.md

@@ -123,6 +123,13 @@ If you have already had a model file, you can load it as:
 model = Liblinear::Model.load(file_name)
 ```
 
+## Feature Weights
+To get the feature weights of the model.
+
+```ruby
+model.feature_weights
+```
+
 ## Predict
 Prepare the data you want to predict its class and call `Liblinear.predict`.
 
@@ -138,6 +145,16 @@ For example, `results[0]` is a class predicted by `examples` excepts part includ
 results = Liblinear.cross_validation(fold, parameter, labels, examples)
 ```
 
+## Quiet / Verbose Mode
+You can supress output while executing `Liblinear::Model.train`.
+```ruby
+# Output is supressed by:
+Liblinear.quiet_mode
+
+# You can undo by:
+Liblinear.verbose_mode
+```
+
 ## Thanks
 - http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 - https://github.com/tomz/liblinear-ruby-swig

data/ext/liblinear.i

@@ -38,4 +38,21 @@ void feature_node_matrix_destroy(struct feature_node **matrix)
 {
         free(matrix);
 }
+
+static void print_string_stdout(const char *s)
+{
+        fputs(s,stdout);
+        fflush(stdout);
+}
+
+void print_null(const char *s) {}
+
+void enable_stdout() {
+    set_print_string_function(&print_string_stdout);
+}
+
+void disable_stdout() {
+    set_print_string_function(&print_null);
+}
+
 %}

data/ext/liblinear_wrap.cxx

@@ -2137,6 +2137,23 @@ void feature_node_matrix_destroy(struct feature_node **matrix)
         free(matrix);
 }
 
+static void print_string_stdout(const char *s)
+{
+        fputs(s,stdout);
+        fflush(stdout);
+}
+
+void print_null(const char *s) {}
+
+void enable_stdout() {
+    set_print_string_function(&print_string_stdout);
+}
+
+void disable_stdout() {
+    set_print_string_function(&print_null);
+}
+
+
 swig_class SwigClassFeature_node;
 
 SWIGINTERN VALUE
@@ -4438,6 +4455,78 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_print_string_stdout(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","print_string_stdout", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  print_string_stdout((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_print_null(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","print_null", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  print_null((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_enable_stdout(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  enable_stdout();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_disable_stdout(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  disable_stdout();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -4866,5 +4955,9 @@ SWIGEXPORT void Init_liblinearswig(void) {
   rb_define_module_function(mLiblinearswig, "feature_node_matrix", VALUEFUNC(_wrap_feature_node_matrix), -1);
   rb_define_module_function(mLiblinearswig, "feature_node_matrix_set", VALUEFUNC(_wrap_feature_node_matrix_set), -1);
   rb_define_module_function(mLiblinearswig, "feature_node_matrix_destroy", VALUEFUNC(_wrap_feature_node_matrix_destroy), -1);
+  rb_define_module_function(mLiblinearswig, "print_string_stdout", VALUEFUNC(_wrap_print_string_stdout), -1);
+  rb_define_module_function(mLiblinearswig, "print_null", VALUEFUNC(_wrap_print_null), -1);
+  rb_define_module_function(mLiblinearswig, "enable_stdout", VALUEFUNC(_wrap_enable_stdout), -1);
+  rb_define_module_function(mLiblinearswig, "disable_stdout", VALUEFUNC(_wrap_disable_stdout), -1);
 }
 

data/lib/liblinear.rb

@@ -125,5 +125,13 @@ class Liblinear
       Liblinear::Array::Integer.delete(labels_swig)
       labels
     end
+
+    def quiet_mode
+      Liblinearswig.disable_stdout
+    end
+
+    def verbose_mode
+      Liblinearswig.enable_stdout
+    end
   end
 end

data/lib/liblinear/version.rb

@@ -1,3 +1,3 @@
 class Liblinear
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/liblinear/model_spec.rb

@@ -3,6 +3,7 @@ require 'liblinear'
 
 describe Liblinear::Model do
   before do
+    Liblinear.quiet_mode
     @problem = Liblinear::Problem.new([1, 2], [[1],[2]])
     @parameter = Liblinear::Parameter.new()
     @model = Liblinear::Model.train(@problem, @parameter)

data/spec/liblinear_spec.rb

@@ -3,6 +3,7 @@ require 'liblinear'
 
 describe Liblinear do
   before do
+    Liblinear.quiet_mode
     @model = Liblinear.train(
       { solver_type: Liblinear::L2R_LR },
       [1, 2],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liblinear-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kei Tsuchiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,6 @@ files:
 - liblinear-2.1/windows/train.mexw64
 - liblinear-ruby.gemspec
 - spec/liblinear/array/double_spec.rb
-- spec/liblinear/cross_validator_spec.rb
 - spec/liblinear/example_spec.rb
 - spec/liblinear/feature_node_matrix_spec.rb
 - spec/liblinear/feature_node_spec.rb
@@ -145,13 +144,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper of LIBLINEAR using SWIG
 test_files:
 - spec/liblinear/array/double_spec.rb
-- spec/liblinear/cross_validator_spec.rb
 - spec/liblinear/example_spec.rb
 - spec/liblinear/feature_node_matrix_spec.rb
 - spec/liblinear/feature_node_spec.rb

data/spec/liblinear/cross_validator_spec.rb

@@ -1,33 +0,0 @@
-$: << 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