rb-libsvm 1.0.5 → 1.0.6

data/.travis.yml

@@ -1,2 +1,4 @@
-rvm: 1.9.2
-
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/LIBSVM-LICENSE

@@ -0,0 +1,30 @@
+Copyright (c) 2000-2012 Chih-Chung Chang and Chih-Jen Lin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither name of copyright holders nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 Caspar Florian Ebeling
+Copyright (c) 2004-2012 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

@@ -52,9 +52,14 @@ Currently using libsvm version 3.1
 Written by C. Florian Ebeling. This software can be freely used under
 the terms of the MIT license, see file MIT-LICENSE.
 
+This package includes the source of LIBSVM, which is free to use under
+the license in the file LIBSVM-LICENSE.
+
 ## Contributors
 
-Rimas Silkaitis
+[Rimas Silkaitis](https://github.com/neovintage)
+
+[Aleksander Pohl](https://github.com/apohllo)
 
 ### Posts about SVMs and Ruby
 

data/examples/text.rb

@@ -0,0 +1,53 @@
+# In this example let's have 3 documents.  2 of the documents 
+# will go into our training set and 1 will be used as our 
+# test set
+#
+# Before we can actually classify the documents we need to 
+# create integer representations of each of the documents.
+# The best way to do this would be to use ruby to accomplish
+# the task.
+#
+require 'libsvm'
+
+# Let take our documents and create word vectors out of them.
+# I've included labels for these already.  1 signifies that
+# the document was funny  0 means that it wasn't
+#
+documents = [[1, "Why did the chicken cross the road? Because a car was coming"],
+             [0, "You're an elevator tech? I bet that job has its ups and downs"]]
+
+# Lets create a dictionary of unique words and then we can
+# create our vectors.  This is a very simple example.  If 
+# you were doing this in a production system you'd do things
+# like stemming and removing all punctuation.
+#
+dictionary = documents.map(&:last).flatten.uniq
+dictionary = dictionary.map { |x| x.gsub(/\?|,|\.|\-/,'') }
+
+training_set = []
+docments.each do |doc|
+  training_set << [doc.first, Libsvm::Node.features(dictionary.map { |x| doc.include?(x) ? 1 : 0 })]
+end
+
+# Lets set up libsvm so that we can test our prediction
+# using the test set
+#
+problem = Libsvm::Problem.new
+parameter = Libsvm::SvmParameter.new
+
+parameter.cache_size = 1 # in megabytes
+parameter.eps = 0.001
+parameter.c   = 10
+
+# train classifier using training set
+#
+problem.set_examples(training_set.map(&:first), training_set.map(&:last))
+model = Libsvm::Model.train(problem, parameter)
+
+# Now lets test our classifier using the test set
+#
+test_set = [1, "Why did the chicken cross the road? To get the worm"]
+test_document = test_set.last.split(' ').map{ |x| x.gsub(/\?|,|\.|\-/,'') }
+
+pred = model.predict(Libsvm::Node.features(dictionary.map{|x| test_document.include?(x) }))
+puts "Predicted #{pred}"

data/ext/rb-libsvm/svm.cpp

@@ -5,6 +5,8 @@
 #include <float.h>
 #include <string.h>
 #include <stdarg.h>
+#include <limits.h>
+#include <locale.h>
 #include "svm.h"
 int libsvm_version = LIBSVM_VERSION;
 typedef float Qfloat;
@@ -42,7 +44,7 @@ static void print_string_stdout(const char *s)
 	fflush(stdout);
 }
 static void (*svm_print_string) (const char *) = &print_string_stdout;
-#if 1
+#if 0
 static void info(const char *fmt,...)
 {
 	char buf[BUFSIZ];
@@ -474,7 +476,7 @@ void Solver::reconstruct_gradient()
 			nr_free++;
 
 	if(2*nr_free < active_size)
-		info("\nWarning: using -h 0 may be faster\n");
+		info("\nWARNING: using -h 0 may be faster\n");
 
 	if (nr_free*l > 2*active_size*(l-active_size))
 	{
@@ -556,9 +558,10 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 	// optimization step
 
 	int iter = 0;
+	int max_iter = max(10000000, l>INT_MAX/100 ? INT_MAX : 100*l);
 	int counter = min(l,1000)+1;
-
-	while(1)
+	
+	while(iter < max_iter)
 	{
 		// show progress and do shrinking
 
@@ -576,7 +579,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 			reconstruct_gradient();
 			// reset active set size and check
 			active_size = l;
-			// info("*");
+			info("*");
 			if(select_working_set(i,j)!=0)
 				break;
 			else
@@ -725,6 +728,18 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 		}
 	}
 
+	if(iter >= max_iter)
+	{
+		if(active_size < l)
+		{
+			// reconstruct the whole gradient to calculate objective value
+			reconstruct_gradient();
+			active_size = l;
+			info("*");
+		}
+		info("\nWARNING: reaching max number of iterations");
+	}
+
 	// calculate rho
 
 	si->rho = calculate_rho();
@@ -756,7 +771,7 @@ void Solver::Solve(int l, const QMatrix& Q, const double *p_, const schar *y_,
 	si->upper_bound_p = Cp;
 	si->upper_bound_n = Cn;
 
-	// info("\noptimization finished, #iter = %d\n",iter);
+	info("\noptimization finished, #iter = %d\n",iter);
 
 	delete[] p;
 	delete[] y;
@@ -929,7 +944,7 @@ void Solver::do_shrinking()
 		unshrink = true;
 		reconstruct_gradient();
 		active_size = l;
-		// info("*");
+		info("*");
 	}
 
 	for(i=0;i<active_size;i++)
@@ -1448,7 +1463,7 @@ static void solve_c_svc(
 		sum_alpha += alpha[i];
 
 	if (Cp==Cn)
-		// info("nu = %f\n", sum_alpha/(Cp*prob->l));
+		info("nu = %f\n", sum_alpha/(Cp*prob->l));
 
 	for(i=0;i<l;i++)
 		alpha[i] *= y[i];
@@ -1498,7 +1513,7 @@ static void solve_nu_svc(
 		alpha, 1.0, 1.0, param->eps, si,  param->shrinking);
 	double r = si->r;
 
-	// info("C = %f\n",1/r);
+	info("C = %f\n",1/r);
 
 	for(i=0;i<l;i++)
 		alpha[i] *= y[i]/r;
@@ -1575,7 +1590,7 @@ static void solve_epsilon_svr(
 		alpha[i] = alpha2[i] - alpha2[i+l];
 		sum_alpha += fabs(alpha[i]);
 	}
-	// info("nu = %f\n",sum_alpha/(param->C*l));
+	info("nu = %f\n",sum_alpha/(param->C*l));
 
 	delete[] alpha2;
 	delete[] linear_term;
@@ -1610,7 +1625,7 @@ static void solve_nu_svr(
 	s.Solve(2*l, SVR_Q(*prob,*param), linear_term, y,
 		alpha2, C, C, param->eps, si, param->shrinking);
 
-	// info("epsilon = %f\n",-si->r);
+	info("epsilon = %f\n",-si->r);
 
 	for(i=0;i<l;i++)
 		alpha[i] = alpha2[i] - alpha2[i+l];
@@ -1654,7 +1669,7 @@ static decision_function svm_train_one(
 			break;
 	}
 
-	// info("obj = %f, rho = %f\n",si.obj,si.rho);
+	info("obj = %f, rho = %f\n",si.obj,si.rho);
 
 	// output SVs
 
@@ -1678,7 +1693,7 @@ static decision_function svm_train_one(
 		}
 	}
 
-	// info("nSV = %d, nBSV = %d\n",nSV,nBSV);
+	info("nSV = %d, nBSV = %d\n",nSV,nBSV);
 
 	decision_function f;
 	f.alpha = alpha;
@@ -2114,7 +2129,10 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 		int *perm = Malloc(int,l);
 
 		// group training data of the same class
-		svm_group_classes(prob,&nr_class,&label,&start,&count,perm);		
+		svm_group_classes(prob,&nr_class,&label,&start,&count,perm);
+		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++)
@@ -2132,7 +2150,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 				if(param->weight_label[i] == label[j])
 					break;
 			if(j == nr_class)
-				fprintf(stderr,"warning: class label %d specified in weight is not found\n", param->weight_label[i]);
+				fprintf(stderr,"WARNING: class label %d specified in weight is not found\n", param->weight_label[i]);
 			else
 				weighted_C[j] *= param->weight[i];
 		}
@@ -2232,7 +2250,7 @@ svm_model *svm_train(const svm_problem *prob, const svm_parameter *param)
 			nz_count[i] = nSV;
 		}
 		
