rb-libsvm 1.0.11 → 1.1.0

data/.gitignore

@@ -4,7 +4,7 @@
 *.dylib
 *.model
 /pkg
-Gemfile*
+Gemfile.lock
 .rvmrc
 tags
 *.swp

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.md

@@ -1,5 +1,6 @@
 # rb-libsvm -- Ruby language bindings for LIBSVM
 
+[![Gem Version](https://badge.fury.io/rb/rb-libsvm.png)](http://badge.fury.io/rb/rb-libsvm)
 [![Build Status](https://secure.travis-ci.org/febeling/rb-libsvm.png)](http://travis-ci.org/febeling/rb-libsvm)
 
 This package provides a Ruby bindings to the [LIBSVM][] library.  SVM
@@ -17,10 +18,10 @@ LIBSVM includes a number of command line tools for preprocessing
 training data and finding parameters. These tools are not included in
 this gem. You should install the original package if you need them.
 
-It is helpful to consult the Readme of the LIBSVM package for
+It is helpful to consult the [README][] of the LIBSVM package for
 reference when configuring the training parameters.
 
-Currently this package includes libsvm version 3.13.
+Currently this package includes libsvm version 3.14.
 
 ## Dependencies
 
@@ -83,8 +84,8 @@ Written by C. Florian Ebeling.
 ## Contributors
 
 [Rimas Silkaitis](https://github.com/neovintage)
-
 [Aleksander Pohl](https://github.com/apohllo)
+[Andreas Eger](https://github.com/sch1zo)
 
 ## License
 
@@ -105,3 +106,5 @@ http://www.igvita.com/2008/01/07/support-vector-machines-svm-in-ruby/
 [svmrubyswig]:  http://github.com/tomz/libsvm-ruby-swig/tree/master
 
 [ruby-svm]:     http://sourceforge.net/projects/rubysvm/
+
+[README]:       https://github.com/febeling/libsvm/blob/master/README

data/TODO.md

@@ -0,0 +1,14 @@
+# TODO
+
+These functions from the library are not bound as ruby methods:
+
+`void svm_get_labels(const struct svm_model *model, int *label);`
+
+`double svm_get_svr_probability(const struct svm_model *model);`
+
+`void svm_destroy_param(struct svm_parameter *param);`
+
+The model holds reference to the parameters struct, so it's not
+obvious when it's safe to use.
+
+`int svm_check_probability_model(const struct svm_model *model);`

data/ext/libsvm/libsvm.c

@@ -22,7 +22,7 @@ static void model_free(struct svm_model *model) {
 /* Libsvm::Node */
 static struct svm_node *node_new() {
   struct svm_node *n;
-  n = (struct svm_node *) calloc(1,sizeof(struct svm_node));
+  n = calloc(1,sizeof(struct svm_node));
   if(n == NULL)
     return NULL;
   return n;
@@ -47,7 +47,7 @@ rx_def_accessor(cNode,struct svm_node,double,value);
 /* Libsvm::Problem */
 static struct svm_problem *problem_new() {
   struct svm_problem *n;
-  n = (struct svm_problem *) calloc(1,sizeof(struct svm_problem));
+  n = calloc(1,sizeof(struct svm_problem));
   if(n == NULL)
     return NULL;
   return n;
@@ -81,7 +81,7 @@ static struct svm_node *example_to_internal(VALUE example_ary)
 
   /* allocate memory for it */
   example_ary_len = rx_ary_size(example_ary);
-  x = (struct svm_node *)calloc(example_ary_len+1,sizeof(struct svm_node));
+  x = calloc(example_ary_len+1,sizeof(struct svm_node));
   if(x == 0) {
     rb_raise(rb_eNoMemError, "on Libsvm::Node allocation" " %s:%i", __FILE__,__LINE__);
   }
@@ -100,13 +100,12 @@ static struct svm_node *example_to_internal(VALUE example_ary)
 static struct svm_node **examples_ary_to_internal(VALUE examples_ary)
 {
   struct svm_node **x;
-  struct svm_node *node_struct;
-  VALUE nodes_ary, node;
-  int nodes_ary_len, i;
+  VALUE nodes_ary;
+  int i;
 
 	int num = rx_ary_size(examples_ary);
 
-  x = (struct svm_node **)calloc(num,sizeof(struct svm_node *));
+  x = calloc(num,sizeof(struct svm_node *));
   if(x == 0) {
     rb_raise(rb_eNoMemError, "%s:%i", __FILE__,__LINE__);
   }
@@ -133,10 +132,7 @@ static struct svm_node **examples_ary_to_internal(VALUE examples_ary)
 static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary) 
 {
   struct svm_problem *prob;
-  struct svm_node *node_struct;
-  /* VALUE num;*/
-  int i, nodes_ary_len;
-  VALUE label, node, nodes_ary;
+  int i;
 
   int num = rx_ary_size(labels_ary);
 
@@ -154,7 +150,7 @@ static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary
     free(prob->x);
   }
 
-  prob->y = (double *)calloc(num,sizeof(double));
+  prob->y = calloc(num,sizeof(double));
   if(prob->y == 0) {
     rb_raise(rb_eNoMemError, "%s:%i", __FILE__,__LINE__);
   }
@@ -182,14 +178,14 @@ static VALUE cProblem_examples(VALUE problem) {
   double label;
   struct svm_node *features;
   VALUE labels_ary, examples_ary, example_ary, v_node, result;
-  int i,n;
+  int i;
 
   Data_Get_Struct(problem, struct svm_problem, prob); 
 
   labels_ary = rb_ary_new2(prob->l);
   examples_ary = rb_ary_new2(prob->l);
   
-  features = (struct svm_node *)calloc(prob->l, sizeof(struct svm_node));
+  features = calloc(prob->l, sizeof(struct svm_node));
   if(features == 0) {
     rb_raise(rb_eNoMemError, "on allocating Libsvm::Node" " %s:%i", __FILE__,__LINE__);
   }
@@ -201,7 +197,7 @@ static VALUE cProblem_examples(VALUE problem) {
     node = *(prob->x+i); /* example start pointer */
     example_ary = rb_ary_new();
     while(node->index != -1) {
-      node_copy = (struct svm_node *)malloc(sizeof(struct svm_node));
+      node_copy = malloc(sizeof(struct svm_node));
       if(node_copy == 0) {
 	rb_raise(rb_eNoMemError, "on allocating Libsvm::Node" " %s:%i", __FILE__,__LINE__);
       }
@@ -224,7 +220,7 @@ static VALUE cProblem_examples(VALUE problem) {
 
 static struct svm_parameter *parameter_new() {
   struct svm_parameter *n;
-  n = (struct svm_parameter *) calloc(1,sizeof(struct svm_parameter));
+  n = calloc(1,sizeof(struct svm_parameter));
   if(n == NULL)
     return NULL;
   return n;
@@ -270,8 +266,7 @@ rx_def_accessor_as(cSvmParameter,struct svm_parameter,double,C,c);
 */
 static VALUE cSvmParameter_label_weights_set(VALUE obj,VALUE weight_hash) {
   struct svm_parameter *param;
-  int i,len,weight_label;
-  double weight;
+  int i;
   VALUE keys,key,val;
 
   Data_Get_Struct(obj,struct svm_parameter,param);
@@ -282,8 +277,8 @@ static VALUE cSvmParameter_label_weights_set(VALUE obj,VALUE weight_hash) {
   }
 
   param->nr_weight = rx_hash_size(weight_hash);
-  param->weight = (double *)calloc(param->nr_weight,sizeof(double));
-  param->weight_label = (int *)calloc(param->nr_weight,sizeof(int));
+  param->weight = calloc(param->nr_weight,sizeof(double));
+  param->weight_label = calloc(param->nr_weight,sizeof(int));
 
   keys = rb_funcall(weight_hash, rb_intern("keys"),0);
 
@@ -353,6 +348,36 @@ static VALUE cModel_predict(VALUE obj,VALUE example) {
   return rb_float_new(class);
 }
 
+static VALUE cModel_predict_probability(VALUE obj,VALUE example) {
+  struct svm_node *x;
+  struct svm_model *model;
+  double class;
+  double *c_estimates;
+  VALUE estimates;
+  VALUE target;
+  int i;
+
+  x = example_to_internal(example);
+  Data_Get_Struct(obj, struct svm_model, model);
+  c_estimates = calloc(model->nr_class, sizeof(double));
+  if(c_estimates == 0) {
+    rb_raise(rb_eNoMemError, "on predict probability estimates allocation" " %s:%i", __FILE__,__LINE__);
+  }
+
+  class = svm_predict_probability(model, x, c_estimates);
+
+  estimates = rb_ary_new();
+  for (i = 0; i < model->nr_class; i++)
+    rb_ary_push(estimates, rx_from_double(c_estimates[i]));
+
+  free(c_estimates);
+
+  target = rb_ary_new();
+  rb_ary_push(target, rb_float_new(class));
+  rb_ary_push(target, estimates);
+  return target;
+}
+
 static VALUE cModel_save(VALUE obj, VALUE filename)
 {
   const struct svm_model *model;
@@ -406,7 +431,7 @@ static VALUE cModel_class_cross_validation(VALUE cls, VALUE problem, VALUE param
   nr_fold = NUM2INT(num_fold);
 
   target = rb_ary_new2(prob->l);
-  target_ptr = (double *)calloc(prob->l, sizeof(double));
+  target_ptr = calloc(prob->l, sizeof(double));
   if(target_ptr == 0) {
     rb_raise(rb_eNoMemError, "on cross-validation result allocation" " %s:%i", __FILE__,__LINE__);
   }
@@ -466,16 +491,7 @@ void Init_libsvm_ext() {
   rb_define_method(cModel, "svm_type", cModel_svm_type, 0);
   rb_define_method(cModel, "classes", cModel_classes, 0);
   rb_define_method(cModel, "predict", cModel_predict, 1);
-
-  /*
-  Not covered, for various reasons:
-    TODO - void svm_get_labels(const struct svm_model *model, int *label); 
-    SVR? - double svm_get_svr_probability(const struct svm_model *model);
-    SVR? - double svm_predict_probability(const struct svm_model *model, const struct svm_node *x, double* prob_estimates);
-    Model holds reference to this, so when to use it?
-           void svm_destroy_param(struct svm_parameter *param);
-    SVR? - int svm_check_probability_model(const struct svm_model *model);
-  */
+  rb_define_method(cModel, "predict_probability", cModel_predict_probability, 1);
 
   mKernelType = rb_define_module_under(mLibsvm, "KernelType");
   rb_define_const(mKernelType, "LINEAR", INT2NUM(LINEAR));

data/lib/libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.0.11"
+  VERSION = "1.1.0"
 end

data/spec/model_spec.rb

@@ -21,6 +21,7 @@ module ModelSpecHelper
     parameter.cache_size = 50 # mb
     parameter.eps = 0.01
     parameter.c = 10
+    parameter.probability = 1
     parameter
   end
 
@@ -92,4 +93,11 @@ describe "An Libsvm model" do
     prediction = @model.predict(create_example)
     prediction.should_not be_nil
   end
+
+  it "can predict probability" do
+    prediction, probabilities = @model.predict_probability(create_example)
+    prediction.should_not be_nil
+    probabilities.should have(@model.classes).items
+    probabilities.each { |e| e.should_not be_nil }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -61,6 +61,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - examples/text.rb
 - examples/toy.rb
 - ext/libsvm/extconf.rb
@@ -90,18 +91,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 859207920834715629
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 859207920834715629
 requirements: []
 rubyforge_project: rb-libsvm
 rubygems_version: 1.8.23