rb-libsvm 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28c8bcde167de58a135e78ebfb547d930adf2ddf
+  data.tar.gz: 5894971f3815bdc838ff68cd940e88008930bca0
+SHA512:
+  metadata.gz: 7d14745db75f09d07c1c61b35221805abf3f51bbf2aef31e295423474913011961fd5849e69cbf01e0127a2bb5cc628387229675ec92bfc07665bd2355a56705
+  data.tar.gz: 73e039abd412ff291514c559499ee5508684390f6ee335889c2a93bd4dd7b3a1a07ef9729f6d9348f039945d25f92de94dc20e2afb82210fddbdccfc6cbac77d

data/README.md

@@ -21,7 +21,7 @@ this gem. You should install the original package if you need them.
 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.16.
+Currently this package includes libsvm version 3.17.
 
 ## Dependencies
 
@@ -77,6 +77,9 @@ gem 'rb-libsvm', require: 'libsvm'
 This is because the loadable name (`libsvm`) is different from the
 gem's name (`rb-libsvm`).
 
+There is a JRuby variant of this gem named
+[jrb-libsvm](https://github.com/sch1zo/jrb-libsvm) by Andreas Eger.
+
 ## Author
 
 Written by [C. Florian Ebeling](https://github.com/febeling).

data/ext/libsvm/libsvm.c

@@ -27,7 +27,7 @@ static struct svm_node *node_new() {
     return NULL;
   return n;
 }
-	
+
 static void node_free(struct svm_node *n) {
   free(n);
 }
@@ -37,13 +37,13 @@ static VALUE node_alloc(VALUE cls) {
   n = node_new();
   if(n == NULL)
     rb_raise(rb_eNoMemError, "Not enough memory for allocating Node.");
-  
+
   return Data_Wrap_Struct(cls, 0, node_free, n);
 }
 
 rx_def_accessor(cNode,struct svm_node,int,index);
 rx_def_accessor(cNode,struct svm_node,double,value);
- 
+
 /* Libsvm::Problem */
 static struct svm_problem *problem_new() {
   struct svm_problem *n;
@@ -54,7 +54,7 @@ static struct svm_problem *problem_new() {
 }
 
 static void problem_free(struct svm_problem *n) {
-  /* 
+  /*
      Deliberate no-op, because of this note from the README:
 
      `*NOTE* Because svm_model contains pointers to svm_problem, you can
@@ -109,7 +109,7 @@ static struct svm_node **examples_ary_to_internal(VALUE examples_ary)
   if(x == 0) {
     rb_raise(rb_eNoMemError, "%s:%i", __FILE__,__LINE__);
   }
-  
+
   for(i = 0; i < num; ++i) {
     nodes_ary =     rb_ary_entry(examples_ary,i);
     *(x+i) = example_to_internal(nodes_ary);
@@ -118,7 +118,7 @@ static struct svm_node **examples_ary_to_internal(VALUE examples_ary)
   return x;
 }
 
-/* 
+/*
    call-seq:
      problem.set_examples(labels, examples_array)
 
@@ -129,7 +129,7 @@ static struct svm_node **examples_ary_to_internal(VALUE examples_ary)
    of lables (or classifications) and examples (or feature vectors).
    If those 2 don't match in length and ArgumentError is raised.
 */
-static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary) 
+static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary)
 {
   struct svm_problem *prob;
   int i;
@@ -140,8 +140,8 @@ static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary
     rb_raise(rb_eArgError, "Number of labels (%i) does not match number of features (%i).", num, rx_ary_size(examples_ary));
   }
 
-  Data_Get_Struct(obj, struct svm_problem, prob); 
-  
+  Data_Get_Struct(obj, struct svm_problem, prob);
+
   if(prob->l > 0) {
     free(prob->y);
     for(i = 0; i < num; ++i) {
@@ -165,12 +165,12 @@ static VALUE cProblem_examples_set(VALUE obj,VALUE labels_ary,VALUE examples_ary
   return INT2FIX(num);
 }
 
-/* 
+/*
    call-seq:
    labels, array_of_arrays = problem.examples
 
    double *y; // class/label of the example
-   struct svm_node **x; 
+   struct svm_node **x;
 */
 static VALUE cProblem_examples(VALUE problem) {
   struct svm_problem *prob;
@@ -180,11 +180,11 @@ static VALUE cProblem_examples(VALUE problem) {
   VALUE labels_ary, examples_ary, example_ary, v_node, result;
   int i;
 
-  Data_Get_Struct(problem, struct svm_problem, prob); 
+  Data_Get_Struct(problem, struct svm_problem, prob);
 
   labels_ary = rb_ary_new2(prob->l);
   examples_ary = rb_ary_new2(prob->l);
-  
+
   features = calloc(prob->l, sizeof(struct svm_node));
   if(features == 0) {
     rb_raise(rb_eNoMemError, "on allocating Libsvm::Node" " %s:%i", __FILE__,__LINE__);
@@ -225,7 +225,7 @@ static struct svm_parameter *parameter_new() {
     return NULL;
   return n;
 }
-	
+
 static void parameter_free(struct svm_parameter *n) {
   //  svm_destroy_param(n);
   free(n);
@@ -236,7 +236,7 @@ static VALUE parameter_alloc(VALUE cls) {
   n = parameter_new();
   if(n == NULL)
     rb_raise(rb_eNoMemError, "Not enough memory for allocating SvmParameter.");
-  
+
   return Data_Wrap_Struct(cls, 0, parameter_free, n);
 }
 
@@ -259,7 +259,7 @@ rx_def_accessor_as(cSvmParameter,struct svm_parameter,double,C,c);
     nr_weight is the number of elements in the array weight_label and
     weight. Each weight[i] corresponds to weight_label[i], meaning that
     the penalty of class weight_label[i] is scaled by a factor of weight[i].
-    
+
     If you do not want to change penalty for any of the classes,
     just set nr_weight to 0.
 
@@ -285,7 +285,7 @@ static VALUE cSvmParameter_label_weights_set(VALUE obj,VALUE weight_hash) {
   for(i = 0; i < param->nr_weight; ++i) {
     key = rb_ary_entry(keys,i);
     val = rb_hash_aref(weight_hash,key);
-    
+
     param->weight_label[i] = NUM2INT(key);
     param->weight[i] = NUM2DBL(val);
   }
@@ -294,12 +294,12 @@ static VALUE cSvmParameter_label_weights_set(VALUE obj,VALUE weight_hash) {
 }
 
 static VALUE cSvmParameter_label_weights(VALUE obj) {
-  struct svm_parameter *param; 
+  struct svm_parameter *param;
   int i;
   VALUE hash,key,val;
 
   Data_Get_Struct(obj,struct svm_parameter,param);
-  
+
   hash = rb_hash_new();
 
   for(i = 0; i < param->nr_weight; ++i) {
@@ -326,7 +326,7 @@ static VALUE cModel_class_train(VALUE obj,VALUE problem,VALUE parameter) {
 
   Data_Get_Struct(problem, struct svm_problem, prob);
   Data_Get_Struct(parameter, struct svm_parameter, param);
-  
+
   check_error = svm_check_parameter(prob, param);
   if(check_error != NULL) {
     rb_raise(rb_eArgError, "Parameters not valid for Problem: '%s'", check_error);
@@ -385,15 +385,15 @@ static VALUE cModel_save(VALUE obj, VALUE filename)
 {
   const struct svm_model *model;
   const char *path;
-  int rc; 
+  int rc;
 
   Data_Get_Struct(obj, struct svm_model, model);
   path = StringValueCStr(filename);
-  
-  if(rc = svm_save_model(path, model)) {
+
+  if((rc = svm_save_model(path, model))) {
     rb_raise(rb_eStandardError, "Error on saving model, code: %i", rc);
   }
-  
+
   return Qnil;
 }
 
@@ -404,7 +404,7 @@ static VALUE cModel_svm_type(VALUE obj)
   return INT2NUM(svm_get_svm_type(model));
 }
 
-static VALUE cModel_classes(VALUE obj) 
+static VALUE cModel_classes(VALUE obj)
 {
   const struct svm_model *model;
   Data_Get_Struct(obj, struct svm_model, model);
@@ -430,7 +430,7 @@ static VALUE cModel_class_cross_validation(VALUE cls, VALUE problem, VALUE param
 
   Data_Get_Struct(problem, struct svm_problem, prob);
   Data_Get_Struct(parameter, struct svm_parameter, param);
-  
+
   nr_fold = NUM2INT(num_fold);
 
   target = rb_ary_new2(prob->l);

data/ext/libsvm/ruby-ext.h

@@ -38,5 +38,3 @@
   NUM2INT(rb_funcall((ary), rb_intern("size"), 0))
 #define rx_hash_size(hsh)				\
   NUM2INT(rb_funcall((hsh), rb_intern("size"), 0))
-
-

data/ext/libsvm/svm.cpp

@@ -2048,6 +2048,24 @@ static void svm_group_classes(const svm_problem *prob, int *nr_class_ret, int **
 		}
 	}
 
+	//
+	// Labels are ordered by their first occurrence in the training set. 
+	// However, for two-class sets with -1/+1 labels and -1 appears first, 
+	// we swap labels to ensure that internally the binary SVM has positive data corresponding to the +1 instances.
+	//
+	if (nr_class == 2 && label[0] == -1 && label[1] == 1)
+	{
+		swap(label[0],label[1]);
+		swap(count[0],count[1]);
+		for(i=0;i<l;i++)
+		{
+			if(data_label[i] == 0)
+				data_label[i] = 1;
+			else
+				data_label[i] = 0;
+		}
+	}
+
 	int *start = Malloc(int,nr_class);
 	start[0] = 0;
 	for(i=1;i<nr_class;i++)
@@ -2321,11 +2339,16 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 void svm_cross_validation(const svm_problem *prob, const svm_parameter *param, int nr_fold, double *target)
 {
 	int i;
-	int *fold_start = Malloc(int,nr_fold+1);
+	int *fold_start;
 	int l = prob->l;
 	int *perm = Malloc(int,l);
 	int nr_class;
-
+	if (nr_fold > l)
+	{
+		nr_fold = l;
+		fprintf(stderr,"WARNING: # folds > # data. Will use # folds = # data instead (i.e., leave-one-out cross validation)\n");
+	}
+	fold_start = Malloc(int,nr_fold+1);
 	// stratified cv may not give leave-one-out rate
 	// Each class to l folds -> some folds may have zero elements
 	if((param->svm_type == C_SVC ||
@@ -2745,9 +2768,9 @@ svm_model *svm_load_model(const char *model_file_name)
 	model->rho = NULL;
 	model->probA = NULL;
 	model->probB = NULL;
+	model->sv_indices = NULL;
 	model->label = NULL;
 	model->nSV = NULL;
-    model->sv_indices = NULL;
 
 	char cmd[81];
 	while(1)

data/ext/libsvm/svm.h

@@ -1,7 +1,7 @@
 #ifndef _LIBSVM_H
 #define _LIBSVM_H
 
-#define LIBSVM_VERSION 316
+#define LIBSVM_VERSION 317
 
 #ifdef __cplusplus
 extern "C" {

data/lib/libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - C. Florian Ebeling
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
 description: libsvm and ruby without using swig
@@ -53,9 +48,9 @@ extensions:
 - ext/libsvm/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - LIBSVM-LICENSE
 - MIT-LICENSE
@@ -81,33 +76,26 @@ files:
 - spec/usage_spec.rb
 homepage: https://github.com/febeling/rb-libsvm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4124111436623898286
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4124111436623898286
 requirements: []
 rubyforge_project: rb-libsvm
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby language bindings for LIBSVM
 test_files:
 - spec/model_spec.rb