-		// info("Total nSV = %d\n",total_sv);
+		info("Total nSV = %d\n",total_sv);
 
 		model->l = total_sv;
 		model->SV = Malloc(svm_node *,total_sv);
@@ -2440,13 +2458,14 @@ double svm_get_svr_probability(const svm_model *model)
 
 double svm_predict_values(const svm_model *model, const svm_node *x, double* dec_values)
 {
+	int i;
 	if(model->param.svm_type == ONE_CLASS ||
 	   model->param.svm_type == EPSILON_SVR ||
 	   model->param.svm_type == NU_SVR)
 	{
 		double *sv_coef = model->sv_coef[0];
 		double sum = 0;
-		for(int i=0;i<model->l;i++)
+		for(i=0;i<model->l;i++)
 			sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param);
 		sum -= model->rho[0];
 		*dec_values = sum;
@@ -2458,7 +2477,6 @@ double svm_predict_values(const svm_model *model, const svm_node *x, double* dec
 	}
 	else
 	{
-		int i;
 		int nr_class = model->nr_class;
 		int l = model->l;
 		
@@ -2583,6 +2601,9 @@ 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));
+	setlocale(LC_ALL, "C");
+
 	const svm_parameter& param = model->param;
 
 	fprintf(fp,"svm_type %s\n", svm_type_table[param.svm_type]);
@@ -2661,6 +2682,10 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 			}
 		fprintf(fp, "\n");
 	}
+
+	setlocale(LC_ALL, old_locale);
+	free(old_locale);
+
 	if (ferror(fp) != 0 || fclose(fp) != 0) return -1;
 	else return 0;
 }
@@ -2690,7 +2715,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));
+	setlocale(LC_ALL, "C");
+
 	// read parameters
 
 	svm_model *model = Malloc(svm_model,1);
@@ -2721,6 +2749,9 @@ svm_model *svm_load_model(const char *model_file_name)
 			if(svm_type_table[i] == NULL)
 			{
 				fprintf(stderr,"unknown svm type.\n");
+				
+				setlocale(LC_ALL, old_locale);
+				free(old_locale);
 				free(model->rho);
 				free(model->label);
 				free(model->nSV);
@@ -2743,6 +2774,9 @@ svm_model *svm_load_model(const char *model_file_name)
 			if(kernel_type_table[i] == NULL)
 			{
 				fprintf(stderr,"unknown kernel function.\n");
+				
+				setlocale(LC_ALL, old_locale);
+				free(old_locale);
 				free(model->rho);
 				free(model->label);
 				free(model->nSV);
@@ -2807,6 +2841,9 @@ svm_model *svm_load_model(const char *model_file_name)
 		else
 		{
 			fprintf(stderr,"unknown text in model file: [%s]\n",cmd);
+			
+			setlocale(LC_ALL, old_locale);
+			free(old_locale);
 			free(model->rho);
 			free(model->label);
 			free(model->nSV);
@@ -2879,6 +2916,9 @@ svm_model *svm_load_model(const char *model_file_name)
 	}
 	free(line);
 
+	setlocale(LC_ALL, old_locale);
+	free(old_locale);
+
 	if (ferror(fp) != 0 || fclose(fp) != 0)
 		return NULL;
 
@@ -2888,13 +2928,13 @@ svm_model *svm_load_model(const char *model_file_name)
 
 void svm_free_model_content(svm_model* model_ptr)
 {
-  if(model_ptr->free_sv && model_ptr->l > 0 && model_ptr->SV != NULL)
-    free((void *)(model_ptr->SV[0]));
-  if(model_ptr->sv_coef)
-  {
-    for(int i=0;i<model_ptr->nr_class-1;i++)
-      free(model_ptr->sv_coef[i]);
-  }
+	if(model_ptr->free_sv && model_ptr->l > 0 && model_ptr->SV != NULL)
+		free((void *)(model_ptr->SV[0]));
+	if(model_ptr->sv_coef)
+	{
+		for(int i=0;i<model_ptr->nr_class-1;i++)
+			free(model_ptr->sv_coef[i]);
+	}
 
 	free(model_ptr->SV);
 	model_ptr->SV = NULL;
@@ -2920,12 +2960,12 @@ void svm_free_model_content(svm_model* model_ptr)
 
 void svm_free_and_destroy_model(svm_model** model_ptr_ptr)
 {
-  if(model_ptr_ptr != NULL && *model_ptr_ptr != NULL)
-  {
-    svm_free_model_content(*model_ptr_ptr);
+	if(model_ptr_ptr != NULL && *model_ptr_ptr != NULL)
+	{
+		svm_free_model_content(*model_ptr_ptr);
 		free(*model_ptr_ptr);
-    *model_ptr_ptr = NULL;
-  }
+		*model_ptr_ptr = NULL;
+	}
 }
 
 void svm_destroy_param(svm_parameter* param)

data/ext/rb-libsvm/svm.h

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

data/lib/libsvm.rb

@@ -1,8 +1,8 @@
 require 'rb-libsvm/version'
 require 'rb-libsvm/libsvm'
+require 'libsvm/node'
 
 module Libsvm
-
   module CoreExtensions
     module Collection
       def to_example
@@ -10,48 +10,6 @@ module Libsvm
       end
     end
   end
-
-  class Node
-
-    class << self
-
-      def features(*vargs)
-        array_of_nodes = []
-				if vargs.size == 1
-					if vargs.first.class == Array
-						vargs.first.each_with_index do |value, index|
-							array_of_nodes << Node.new(index.to_i, value.to_f)
-						end
-					elsif vargs.first.class == Hash
-						vargs.first.each do |index, value|
-							array_of_nodes << Node.new(index.to_i, value.to_f)
-						end
-					else
-						raise(ArgumentError.new("Node features need to be a Hash, Array or Floats"))
-					end
-				else
-					vargs.each_with_index do |value, index|
-						array_of_nodes << Node.new(index.to_i, value.to_f)
-					end
-				end
-				array_of_nodes
-      end
-
-      def [](index, value)
-        new(index, value)
-      end
-    end
-
-    def initialize(index=0, value=0.0)
-      self.index = index
-      self.value = value
-    end
-
-    def ==(other)
-      index == other.index && value == other.value
-    end
-  end
-
 end
 
 

data/lib/libsvm/node.rb

@@ -0,0 +1,40 @@
+module Libsvm
+  class Node
+    class << self
+      def features(*vargs)
+        array_of_nodes = []
+        if vargs.size == 1
+          if vargs.first.class == Array
+            vargs.first.each_with_index do |value, index|
+              array_of_nodes << Node.new(index.to_i, value.to_f)
+            end
+          elsif vargs.first.class == Hash
+            vargs.first.each do |index, value|
+              array_of_nodes << Node.new(index.to_i, value.to_f)
+            end
+          else
+            raise(ArgumentError.new("Node features need to be a Hash, Array or Floats"))
+          end
+        else
+          vargs.each_with_index do |value, index|
+            array_of_nodes << Node.new(index.to_i, value.to_f)
+          end
+        end
+        array_of_nodes
+      end
+
+      def [](index, value)
+        new(index, value)
+      end
+    end
+
+    def initialize(index=0, value=0.0)
+      self.index = index
+      self.value = value
+    end
+
+    def ==(other)
+      index == other.index && value == other.value
+    end
+  end
+end

data/lib/rb-libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/rb-libsvm.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+
   # specify any dependencies here; for example:
   s.add_development_dependency('rake-compiler')
   s.add_development_dependency('rspec', '>= 2.7.0')

data/spec/model_spec.rb

@@ -2,94 +2,94 @@ require "spec_helper"
 
 module ModelSpecHelper
 
-	def create_example
-		Node.features(0.2, 0.3, 0.4, 0.5)
-	end
-
-	def create_problem
-		problem = Problem.new
-		features = [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], features)
-		problem
-	end
-
-	def create_parameter
-		parameter = SvmParameter.new
-		parameter.cache_size = 50 # mb
-		parameter.eps = 0.01
-		parameter.c = 10
-		parameter
-	end
+  def create_example
+    Node.features(0.2, 0.3, 0.4, 0.5)
+  end
+
+  def create_problem
+    problem = Problem.new
+    features = [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], features)
+    problem
+  end
+
+  def create_parameter
+    parameter = SvmParameter.new
+    parameter.cache_size = 50 # mb
+    parameter.eps = 0.01
+    parameter.c = 10
+    parameter
+  end
 
 end
 
 describe "The Libsvm::Model class interface" do
-	include ModelSpecHelper
-
-	before(:each) do
-		@problem = create_problem
-		@parameter = create_parameter
-	end
-
-	it "results from training on a problem under a certain parameter set" do
-		model = Model.train(@problem,@parameter)
-		model.should_not be_nil
-	end
-
-	it "can do cross-validation" do
-		labels = Model.cross_validation(@problem, @parameter, fold=2)
-		labels.should == [anything, anything, anything, anything]
-	end
+  include ModelSpecHelper
+
+  before(:each) do
+    @problem = create_problem
+    @parameter = create_parameter
+  end
+
+  it "results from training on a problem under a certain parameter set" do
+    model = Model.train(@problem,@parameter)
+    model.should_not be_nil
+  end
+
+  it "can do cross-validation" do
+    labels = Model.cross_validation(@problem, @parameter, fold=2)
+    labels.should == [anything, anything, anything, anything]
+  end
 end
 
 describe "A saved model" do
-	include ModelSpecHelper
-
-	before(:each) do
-		@filename = "svm_model.model"
-		model = Model.train(create_problem, create_parameter)
-		model.save(@filename)
-	end
-
-	it "can be loaded" do
-		model = Model.load(@filename)
-		model.should_not be_nil
-	end
-
-	after(:each) do
-		File.delete(@filename) rescue nil
-	end
+  include ModelSpecHelper
+
+  before(:each) do
+    @filename = "svm_model.model"
+    model = Model.train(create_problem, create_parameter)
+    model.save(@filename)
+  end
+
+  it "can be loaded" do
+    model = Model.load(@filename)
+    model.should_not be_nil
+  end
+
+  after(:each) do
+    File.delete(@filename) rescue nil
+  end
 end
 
 describe "An Libsvm model" do
-	include ModelSpecHelper
-
-	before(:each) do
-		@problem = create_problem
-		@parameter = create_parameter
-		@model = Model.train(@problem, @parameter)
-	end
-
-	it "can be saved to a file" do
-		file_path = "svm_model.model"
-		@model.save(file_path)
-		File.exist?(file_path).should be_true
-	end
-
-	it "can be asked for it's svm_type" do
-		@model.svm_type.should == SvmType::C_SVC
-	end
-
-	it "can be asked for it's number of classes (aka. labels)" do
-		@model.classes.should == 2
-	end
-
-	it "can predict" do
-		prediction = @model.predict(create_example)
-		prediction.should_not be_nil
-	end
+  include ModelSpecHelper
+
+  before(:each) do
+    @problem = create_problem
+    @parameter = create_parameter
+    @model = Model.train(@problem, @parameter)
+  end
+
+  it "can be saved to a file" do
+    file_path = "svm_model.model"
+    @model.save(file_path)
+    File.exist?(file_path).should be_true
+  end
+
+  it "can be asked for it's svm_type" do
+    @model.svm_type.should == SvmType::C_SVC
+  end
+
+  it "can be asked for it's number of classes (aka. labels)" do
+    @model.classes.should == 2
+  end
+
+  it "can predict" do
+    prediction = @model.predict(create_example)
+    prediction.should_not be_nil
+  end
 end
 

data/spec/node_spec.rb

@@ -1,68 +1,68 @@
 require "spec_helper"
 
 describe "construction of a Node" do
-	it "using the properties" do
-		n = Node.new
-		n.index = 11
-		n.value = 0.11
-		n.index.should == 11
-		n.value.should be_within(0.0001).of(0.11)
-	end
+  it "using the properties" do
+    n = Node.new
+    n.index = 11
+    n.value = 0.11
+    n.index.should == 11
+    n.value.should be_within(0.0001).of(0.11)
+  end
 
-	it "using the :[] method" do
-		n = Node[12, 0.12]
-		n.index.should == 12
-		n.value.should be_within(0.00001).of(0.12)
-	end
+  it "using the :[] method" do
+    n = Node[12, 0.12]
+    n.index.should == 12
+    n.value.should be_within(0.00001).of(0.12)
+  end
 
-	it "using the constructor parameters" do
-		n = Node.new(14, 0.14)
-		n.index.should == 14
-		n.value.should be_within(0.0001).of(0.14)
-	end
+  it "using the constructor parameters" do
+    n = Node.new(14, 0.14)
+    n.index.should == 14
+    n.value.should be_within(0.0001).of(0.14)
+  end
 end
 
 describe "A Node" do
-	before do
-		@node = Node.new
-	end
+  before do
+    @node = Node.new
+  end
 
-	it "can be created" do
-		@node.should_not be_nil
-	end
+  it "can be created" do
+    @node.should_not be_nil
+  end
 
-	it "does not segfault on setting properties" do
-		@node.index = 99
-		@node.index.should == 99
-		@node.value = 3.141
-		@node.value.should be_within(0.00001).of(3.141)
-	end
+  it "does not segfault on setting properties" do
+    @node.index = 99
+    @node.index.should == 99
+    @node.value = 3.141
+    @node.value.should 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)
-	end
+  it "has inited properties" do
+    @node.index.should == 0
+    @node.value.should 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]
-	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]
+  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]
-	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]
+  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]
-	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]
+  end
 
-	it "implements a value-like equality, not identity-notion" do
-		Node[1, 0.1].should == Node[1, 0.1]
-	end
+  it "implements a value-like equality, not identity-notion" do
+    Node[1, 0.1].should == Node[1, 0.1]
+  end
 end

data/spec/parameter_spec.rb

@@ -1,76 +1,76 @@
 require "spec_helper"
 
 describe "A Parameter has accessors for" do
-	before do
-		@p = Libsvm::SvmParameter.new
-	end
-	it "int svm_type" do
-		SvmType::C_SVC.should == 0
-		@p.svm_type = SvmType::C_SVC
-		@p.svm_type.should == SvmType::C_SVC
-	end
+  before do
+    @p = Libsvm::SvmParameter.new
+  end
+  it "int svm_type" do
+    SvmType::C_SVC.should == 0
+    @p.svm_type = SvmType::C_SVC
+    @p.svm_type.should == SvmType::C_SVC
+  end
 
-	it "int kernel_type" do
-		KernelType::RBF.should == 2
-		@p.kernel_type = KernelType::RBF
-		@p.kernel_type.should == KernelType::RBF
-	end
+  it "int kernel_type" do
+    KernelType::RBF.should == 2
+    @p.kernel_type = KernelType::RBF
+    @p.kernel_type.should == KernelType::RBF
+  end
 
-	it "int degree" do
-		@p.degree = 99
-		@p.degree.should == 99
-	end
+  it "int degree" do
+    @p.degree = 99
+    @p.degree.should == 99
+  end
 
-	it "double gamma" do
-		@p.gamma = 0.33
-		@p.gamma.should == 0.33
-	end
+  it "double gamma" do
+    @p.gamma = 0.33
+    @p.gamma.should == 0.33
+  end
 
-	it "double coef0" do
-		@p.coef0 = 0.99
-		@p.coef0.should == 0.99
-	end
+  it "double coef0" do
+    @p.coef0 = 0.99
+    @p.coef0.should == 0.99
+  end
 
-	it "double cache_size" do
-		@p.cache_size = 0.77
-		@p.cache_size.should == 0.77
-	end
+  it "double cache_size" do
+    @p.cache_size = 0.77
+    @p.cache_size.should == 0.77
+  end
 
-	it "double eps" do
-		@p.eps = 0.111
-		@p.eps.should == 0.111
-		@p.eps = 0.112
-		@p.eps.should == 0.112
-	end
+  it "double eps" do
+    @p.eps = 0.111
+    @p.eps.should == 0.111
+    @p.eps = 0.112
+    @p.eps.should == 0.112
+  end
 
-	it "double C" do
-		@p.c = 3.141
-		@p.c.should == 3.141
-	end
+  it "double C" do
+    @p.c = 3.141
+    @p.c.should == 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}
-	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}
+  end
 
 
-	it "double nu" do
-		@p.nu = 1.1
-		@p.nu.should == 1.1
-	end
+  it "double nu" do
+    @p.nu = 1.1
+    @p.nu.should == 1.1
+  end
 
