rb-libsvm 1.3.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c04b43e9bcd03b81b5e928566c8449f91650bfc4
-  data.tar.gz: 1338454d938aeffdb2bfcc371f994177982bd984
+SHA256:
+  metadata.gz: 2a9d797f41f999146257203fe3e0e1ef8a0e6145b432c21e00615b2c338f6a99
+  data.tar.gz: 9cbf823d14c85463d599f862c0ca2e11ea5cb9738db198a091d7168b7d005d53
 SHA512:
-  metadata.gz: f4dbead862bfa6284ed286759cd6215764fe3f4124162bcd3e7f5a441ac540ba41eab7ada12a4a2c221220ff322b443421f4e663189eb65bc7d939eb8dfa9236
-  data.tar.gz: 5512309213d09e792e2e12b2c753a12b800020f7696f6b46dd04fe5e67e5041af9b61e199465ac87c58f18ab9c4bc4f78cfa6edf51270d769a65ff7fbd0ea979
+  metadata.gz: d6039ba512d500edb6bb7f5c32edeaf179cc2fe91c1cb0b8e094c1b5cd8117b493c00c5246b070f4f9581976a77e49aabb6b18c93b2f14cc0b7311022809fe11
+  data.tar.gz: b6801f7f1725507c10dd7773019e2da2f170a94265762d479336f10b12a2233ea2db9b802a88274130d05e115f475266b5ca89020c9aca529fdc45043d2d3fba

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.1.5
-  - 2.2.0
+  - 2.2.7
+  - 2.3.4
+  - 2.5.1
   - ruby-head
+sudo: false

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.3] - 2018-09-15
+### Changed
+- Upgrade to LIBSVM 3.23
+
+## [1.4.2] - 2018-09-02
+### Changed
+- bundler requires automatically
+
+## [1.4.1] - 2018-06-15
+
+## [1.4.0] - 2015-09-18
+### Changed
+- Complete transition to `expect` specs.
+- Raise exception in `Libsvm::Model.load` if model can't be loaded (fixes #21).
+### Fixed
+- Fix a bug in `Libsvm::Node#==` when comparing with `nil`.
+
 ## [1.3.1] - 2015-03-21
 ### Fixed
 - Spelling and punctuation in documentation comments

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2012 Caspar Florian Ebeling
+Copyright (c) 2004-2018 Caspar Florian Ebeling
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,7 +3,7 @@
 [![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
+This package provides 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 the book ["Programming
@@ -22,10 +22,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][README] package for
 reference when configuring the training parameters.
 
-Currently this package includes libsvm version 3.20.
+Currently this package includes libsvm version 3.24.
 
 ## Dependencies
 
@@ -101,6 +101,8 @@ the license in the file LIBSVM-LICENSE.
 
 ### Posts about using SVMs with Ruby
 
+https://www.practicalai.io/implementing-classification-using-a-svm-in-ruby/
+
 http://neovintage.blogspot.com/2011/11/text-classification-using-support.html
 
 http://www.igvita.com/2008/01/07/support-vector-machines-svm-in-ruby/

data/ext/libsvm/libsvm.c

@@ -490,6 +490,8 @@ static VALUE cModel_support_vectors_count(VALUE obj)
  * internal file representation of the model.
  *
  * @param filename [String] name of the model file
+ * @raise [IOError] if the model can't be loaded,
+ *   e.g. because the model path doesn't point to a model
  * @return [Libsvm::Model] the model
  */
 static VALUE cModel_class_load(VALUE cls, VALUE filename)
@@ -498,6 +500,9 @@ static VALUE cModel_class_load(VALUE cls, VALUE filename)
   char *path;
   path = StringValueCStr(filename);
   model = svm_load_model(path);
+  if(model == NULL) {
+    rb_raise(rb_eIOError, "unable to load model from file: \"%s\"", path);
+  }
   return Data_Wrap_Struct(cModel, 0, model_free, model);
 }
 

data/ext/libsvm/svm.cpp

@@ -308,7 +308,7 @@ double Kernel::dot(const svm_node *px, const svm_node *py)
 				++py;
 			else
 				++px;
-		}			
+		}
 	}
 	return sum;
 }
