rb-libsvm 1.0.8 → 1.0.9

data/README.md

@@ -2,22 +2,29 @@
 
 Spec Status: [![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 [1] library.  SVM
+This package provides a Ruby bindings to the [LIBSVM][] library.  SVM
 is a machine learning and classification algorithm, and LIBSVM is a
 popular free implementation of it, written by Chih-Chung Chang and
-Chih-Jen Lin, of National Taiwan University, Taipei. See "Programming
-Collective Intelligence," [2] among others, for a usage example.
+Chih-Jen Lin, of National Taiwan University, Taipei. See the book ["Programming
+Collective Intelligence,"](http://books.google.com/books?id=fEsZ3Ey-Hq4C) among others, for a usage example.
 
 Note: There exist two other Ruby bindings for LIBSVM. One is named
-Ruby SVM, written by Rudi Cilibrasi. It is hard to find now. The
-other, more actively developed one is libsvm-ruby-swig by Tom Zeng
-[3], which is built using SWIG.
+"Ruby SVM," and is written by Rudi Cilibrasi. It is hard to find
+nowadays. The other, more actively developed one is
+[libsvm-ruby-swig][svmrubyswig] by Tom Zeng, which is built using
+SWIG.
 
 ## Dependencies
 
-None.  Libsvm is bundled with the project.  Just install and go!
+None.  LIBSVM is bundled with the project.  Just install and go!
 
-Currently includes libsvm version 3.12.
+Currently this package includes libsvm version 3.13.
+
+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 these.
+It is also helpful to consult the Readme of the LIBSVM package for 
+reference when configuring the training parameters.
 
 ## Installation
 
@@ -48,13 +55,9 @@ pred = model.predict(Libsvm::Node.features(1, 1, 1))
 puts "Example [1, 1, 1] - Predicted #{pred}"
 ```
 
-## Author, License
-
-Written by C. Florian Ebeling. This software can be freely used under
-the terms of the MIT license, see file MIT-LICENSE.
+## Author
 
-This package includes the source of LIBSVM, which is free to use under
-the license in the file LIBSVM-LICENSE.
+Written by C. Florian Ebeling.
 
 ## Contributors
 
@@ -62,16 +65,20 @@ the license in the file LIBSVM-LICENSE.
 
 [Aleksander Pohl](https://github.com/apohllo)
 
-### Posts about SVMs and Ruby
+## License
 
-[http://neovintage.blogspot.com/2011/11/text-classification-using-support.html](http://neovintage.blogspot.com/2011/11/text-classification-using-support.html)
+This software can be freely used under the terms of the MIT license,
+see file MIT-LICENSE.
 
-[http://www.igvita.com/2008/01/07/support-vector-machines-svm-in-ruby/](http://www.igvita.com/2008/01/07/support-vector-machines-svm-in-ruby/)
+This package includes the source of LIBSVM, which is free to use under
+the license in the file LIBSVM-LICENSE.
 
+### Posts about using SVMs with Ruby
 
+http://neovintage.blogspot.com/2011/11/text-classification-using-support.html
 
-[1]: [http://www.csie.ntu.edu.tw/~cjlin/libsvm/](http://www.csie.ntu.edu.tw/~cjlin/libsvm/)
+http://www.igvita.com/2008/01/07/support-vector-machines-svm-in-ruby/
 
-[2]: [http://books.google.com/books?id=fEsZ3Ey-Hq4C](http://books.google.com/books?id=fEsZ3Ey-Hq4C)
+[libsvm]:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/
 
-[3]: http://github.com/tomz/libsvm-ruby-swig/tree/master
+[svmrubyswig]:  http://github.com/tomz/libsvm-ruby-swig/tree/master

data/ext/libsvm/svm.cpp

@@ -737,7 +737,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 			active_size = l;
 			info("*");
 		}
-		info("\nWARNING: reaching max number of iterations");
+		fprintf(stderr,"\nWARNING: reaching max number of iterations\n");
 	}
 
 	// calculate rho
@@ -1006,7 +1006,7 @@ double Solver::calculate_rho()
 //
 // additional constraint: e^T \alpha = constant
 //
-class Solver_NU : public Solver
+class Solver_NU: public Solver
 {
 public:
 	Solver_NU() {}
@@ -2107,12 +2107,14 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		model->l = nSV;
 		model->SV = Malloc(svm_node *,nSV);
 		model->sv_coef[0] = Malloc(double,nSV);
+		model->sv_indices = Malloc(int,nSV);
 		int j = 0;
 		for(i=0;i<prob->l;i++)
 			if(fabs(f.alpha[i]) > 0)
 			{
 				model->SV[j] = prob->x[i];
 				model->sv_coef[0][j] = f.alpha[i];
+				model->sv_indices[j] = i+1;
 				++j;
 			}		
 
@@ -2254,9 +2256,14 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 
 		model->l = total_sv;
 		model->SV = Malloc(svm_node *,total_sv);
+		model->sv_indices = Malloc(int,total_sv);
 		p = 0;
 		for(i=0;i<l;i++)
-			if(nonzero[i]) model->SV[p++] = x[i];
+			if(nonzero[i])
+			{
+				model->SV[p] = x[i];
+				model->sv_indices[p++] = perm[i] + 1;
+			}
 
 		int *nz_start = Malloc(int,nr_class);
 		nz_start[0] = 0;
@@ -2444,6 +2451,18 @@ void svm_get_labels(const svm_model *model, int* label)
 			label[i] = model->label[i];
 }
 
+void svm_get_sv_indices(const svm_model *model, int* indices)
+{
+	if (model->sv_indices != NULL)
+		for(int i=0;i<model->l;i++)
+			indices[i] = model->sv_indices[i];
+}
+
+int svm_get_nr_sv(const svm_model *model)
+{
+	return model->l;
+}
+
 double svm_get_svr_probability(const svm_model *model)
 {
 	if ((model->param.svm_type == EPSILON_SVR || model->param.svm_type == NU_SVR) &&

data/ext/libsvm/svm.h

@@ -1,7 +1,7 @@
 #ifndef _LIBSVM_H
 #define _LIBSVM_H
 
-#define LIBSVM_VERSION 312
+#define LIBSVM_VERSION 313
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,6 +59,7 @@ struct svm_model
 	double *rho;		/* constants in decision functions (rho[k*(k-1)/2]) */
 	double *probA;		/* pariwise probability information */
 	double *probB;
+	int *sv_indices;        /* sv_indices[0,...,nSV-1] are values in [1,...,num_traning_data] to indicate SVs in the training set */
 
 	/* for classification only */
 
@@ -79,6 +80,8 @@ struct svm_model *svm_load_model(const char *model_file_name);
 int svm_get_svm_type(const struct svm_model *model);
 int svm_get_nr_class(const struct svm_model *model);
 void svm_get_labels(const struct svm_model *model, int *label);
+void svm_get_sv_indices(const struct svm_model *model, int *sv_indices);
+int svm_get_nr_sv(const struct svm_model *model);
 double svm_get_svr_probability(const struct svm_model *model);
 
 double svm_predict_values(const struct svm_model *model, const struct svm_node *x, double* dec_values);

data/lib/libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70133955492220 !ruby/object:Gem::Requirement
+  requirement: &70287494349840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133955492220
+  version_requirements: *70287494349840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133955490320 !ruby/object:Gem::Requirement
+  requirement: &70287494349340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70133955490320
+  version_requirements: *70287494349340
 description: libsvm and ruby without using swig
 email:
 - florian.ebeling@gmail.com
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1508460701576130505
+      hash: -1009595894930293011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1508460701576130505
+      hash: -1009595894930293011
 requirements: []
 rubyforge_project: rb-libsvm
 rubygems_version: 1.8.10