-	it "double p" do
-		@p.p = 0.123
-		@p.p.should == 0.123
-	end
+  it "double p" do
+    @p.p = 0.123
+    @p.p.should == 0.123
+  end
 
-	it "int shrinking" do
-		@p.shrinking = 22
-		@p.shrinking.should == 22
-	end
+  it "int shrinking" do
+    @p.shrinking = 22
+    @p.shrinking.should == 22
+  end
 
-	it "int probability" do
-		@p.probability = 35
-		@p.probability.should == 35
-	end
+  it "int probability" do
+    @p.probability = 35
+    @p.probability.should == 35
+  end
 end

data/spec/problem_spec.rb

@@ -1,37 +1,37 @@
 require 'spec_helper'
 
 describe "A Problem" do
-	before(:each) do
-		@problem = Problem.new
-		@features = [ 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) ]
-	end
+  before(:each) do
+    @problem = Problem.new
+    @features = [ 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) ]
+  end
 
-	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]
-	end
+  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]
+  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)
-	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)
+  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)
+  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)
-	end
-		
 end

data/spec/spec_helper.rb

@@ -5,6 +5,6 @@ require 'libsvm'
 include Libsvm
 
 RSpec.configure do |config|
-	config.color_enabled = true
+  config.color_enabled = true
   # config.formatter     = 'documentation'
 end

data/spec/usage_spec.rb

@@ -1,47 +1,47 @@
 require 'spec_helper'
 
 describe "Basic usage" do
-	before do
-		@problem = Problem.new
-		@parameter = SvmParameter.new
-		@parameter.cache_size = 1 # mb
+  before do
+    @problem = Problem.new
+    @parameter = SvmParameter.new
+    @parameter.cache_size = 1 # mb
 
-		# "eps is the stopping criterion (we usually use 0.00001 in nu-SVC,
-		# 0.001 in others)." (from README)
-		@parameter.eps = 0.001 
+    # "eps is the stopping criterion (we usually use 0.00001 in nu-SVC,
+    # 0.001 in others)." (from README)
+    @parameter.eps = 0.001
 
-		@parameter.c = 10
-	end
+    @parameter.c = 10
+  end
 
-	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 })
-	end
+  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 })
+  end
 
-	it "is as in [PCI,217]" do
-		examples = [ [1,0,1], [-1,0,-1] ].map {|ary| Node.features(ary) }
-		labels = [1, -1]
-		@problem.set_examples(labels, examples)
+  it "is as in [PCI,217]" do
+    examples = [ [1,0,1], [-1,0,-1] ].map {|ary| Node.features(ary) }
+    labels = [1, -1]
+    @problem.set_examples(labels, examples)
 
-		model = Model.train(@problem, @parameter)
+    model = Model.train(@problem, @parameter)
 
-		pred = model.predict(Node.features(1, 1, 1))
-		pred.should == 1.0
+    pred = model.predict(Node.features(1, 1, 1))
+    pred.should == 1.0
 
-		pred = model.predict(Node.features(-1, 1, -1))
-		pred.should == -1.0
+    pred = model.predict(Node.features(-1, 1, -1))
+    pred.should == -1.0
 
-		pred = model.predict(Node.features(-1, 55, -1))
-		pred.should == -1.0
-	end
+    pred = model.predict(Node.features(-1, 55, -1))
+    pred.should == -1.0
+  end
 
-	it "kernel parameter use" do
-		@parameter.kernel_type = SvmParameter::KernelType::RBF
-		examples = [[1, 2, 3], [-2, -2, -2]].map {|ary| Node.features(ary) }
-		@problem.set_examples([1, 2], examples)
+  it "kernel parameter use" do
+    @parameter.kernel_type = SvmParameter::KernelType::RBF
+    examples = [[1, 2, 3], [-2, -2, -2]].map {|ary| Node.features(ary) }
+    @problem.set_examples([1, 2], examples)
 
-		model = Model.train(@problem, @parameter)
+    model = Model.train(@problem, @parameter)
 
-		model.predict(Node.features(1, 2, 3)).should == 2
-	end
+    model.predict(Node.features(1, 2, 3)).should == 2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2012-05-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2153848920 !ruby/object:Gem::Requirement
+  requirement: &70287710299640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153848920
+  version_requirements: *70287710299640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153848420 !ruby/object:Gem::Requirement
+  requirement: &70287710298620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153848420
+  version_requirements: *70287710298620
 description: libsvm and ruby without using swig
 email:
 - neovintage@gmail.com
@@ -46,9 +46,11 @@ files:
 - .rvmrc
 - .travis.yml
 - Gemfile
+- LIBSVM-LICENSE
 - MIT-LICENSE
 - README.md
 - Rakefile
+- examples/text.rb
 - examples/toy.rb
 - ext/rb-libsvm/extconf.rb
 - ext/rb-libsvm/libsvm.c
@@ -57,8 +59,10 @@ files:
 - ext/rb-libsvm/svm.h
 - ferret_valgrind.supp
 - lib/libsvm.rb
+- lib/libsvm/node.rb
 - lib/rb-libsvm/version.rb
 - rb-libsvm.gemspec
+- spec/.usage_spec.rb.swp
 - spec/model_spec.rb
 - spec/node_spec.rb
 - spec/parameter_spec.rb
@@ -77,15 +81,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 932394419047004720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 932394419047004720
 requirements: []
 rubyforge_project: rb-libsvm
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby language bindings for LIBSVM