@@ -337,7 +337,7 @@ double Kernel::k_function(const svm_node *x, const svm_node *y,
 				else
 				{
 					if(x->index > y->index)
-					{	
+					{
 						sum += y->value * y->value;
 						++y;
 					}
@@ -360,7 +360,7 @@ double Kernel::k_function(const svm_node *x, const svm_node *y,
 				sum += y->value * y->value;
 				++y;
 			}
-			
+
 			return exp(-param.gamma*sum);
 		}
 		case SIGMOID:
@@ -368,7 +368,7 @@ double Kernel::k_function(const svm_node *x, const svm_node *y,
 		case PRECOMPUTED:  //x: test (validation), y: SV
 			return x[(int)(y->value)].value;
 		default:
-			return 0;  // Unreachable 
+			return 0;  // Unreachable
 	}
 }
 
@@ -560,7 +560,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 	int iter = 0;
 	int max_iter = max(10000000, l>INT_MAX/100 ? INT_MAX : 100*l);
 	int counter = min(l,1000)+1;
-	
+
 	while(iter < max_iter)
 	{
 		// show progress and do shrinking
@@ -585,11 +585,11 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 			else
 				counter = 1;	// do shrinking next iteration
 		}
-		
+
 		++iter;
 
 		// update alpha[i] and alpha[j], handle bounds carefully
-		
+
 		const Qfloat *Q_i = Q.get_Q(i,active_size);
 		const Qfloat *Q_j = Q.get_Q(j,active_size);
 
@@ -608,7 +608,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 			double diff = alpha[i] - alpha[j];
 			alpha[i] += delta;
 			alpha[j] += delta;
-			
+
 			if(diff > 0)
 			{
 				if(alpha[j] < 0)
@@ -690,7 +690,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 
 		double delta_alpha_i = alpha[i] - old_alpha_i;
 		double delta_alpha_j = alpha[j] - old_alpha_j;
-		
+
 		for(int k=0;k<active_size;k++)
 		{
 			G[k] += Q_i[k]*delta_alpha_i + Q_j[k]*delta_alpha_j;
@@ -790,7 +790,7 @@ int Solver::select_working_set(int &out_i, int &out_j)
 	// j: minimizes the decrease of obj value
 	//    (if quadratic coefficeint <= 0, replace it with tau)
 	//    -y_j*grad(f)_j < -y_i*grad(f)_i, j in I_low(\alpha)
-	
+
 	double Gmax = -INF;
 	double Gmax2 = -INF;
 	int Gmax_idx = -1;
@@ -798,7 +798,7 @@ int Solver::select_working_set(int &out_i, int &out_j)
 	double obj_diff_min = INF;
 
 	for(int t=0;t<active_size;t++)
-		if(y[t]==+1)	
+		if(y[t]==+1)
 		{
 			if(!is_upper_bound(t))
 				if(-G[t] >= Gmax)
@@ -874,7 +874,7 @@ int Solver::select_working_set(int &out_i, int &out_j)
 		}
 	}
 
-	if(Gmax+Gmax2 < eps)
+	if(Gmax+Gmax2 < eps || Gmin_idx == -1)
 		return 1;
 
 	out_i = Gmax_idx;
@@ -895,7 +895,7 @@ bool Solver::be_shrunk(int i, double Gmax1, double Gmax2)
 	{
 		if(y[i]==+1)
 			return(G[i] > Gmax2);
-		else	
+		else
 			return(G[i] > Gmax1);
 	}
 	else
@@ -911,27 +911,27 @@ void Solver::do_shrinking()
 	// find maximal violating pair first
 	for(i=0;i<active_size;i++)
 	{
-		if(y[i]==+1)	
+		if(y[i]==+1)
 		{
-			if(!is_upper_bound(i))	
+			if(!is_upper_bound(i))
 			{
 				if(-G[i] >= Gmax1)
 					Gmax1 = -G[i];
 			}
-			if(!is_lower_bound(i))	
+			if(!is_lower_bound(i))
 			{
 				if(G[i] >= Gmax2)
 					Gmax2 = G[i];
 			}
 		}
-		else	
+		else
 		{
-			if(!is_upper_bound(i))	
+			if(!is_upper_bound(i))
 			{
 				if(-G[i] >= Gmax2)
 					Gmax2 = -G[i];
 			}
-			if(!is_lower_bound(i))	
+			if(!is_lower_bound(i))
 			{
 				if(G[i] >= Gmax1)
 					Gmax1 = G[i];
@@ -939,7 +939,7 @@ void Solver::do_shrinking()
 		}
 	}
 
-	if(unshrink == false && Gmax1 + Gmax2 <= eps*10) 
+	if(unshrink == false && Gmax1 + Gmax2 <= eps*10)
 	{
 		unshrink = true;
 		reconstruct_gradient();
@@ -1078,7 +1078,7 @@ int Solver_NU::select_working_set(int &out_i, int &out_j)
 	{
 		if(y[j]==+1)
 		{
-			if (!is_lower_bound(j))	
+			if (!is_lower_bound(j))
 			{
 				double grad_diff=Gmaxp+G[j];
 				if (G[j] >= Gmaxp2)
@@ -1126,7 +1126,7 @@ int Solver_NU::select_working_set(int &out_i, int &out_j)
 		}
 	}
 
-	if(max(Gmaxp+Gmaxp2,Gmaxn+Gmaxn2) < eps)
+	if(max(Gmaxp+Gmaxp2,Gmaxn+Gmaxn2) < eps || Gmin_idx == -1)
 		return 1;
 
 	if (y[Gmin_idx] == +1)
@@ -1144,14 +1144,14 @@ bool Solver_NU::be_shrunk(int i, double Gmax1, double Gmax2, double Gmax3, doubl
 	{
 		if(y[i]==+1)
 			return(-G[i] > Gmax1);
-		else	
+		else
 			return(-G[i] > Gmax4);
 	}
 	else if(is_lower_bound(i))
 	{
 		if(y[i]==+1)
 			return(G[i] > Gmax2);
-		else	
+		else
 			return(G[i] > Gmax3);
 	}
 	else
@@ -1180,14 +1180,14 @@ void Solver_NU::do_shrinking()
 		if(!is_lower_bound(i))
 		{
 			if(y[i]==+1)
-			{	
+			{
 				if(G[i] > Gmax2) Gmax2 = G[i];
 			}
 			else	if(G[i] > Gmax3) Gmax3 = G[i];
 		}
 	}
 
-	if(unshrink == false && max(Gmax1+Gmax2,Gmax3+Gmax4) <= eps*10) 
+	if(unshrink == false && max(Gmax1+Gmax2,Gmax3+Gmax4) <= eps*10)
 	{
 		unshrink = true;
 		reconstruct_gradient();
@@ -1250,12 +1250,12 @@ double Solver_NU::calculate_rho()
 		r1 = sum_free1/nr_free1;
 	else
 		r1 = (ub1+lb1)/2;
-	
+
 	if(nr_free2 > 0)
 		r2 = sum_free2/nr_free2;
 	else
 		r2 = (ub2+lb2)/2;
-	
+
 	si->r = (r1+r2)/2;
 	return (r1-r2)/2;
 }
@@ -1264,7 +1264,7 @@ double Solver_NU::calculate_rho()
 // Q matrices for various formulations
 //
 class SVC_Q: public Kernel
-{ 
+{
 public:
 	SVC_Q(const svm_problem& prob, const svm_parameter& param, const schar *y_)
 	:Kernel(prob.l, prob.x, param)
@@ -1275,7 +1275,7 @@ public:
 		for(int i=0;i<prob.l;i++)
 			QD[i] = (this->*kernel_function)(i,i);
 	}
-	
+
 	Qfloat *get_Q(int i, int len) const
 	{
 		Qfloat *data;
@@ -1324,7 +1324,7 @@ public:
 		for(int i=0;i<prob.l;i++)
 			QD[i] = (this->*kernel_function)(i,i);
 	}
-	
+
 	Qfloat *get_Q(int i, int len) const
 	{
 		Qfloat *data;
@@ -1360,7 +1360,7 @@ private:
 };
 
 class SVR_Q: public Kernel
-{ 
+{
 public:
 	SVR_Q(const svm_problem& prob, const svm_parameter& param)
 	:Kernel(prob.l, prob.x, param)
@@ -1390,7 +1390,7 @@ public:
 		swap(index[i],index[j]);
 		swap(QD[i],QD[j]);
 	}
-	
+
 	Qfloat *get_Q(int i, int len) const
 	{
 		Qfloat *data;
@@ -1703,7 +1703,7 @@ static decision_function svm_train_one(
 
 // Platt's binary SVM Probablistic Output: an improvement from Lin et al.
 static void sigmoid_train(
-	int l, const double *dec_values, const double *labels, 
+	int l, const double *dec_values, const double *labels,
 	double& A, double& B)
 {
 	double prior1=0, prior0 = 0;
@@ -1712,7 +1712,7 @@ static void sigmoid_train(
 	for (i=0;i<l;i++)
 		if (labels[i] > 0) prior1+=1;
 		else prior0+=1;
-	
+
 	int max_iter=100;	// Maximal number of iterations
 	double min_step=1e-10;	// Minimal step taken in line search
 	double sigma=1e-12;	// For numerically strict PD of Hessian
@@ -1723,7 +1723,7 @@ static void sigmoid_train(
 	double fApB,p,q,h11,h22,h21,g1,g2,det,dA,dB,gd,stepsize;
 	double newA,newB,newf,d1,d2;
 	int iter;
-	
+
 	// Initial Point and Initial Fun Value
 	A=0.0; B=log((prior0+1.0)/(prior1+1.0));
 	double fval = 0.0;
@@ -1833,7 +1833,7 @@ static void multiclass_probability(int k, double **r, double *p)
 	double **Q=Malloc(double *,k);
 	double *Qp=Malloc(double,k);
 	double pQp, eps=0.005/k;
-	
+
 	for (t=0;t<k;t++)
 	{
 		p[t]=1.0/k;  // Valid if k = 1
@@ -1869,7 +1869,7 @@ static void multiclass_probability(int k, double **r, double *p)
 				max_error=error;
 		}
 		if (max_error<eps) break;
-		
+
 		for (t=0;t<k;t++)
 		{
 			double diff=(-Qp[t]+pQp)/Q[t][t];
@@ -1916,7 +1916,7 @@ static void svm_binary_svc_probability(
 		subprob.l = prob->l-(end-begin);
 		subprob.x = Malloc(struct svm_node*,subprob.l);
 		subprob.y = Malloc(double,subprob.l);
-			
+
 		k=0;
 		for(j=0;j<begin;j++)
 		{
@@ -1964,19 +1964,19 @@ static void svm_binary_svc_probability(
 				svm_predict_values(submodel,prob->x[perm[j]],&(dec_values[perm[j]]));
 				// ensure +1 -1 order; reason not using CV subroutine
 				dec_values[perm[j]] *= submodel->label[0];
-			}		
+			}
 			svm_free_and_destroy_model(&submodel);
 			svm_destroy_param(&subparam);
 		}
 		free(subprob.x);
 		free(subprob.y);
-	}		
+	}
 	sigmoid_train(prob->l,dec_values,prob->y,probA,probB);
 	free(dec_values);
 	free(perm);
 }
 
-// Return parameter of a Laplace distribution 
+// Return parameter of a Laplace distribution
 static double svm_svr_probability(
 	const svm_problem *prob, const svm_parameter *param)
 {
@@ -1992,15 +1992,15 @@ static double svm_svr_probability(
 	{
 		ymv[i]=prob->y[i]-ymv[i];
 		mae += fabs(ymv[i]);
-	}		
+	}
 	mae /= prob->l;
 	double std=sqrt(2*mae*mae);
 	int count=0;
 	mae=0;
 	for(i=0;i<prob->l;i++)
-		if (fabs(ymv[i]) > 5*std) 
+		if (fabs(ymv[i]) > 5*std)
 			count=count+1;
-		else 
+		else
 			mae+=fabs(ymv[i]);
 	mae /= (prob->l-count);
 	info("Prob. model for test data: target value = predicted value + z,\nz: Laplace distribution e^(-|z|/sigma)/(2sigma),sigma= %g\n",mae);
@@ -2049,8 +2049,8 @@ 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, 
+	// 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)
@@ -2106,7 +2106,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		model->probA = NULL; model->probB = NULL;
 		model->sv_coef = Malloc(double *,1);
 
-		if(param->probability && 
+		if(param->probability &&
 		   (param->svm_type == EPSILON_SVR ||
 		    param->svm_type == NU_SVR))
 		{
@@ -2134,7 +2134,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 				model->sv_coef[0][j] = f.alpha[i];
 				model->sv_indices[j] = i+1;
 				++j;
-			}		
+			}
 
 		free(f.alpha);
 	}
@@ -2150,9 +2150,9 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 
 		// group training data of the same class
 		svm_group_classes(prob,&nr_class,&label,&start,&count,perm);
-		if(nr_class == 1) 
+		if(nr_class == 1)
 			info("WARNING: training data in only one class. See README for details.\n");
-		
+
 		svm_node **x = Malloc(svm_node *,l);
 		int i;
 		for(i=0;i<l;i++)
@@ -2164,7 +2164,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		for(i=0;i<nr_class;i++)
 			weighted_C[i] = param->C;
 		for(i=0;i<param->nr_weight;i++)
-		{	
+		{
 			int j;
 			for(j=0;j<nr_class;j++)
 				if(param->weight_label[i] == label[j])
@@ -2176,7 +2176,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		}
 
 		// train k*(k-1)/2 models
-		
+
 		bool *nonzero = Malloc(bool,l);
 		for(i=0;i<l;i++)
 			nonzero[i] = false;
@@ -2229,11 +2229,11 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		// build output
 
 		model->nr_class = nr_class;
-		
+
 		model->label = Malloc(int,nr_class);
 		for(i=0;i<nr_class;i++)
 			model->label[i] = label[i];
-		
+
 		model->rho = Malloc(double,nr_class*(nr_class-1)/2);
 		for(i=0;i<nr_class*(nr_class-1)/2;i++)
 			model->rho[i] = f[i].rho;
@@ -2262,14 +2262,14 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 			int nSV = 0;
 			for(int j=0;j<count[i];j++)
 				if(nonzero[start[i]+j])
-				{	
+				{
 					++nSV;
 					++total_sv;
 				}
 			model->nSV[i] = nSV;
 			nz_count[i] = nSV;
 		}
-		
+
 		info("Total nSV = %d\n",total_sv);
 
 		model->l = total_sv;
@@ -2304,7 +2304,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 				int sj = start[j];
 				int ci = count[i];
 				int cj = count[j];
-				
+
 				int q = nz_start[i];
 				int k;
 				for(k=0;k<ci;k++)
@@ -2316,7 +2316,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 						model->sv_coef[i][q++] = f[p].alpha[ci+k];
 				++p;
 			}
-		
+
 		free(label);
 		free(probA);
 		free(probB);
@@ -2365,7 +2365,7 @@ void svm_cross_validation(const svm_problem *prob, const svm_parameter *param, i
 		int *index = Malloc(int,l);
 		for(i=0;i<l;i++)
 			index[i]=perm[i];
-		for (c=0; c<nr_class; c++) 
+		for (c=0; c<nr_class; c++)
 			for(i=0;i<count[c];i++)
 			{
 				int j = i+rand()%(count[c]-i);
@@ -2422,7 +2422,7 @@ void svm_cross_validation(const svm_problem *prob, const svm_parameter *param, i
 		subprob.l = l-(end-begin);
 		subprob.x = Malloc(struct svm_node*,subprob.l);
 		subprob.y = Malloc(double,subprob.l);
-			
+
 		k=0;
 		for(j=0;j<begin;j++)
 		{
@@ -2437,7 +2437,7 @@ void svm_cross_validation(const svm_problem *prob, const svm_parameter *param, i
 			++k;
 		}
 		struct svm_model *submodel = svm_train(&subprob,param);
-		if(param->probability && 
+		if(param->probability &&
 		   (param->svm_type == C_SVC || param->svm_type == NU_SVC))
 		{
 			double *prob_estimates=Malloc(double,svm_get_nr_class(submodel));
@@ -2451,7 +2451,7 @@ void svm_cross_validation(const svm_problem *prob, const svm_parameter *param, i
 		svm_free_and_destroy_model(&submodel);
 		free(subprob.x);
 		free(subprob.y);
-	}		
+	}
 	free(fold_start);
 	free(perm);
 }
@@ -2521,7 +2521,7 @@ double svm_predict_values(const svm_model *model, const svm_node *x, double* dec
 	{
 		int nr_class = model->nr_class;
 		int l = model->l;
-		
+
 		double *kvalue = Malloc(double,l);
 		for(i=0;i<l;i++)
 			kvalue[i] = Kernel::k_function(x,model->SV[i],model->param);
@@ -2544,7 +2544,7 @@ double svm_predict_values(const svm_model *model, const svm_node *x, double* dec
 				int sj = start[j];
 				int ci = model->nSV[i];
 				int cj = model->nSV[j];
-				
+
 				int k;
 				double *coef1 = model->sv_coef[j-1];
 				double *coef2 = model->sv_coef[i];
@@ -2582,7 +2582,7 @@ double svm_predict(const svm_model *model, const svm_node *x)
 	   model->param.svm_type == EPSILON_SVR ||
 	   model->param.svm_type == NU_SVR)
 		dec_values = Malloc(double, 1);
-	else 
+	else
 		dec_values = Malloc(double, nr_class*(nr_class-1)/2);
 	double pred_result = svm_predict_values(model, x, dec_values);
 	free(dec_values);
@@ -2612,7 +2612,13 @@ double svm_predict_probability(
 				pairwise_prob[j][i]=1-pairwise_prob[i][j];
 				k++;
 			}
-		multiclass_probability(nr_class,pairwise_prob,prob_estimates);
+		if (nr_class == 2)
+		{
+			prob_estimates[0] = pairwise_prob[0][1];
+			prob_estimates[1] = pairwise_prob[1][0];
+		}
+		else
+			multiclass_probability(nr_class,pairwise_prob,prob_estimates);
 
 		int prob_max_idx = 0;
 		for(i=1;i<nr_class;i++)
@@ -2624,7 +2630,7 @@ double svm_predict_probability(
 		free(pairwise_prob);
 		return model->label[prob_max_idx];
 	}
-	else 
+	else
 		return svm_predict(model, x);
 }
 
@@ -2643,7 +2649,10 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 	FILE *fp = fopen(model_file_name,"w");
 	if(fp==NULL) return -1;
 
-	char *old_locale = strdup(setlocale(LC_ALL, NULL));
+	char *old_locale = setlocale(LC_ALL, NULL);
+	if (old_locale) {
+		old_locale = strdup(old_locale);
+	}
 	setlocale(LC_ALL, "C");
 
 	const svm_parameter& param = model->param;
@@ -2655,23 +2664,23 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 		fprintf(fp,"degree %d\n", param.degree);
 
 	if(param.kernel_type == POLY || param.kernel_type == RBF || param.kernel_type == SIGMOID)
-		fprintf(fp,"gamma %g\n", param.gamma);
+		fprintf(fp,"gamma %.17g\n", param.gamma);
 
 	if(param.kernel_type == POLY || param.kernel_type == SIGMOID)
-		fprintf(fp,"coef0 %g\n", param.coef0);
+		fprintf(fp,"coef0 %.17g\n", param.coef0);
 
 	int nr_class = model->nr_class;
 	int l = model->l;
 	fprintf(fp, "nr_class %d\n", nr_class);
 	fprintf(fp, "total_sv %d\n",l);
-	
+
 	{
 		fprintf(fp, "rho");
 		for(int i=0;i<nr_class*(nr_class-1)/2;i++)
-			fprintf(fp," %g",model->rho[i]);
+			fprintf(fp," %.17g",model->rho[i]);
 		fprintf(fp, "\n");
 	}
-	
+
 	if(model->label)
 	{
 		fprintf(fp, "label");
@@ -2684,14 +2693,14 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 	{
 		fprintf(fp, "probA");
 		for(int i=0;i<nr_class*(nr_class-1)/2;i++)
-			fprintf(fp," %g",model->probA[i]);
+			fprintf(fp," %.17g",model->probA[i]);
 		fprintf(fp, "\n");
 	}
 	if(model->probB)
 	{
 		fprintf(fp, "probB");
 		for(int i=0;i<nr_class*(nr_class-1)/2;i++)
-			fprintf(fp," %g",model->probB[i]);
+			fprintf(fp," %.17g",model->probB[i]);
 		fprintf(fp, "\n");
 	}
 
@@ -2710,7 +2719,7 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 	for(int i=0;i<l;i++)
 	{
 		for(int j=0;j<nr_class-1;j++)
-			fprintf(fp, "%.16g ",sv_coef[j][i]);
+			fprintf(fp, "%.17g ",sv_coef[j][i]);
 
 		const svm_node *p = SV[i];
 
@@ -2764,6 +2773,11 @@ static char* readline(FILE *input)
 bool read_model_header(FILE *fp, svm_model* model)
 {
 	svm_parameter& param = model->param;
+	// parameters for training only won't be assigned, but arrays are assigned as NULL for safety
+	param.nr_weight = 0;
+	param.weight_label = NULL;
+	param.weight = NULL;
+
 	char cmd[81];
 	while(1)
 	{
@@ -2788,7 +2802,7 @@ bool read_model_header(FILE *fp, svm_model* model)
 			}
 		}
 		else if(strcmp(cmd,"kernel_type")==0)
-		{		
+		{
 			FSCANF(fp,"%80s",cmd);
 			int i;
 			for(i=0;kernel_type_table[i];i++)
@@ -2801,7 +2815,7 @@ bool read_model_header(FILE *fp, svm_model* model)
 			}
 			if(kernel_type_table[i] == NULL)
 			{
-				fprintf(stderr,"unknown kernel function.\n");	
+				fprintf(stderr,"unknown kernel function.\n");
 				return false;
 			}
 		}
@@ -2875,7 +2889,10 @@ svm_model *svm_load_model(const char *model_file_name)
 	FILE *fp = fopen(model_file_name,"rb");
 	if(fp==NULL) return NULL;
 
-	char *old_locale = strdup(setlocale(LC_ALL, NULL));
+	char *old_locale = setlocale(LC_ALL, NULL);
+	if (old_locale) {
+		old_locale = strdup(old_locale);
+	}
 	setlocale(LC_ALL, "C");
 
 	// read parameters
@@ -2887,7 +2904,7 @@ svm_model *svm_load_model(const char *model_file_name)
 	model->sv_indices = NULL;
 	model->label = NULL;
 	model->nSV = NULL;
-	
+
 	// read header
 	if (!read_model_header(fp, model))
 	{
@@ -2900,7 +2917,7 @@ svm_model *svm_load_model(const char *model_file_name)
 		free(model);
 		return NULL;
 	}
-	
+
 	// read sv_coef and SV
 
 	int elements = 0;
@@ -3037,9 +3054,9 @@ const char *svm_check_parameter(const svm_problem *prob, const svm_parameter *pa
 	   svm_type != EPSILON_SVR &&
 	   svm_type != NU_SVR)
 		return "unknown svm type";
-	
+
 	// kernel_type, degree
-	
+
 	int kernel_type = param->kernel_type;
 	if(kernel_type != LINEAR &&
 	   kernel_type != POLY &&
@@ -3048,10 +3065,11 @@ const char *svm_check_parameter(const svm_problem *prob, const svm_parameter *pa
 	   kernel_type != PRECOMPUTED)
 		return "unknown kernel type";
 
-	if(param->gamma < 0)
+	if((kernel_type == POLY || kernel_type == RBF || kernel_type == SIGMOID) &&
+	   param->gamma < 0)
 		return "gamma < 0";
 
-	if(param->degree < 0)
+	if(kernel_type == POLY && param->degree < 0)
 		return "degree of polynomial kernel < 0";
 
 	// cache_size,eps,C,nu,p,shrinking
@@ -3092,7 +3110,7 @@ const char *svm_check_parameter(const svm_problem *prob, const svm_parameter *pa
 
 
 	// check whether nu-svc is feasible
-	
+
 	if(svm_type == NU_SVC)
 	{
 		int l = prob->l;
@@ -3125,7 +3143,7 @@ const char *svm_check_parameter(const svm_problem *prob, const svm_parameter *pa
 				++nr_class;
 			}
 		}
-	
+
 		for(i=0;i<nr_class;i++)
 		{
 			int n1 = count[i];

data/ext/libsvm/svm.h

@@ -1,7 +1,7 @@
 #ifndef _LIBSVM_H
 #define _LIBSVM_H
 
-#define LIBSVM_VERSION 320
+#define LIBSVM_VERSION 324
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,7 +48,7 @@ struct svm_parameter
 
 //
 // svm_model
-// 
+//
 struct svm_model
 {
 	struct svm_parameter param;	/* parameter */

data/lib/libsvm/node.rb

@@ -90,13 +90,15 @@ module Libsvm
       self.value = value
     end
 
-    # Compare features for equality.
+    # Compare feature node for equality.
     #
     # Nodes with equal index and value are equal.
     #
     # @return [Boolean]
-    def ==(other)
-      index == other.index && value == other.value
+    def == (other)
+      other.class == self.class &&
+        index == other.index &&
+        value == other.value
     end
 
     def inspect

data/lib/libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.3.1"
+  VERSION = "1.4.4"
 end

data/lib/rb-libsvm.rb

@@ -0,0 +1 @@
+require 'libsvm'

data/rb-libsvm.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Ruby bindings for LIBSVM}
   s.description = %q{Self-contained LIBSVM package for Ruby (that doesn't use SWIG). LIBSVM is a popular implementation of SVM, a machine learning classifier.}
   s.required_ruby_version = '>= 1.8.7'
+  s.licenses    = ['MIT']
 
   s.rubyforge_project = "rb-libsvm"
 

data/spec/core_ext_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe "Create examples" do
-  describe "from a hash" do
+  it "from a hash" do
     example = { 11 => 0.11, 21 => 0.21, 101 => 0.99 }.to_example.sort_by(&:index)
-    example.should == Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 }).sort_by(&:index)
+    expect(example).to eq(Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 }).sort_by(&:index))
   end
 
   describe "from an array of tuples" do
     it "can create example from array of pairs" do
       example = [ [11, 0.11], [21, 0.21], [101, 0.99] ].to_example
-      example.should == Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 }).sort_by(&:index)
+      expect(example).to eq(Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 }).sort_by(&:index))
     end
   end
 end

data/spec/model_spec.rb

@@ -70,6 +70,10 @@ describe "A saved model" do
     expect(Model.load(@filename)).to be_an_instance_of(Model)
   end
 
+  it "missing model raises exception" do
+    expect{Model.load("missing.model")}.to raise_error(IOError, /unable to load model from file: "missing.model"/)
+  end
+
   after(:each) do
     File.delete(@filename) rescue nil
   end

data/spec/node_spec.rb

@@ -28,43 +28,50 @@ describe "A Node" do
   end
 
   it "can be created" do
-    @node.should_not be_nil
+    expect(@node).not_to be_nil
   end
 
-  it "does not segfault on setting properties" do
+  it "has in :index property" do
     @node.index = 99
-    @node.index.should == 99
+    expect(@node.index).to eq(99)
+  end
+
+  it "has a :value porperty" do
     @node.value = 3.141
-    @node.value.should be_within(0.00001).of(3.141)
+    expect(@node.value).to be_within(0.00001).of(3.141)
   end
 
   it "has inited properties" do
-    @node.index.should == 0
-    @node.value.should be_within(0.00001).of(0)
+    expect(@node.index).to eq(0)
+    expect(@node.value).to be_within(0.00001).of(0)
   end
 
   it "class can create nodes from an array" do
     ary = Node.features([0.1, 0.2, 0.3, 0.4, 0.5])
-    ary.map {|n| n.class.should == Node}
-    ary.map {|n| n.value }.should == [0.1, 0.2, 0.3, 0.4, 0.5]
-    ary.map {|n| n.index }.should == [0, 1, 2, 3, 4]
+    expect(ary).to all(be_a(Node))
+    expect(ary.map(&:value).sort).to eq([0.1, 0.2, 0.3, 0.4, 0.5])
+    expect(ary.map(&:index).sort).to eq([0, 1, 2, 3, 4])
   end
 
   it "class can create nodes from variable parameters" do
     ary = Node.features(0.1, 0.2, 0.3, 0.4, 0.5)
-    ary.map {|n| Node.should === n }
-    ary.map {|n| n.value }.should == [0.1, 0.2, 0.3, 0.4, 0.5]
-    ary.map {|n| n.index }.should == [0, 1, 2, 3, 4]
+    expect(ary).to all(be_a(Node))
+    expect(ary.map(&:value).sort).to eq([0.1, 0.2, 0.3, 0.4, 0.5])
+    expect(ary.map(&:index).sort).to eq([0, 1, 2, 3, 4])
   end
 
   it "class can create nodes from hash" do
     ary = Node.features(3=>0.3, 5=>0.5, 6=>0.6, 10=>1.0)
-    ary.map {|n| n.class.should == Node}
-    ary.map {|n| n.value }.sort.should == [0.3, 0.5, 0.6, 1.0]
-    ary.map {|n| n.index }.sort.should == [3, 5, 6, 10]
+    expect(ary).to all(be_a(Node))
+    expect(ary.map(&:value).sort).to eq([0.3, 0.5, 0.6, 1.0])
+    expect(ary.map(&:index).sort).to eq([3, 5, 6, 10])
+  end
+
+  it "compares with nil" do
+    expect(Node.new(1,2)).to_not eq(nil)
   end
 
-  it "implements a value-like equality, not identity-notion" do
-    Node[1, 0.1].should == Node[1, 0.1]
+  it "implements value equality" do
+    expect(Node[1, 0.1]).to eq(Node[1, 0.1])
   end
 end

data/spec/parameter_spec.rb

@@ -5,72 +5,71 @@ describe "A Parameter has accessors for" do
     @p = Libsvm::SvmParameter.new
   end
   it "int svm_type" do
-    SvmType::C_SVC.should == 0
+    expect(SvmType::C_SVC).to eq(0)
     @p.svm_type = SvmType::C_SVC
-    @p.svm_type.should == SvmType::C_SVC
+    expect(@p.svm_type).to eq(SvmType::C_SVC)
   end
 
   it "int kernel_type" do
-    KernelType::RBF.should == 2
+    expect(KernelType::RBF).to eq(2)
     @p.kernel_type = KernelType::RBF
-    @p.kernel_type.should == KernelType::RBF
+    expect(@p.kernel_type).to eq(KernelType::RBF)
   end
 
   it "int degree" do
     @p.degree = 99
-    @p.degree.should == 99
+    expect(@p.degree).to eq(99)
   end
 
   it "double gamma" do
     @p.gamma = 0.33
-    @p.gamma.should == 0.33
+    expect(@p.gamma).to eq(0.33)
   end
 
   it "double coef0" do
     @p.coef0 = 0.99
-    @p.coef0.should == 0.99
+    expect(@p.coef0).to eq(0.99)
   end
 
   it "double cache_size" do
     @p.cache_size = 0.77
-    @p.cache_size.should == 0.77
+    expect(@p.cache_size).to eq(0.77)
   end
 
   it "double eps" do
     @p.eps = 0.111
-    @p.eps.should == 0.111
+    expect(@p.eps).to eq(0.111)
     @p.eps = 0.112
-    @p.eps.should == 0.112
+    expect(@p.eps).to eq(0.112)
   end
 
   it "double C" do
     @p.c = 3.141
-    @p.c.should == 3.141
+    expect(@p.c).to eq(3.141)
   end
 
   it "can set and read weights (weight, weight_label, nr_weight members from struct)" do
-    @p.label_weights = {1=> 1.2, 3=>0.2, 5=>0.888}
-    @p.label_weights.should == {1=> 1.2, 3=>0.2, 5=>0.888}
+    @p.label_weights = {1 => 1.2, 3 => 0.2, 5 => 0.888}
+    expect(@p.label_weights).to eq({1 => 1.2, 3 => 0.2, 5 => 0.888})
   end
 
-
   it "double nu" do
     @p.nu = 1.1
-    @p.nu.should == 1.1
+    expect(@p.nu).to eq(1.1)
   end
 
   it "double p" do
     @p.p = 0.123
-    @p.p.should == 0.123
+    expect(@p.p).to eq(0.123)
   end
 
-  it "int shrinking" do
+  it "boolean-as-int shrinking" do
     @p.shrinking = 22
-    @p.shrinking.should == 22
+    expect(@p.shrinking).to eq(22)
   end
 
-  it "int probability" do
+  it "boolean-as-int probability" do
     @p.probability = 35
-    @p.probability.should == 35
+    expect(@p.probability).to eq(35)
   end
 end

data/spec/problem_spec.rb

@@ -12,26 +12,30 @@ describe "A Problem" do
   it "examples get stored and retrieved" do
     @problem.set_examples([1,2,1,2], @features)
     labels, examples =  @problem.examples
-    labels.size.should == 4
-    examples.size.should == 4
-    examples.map {|x|x.size}.should == [4,4,4,4]
-    examples.first.map {|node| node.index}.should == [0,1,2,3]
-    examples.first.map {|node| node.value}.should == [0.2,0.3,0.4,0.4]
+    expect(labels.size).to eq(4)
+    expect(examples.size).to eq(4)
+    expect(examples.map {|x|x.size}).to eq([4,4,4,4])
+    expect(examples.first.map {|node| node.index}).to eq([0,1,2,3])
+    expect(examples.first.map {|node| node.value}).to eq([0.2,0.3,0.4,0.4])
   end
 
   it "can be populated" do
-    examples = [Node.features(0.2,0.3,0.4,0.4),
-                Node.features(0.1,0.5,0.1,0.9),
-                Node.features(0.2,0.2,0.6,0.5),
-                Node.features(0.3,0.1,0.5,0.9)]
-    @problem.set_examples([1,2,1,2], examples)
+    examples = [ Node.features(0.2,0.3,0.4,0.4),
+                 Node.features(0.1,0.5,0.1,0.9),
+                 Node.features(0.2,0.2,0.6,0.5),
+                 Node.features(0.3,0.1,0.5,0.9) ]
+    expect {
+      @problem.set_examples([1,2,1,2], examples)
+    }.to_not raise_error
   end
 
-  it "can be set twice over" do
-    features = [Node.features(0.2, 0.3, 0.4, 0.4), Node.features(0.3,0.1,0.5,0.9)]
-    @problem.set_examples([1,2], features)
-    features = [Node.features(0.2, 0.3, 0.4, 0.4), Node.features(0.3,0.1,0.5,0.9)]
-    @problem.set_examples([8,2], features)
+  it "can be set twice" do
+    expect {
+      features = [Node.features(0.2, 0.3, 0.4, 0.4), Node.features(0.3,0.1,0.5,0.9)]
+      @problem.set_examples([1,2], features)
+      features = [Node.features(0.2, 0.3, 0.4, 0.4), Node.features(0.3,0.1,0.5,0.9)]
+      @problem.set_examples([8,2], features)
+    }.to_not raise_error
   end
 
 end

data/spec/usage_spec.rb

@@ -15,7 +15,7 @@ describe "Basic usage" do
 
   it "has a nice API" do
     example = {11 => 0.11, 21 => 0.21, 101 => 0.99 }.to_example
-    example.should == Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 })
+    expect(example).to eq(Node.features({11 => 0.11, 21 => 0.21, 101 => 0.99 }))
   end
 
   it "is as in [PCI,217]" do
@@ -26,13 +26,13 @@ describe "Basic usage" do
     model = Model.train(@problem, @parameter)
 
     pred = model.predict(Node.features(1, 1, 1))
-    pred.should == 1.0
+    expect(pred).to eq(1.0)
 
     pred = model.predict(Node.features(-1, 1, -1))
-    pred.should == -1.0
+    expect(pred).to eq(-1.0)
 
     pred = model.predict(Node.features(-1, 55, -1))
-    pred.should == -1.0
+    expect(pred).to eq(-1.0)
   end
 
   it "kernel parameter use" do
@@ -42,6 +42,6 @@ describe "Basic usage" do
 
     model = Model.train(@problem, @parameter)
 
-    model.predict(Node.features(1, 2, 3)).should == 2
+    expect(model.predict(Node.features(1, 2, 3))).to eq(2)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.4
 platform: ruby
 authors:
 - C. Florian Ebeling
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -73,6 +73,7 @@ files:
 - lib/libsvm/problem.rb
 - lib/libsvm/svm_parameter.rb
 - lib/libsvm/version.rb
+- lib/rb-libsvm.rb
 - rb-libsvm.gemspec
 - spec/core_ext_spec.rb
 - spec/model_spec.rb
@@ -82,7 +83,8 @@ files:
 - spec/spec_helper.rb
 - spec/usage_spec.rb
 homepage: https://github.com/febeling/rb-libsvm
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -99,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rb-libsvm
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for LIBSVM
@@ -112,4 +113,3 @@ test_files:
 - spec/problem_spec.rb
 - spec/spec_helper.rb
 - spec/usage_spec.rb
-has_rdoc: