rb-libsvm 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ef30c4d3cfe8e3785f6c408a48a34b5ff585b2
-  data.tar.gz: 80bbaef88fe9e9738b61fde4804c592e4e053367
+  metadata.gz: 430498716ebb529469fa73ece0ffe044bac7c04a
+  data.tar.gz: d1effb4c07f3fa77418991d79ddf58ed5887ee8c
 SHA512:
-  metadata.gz: 1b8a9ff101bdc72026634f744583f858f1963b7241a18068a22fdd3ac0d84413937ed23093a34507a10f42052e9a73b79c396e85bf6e4b542c8c6c96249ea79a
-  data.tar.gz: 13de67e9c95836e814cc88077f8e9c59977f27dd9fa4e4171591c60f93059216046676a4ecc933ab9e37a47fb2e6b795e1aed45ccf82e0b0a8ef29bb8abd3ebb
+  metadata.gz: 6546735dc65a8bff5215960cec78755eab7ddd4ecffe047bd1e4a6db485bfbcb970fed54b61581b259478b0451cbcca21b936ed2bc01f3c48af32240bd0be553
+  data.tar.gz: 07c833fd03503d38e4b9a5c0a6ac6958e32b3ffcf8983f6ffe8663dd1914d9de9ee164f8725373d3957b9e264708783811929d49d69fce5bbfa461560d36400d

data/.travis.yml

@@ -4,5 +4,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
-  - rbx
   - ruby-head

data/README.md

@@ -9,7 +9,11 @@ popular free implementation of it, written by Chih-Chung Chang and
 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
+There is a JRuby implementation of this gem named
+[jrb-libsvm](https://github.com/sch1zo/jrb-libsvm) by
+[Andreas Eger](https://github.com/sch1zo).
+
+Note: There exist some other Ruby bindings for LIBSVM. One is named
 [Ruby SVM][ruby-svm], written by Rudi Cilibrasi. The other, more
 actively developed one is [libsvm-ruby-swig][svmrubyswig] by Tom Zeng,
 which is built using SWIG.
@@ -77,9 +81,6 @@ 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/examples/iris.rb

@@ -0,0 +1,61 @@
+require 'libsvm'
+require 'set'
+
+include Libsvm
+
+if ARGV.size != 1
+  puts "Usage: ruby examples/iris.rb iris.data"
+  puts
+  puts "Needs the Iris data set"
+  puts "  http://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data"
+  exit 1
+end
+
+# Read data
+lines = IO.readlines(ARGV.shift).map(&:strip).shuffle
+instances = lines.map { |line| line.split(',') }
+
+# Create array of feature nodes per instance
+examples = instances.map { |instance|
+  sepal_length, sepal_width, petal_length, petal_width = *instance[0..3].map(&:to_f)
+  Node.features(sepal_length, sepal_width, petal_length, petal_width)
+}
+
+# Pluck class property (Iris name)
+label_names = instances.map(&:last)
+
+# Deduplicate and assign indexes
+label_indexes  = label_names.to_set.to_a
+
+# Array of label indexes of instances
+labels = label_names.map { |label_name| label_indexes.index(label_name) }
+
+# Create problem traning set
+problem = Problem.new
+problem.set_examples(labels, examples)
+
+# Use various kernel types
+[:LINEAR, :POLY, :RBF, :SIGMOID].each do |type|
+
+  # Create some parameters
+  parameter = SvmParameter.new
+  parameter.cache_size  = 10 # in megabytes
+  parameter.eps         = 0.00001
+  parameter.degree      = 5
+  parameter.gamma       = 0.01
+  parameter.c           = 100
+  parameter.kernel_type = KernelType.const_get(type)
+
+  # Different nfold sizes. It's the number of parts the data is
+  # split into.
+  [10, 20].each do |nfold|
+    result          = Model.cross_validation(problem, parameter, nfold)
+    predicted_name  = result.map { |label| label_indexes[label] }
+    correctness     = predicted_name.map.with_index { |p, i| p == label_names[i] }
+
+    correct = correctness.select { |x| x }
+    accuracy = correct.size.to_f / correctness.size
+    acc_str = "%.2f" % accuracy
+    puts "Accuracy[type = #{type}, nfold = #{nfold}] : #{acc_str}"
+  end
+end

data/ext/libsvm/extconf.rb

@@ -2,6 +2,7 @@ require 'mkmf'
 
 $CFLAGS << " -save-temps -ggdb3 " if ENV['DEBUG']
 $LDFLAGS << " -lstdc++ "
+$CPPFLAGS << " -DDEBUG " if ENV['DEBUG']
 
 HEADER_DIRS = []
 LIB_DIRS = []

data/ext/libsvm/libsvm.c

@@ -411,6 +411,13 @@ static VALUE cModel_classes(VALUE obj)
   return INT2NUM(svm_get_nr_class(model));
 }
 
+static VALUE cModel_support_vectors(VALUE obj)
+{
+  const struct svm_model *model;
+  Data_Get_Struct(obj, struct svm_model, model);
+  return INT2NUM(svm_get_nr_sv(model));
+}
+
 static VALUE cModel_class_load(VALUE cls, VALUE filename)
 {
   struct svm_model *model;
@@ -493,6 +500,7 @@ void Init_libsvm_ext() {
   rb_define_method(cModel, "save", cModel_save, 1);
   rb_define_method(cModel, "svm_type", cModel_svm_type, 0);
   rb_define_method(cModel, "classes", cModel_classes, 0);
+  rb_define_method(cModel, "support_vectors", cModel_support_vectors, 0);
   rb_define_method(cModel, "predict", cModel_predict, 1);
   rb_define_method(cModel, "predict_probability", cModel_predict_probability, 1);
 

data/lib/libsvm/version.rb

@@ -1,3 +1,3 @@
 module Libsvm
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

data/rb-libsvm.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["C. Florian Ebeling", "Rimas Silkaitis"]
   s.email       = ["florian.ebeling@gmail.com", "neovintage@gmail.com"]
   s.homepage    = "https://github.com/febeling/rb-libsvm"
-  s.summary     = %q{Ruby language bindings for LIBSVM}
-  s.description = %q{libsvm and ruby without using swig}
+  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.rubyforge_project = "rb-libsvm"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency('rake-compiler')
-  s.add_development_dependency('rspec', '>= 2.7.0')
+  s.add_development_dependency('rspec', '>= 3.0.0')
 
   s.extensions << 'ext/libsvm/extconf.rb'
 end

data/spec/model_spec.rb

@@ -9,9 +9,9 @@ module ModelSpecHelper
   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])]
+      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
@@ -39,13 +39,21 @@ describe "The Libsvm::Model class interface" do
   end
 
   it "results from training on a problem under a certain parameter set" do
-    model = Model.train(@problem,@parameter)
-    model.should_not be_nil
+    expect(Model.train(@problem, @parameter)).not_to be_nil
   end
 
+  let(:labels) { Model.cross_validation(@problem, @parameter, fold=2) }
+
   it "can do cross-validation" do
-    labels = Model.cross_validation(@problem, @parameter, fold=2)
-    labels.should == [anything, anything, anything, anything]
+    expect(labels).to contain_exactly(
+      an_instance_of(Float),
+      an_instance_of(Float),
+      an_instance_of(Float),
+      an_instance_of(Float))
+  end
+
+  it "number of labels" do
+    expect(labels.length).to eq(4)
   end
 end
 
@@ -59,8 +67,7 @@ describe "A saved model" do
   end
 
   it "can be loaded" do
-    model = Model.load(@filename)
-    model.should_not be_nil
+    expect(Model.load(@filename)).to be_an_instance_of(Model)
   end
 
   after(:each) do
@@ -68,7 +75,7 @@ describe "A saved model" do
   end
 end
 
-describe "An Libsvm model" do
+describe "A Libsvm model" do
   include ModelSpecHelper
 
   before(:each) do
@@ -79,28 +86,51 @@ describe "An Libsvm model" do
     File.delete(@file_path) if File.exists?(@file_path)
   end
 
-  it "can be saved to a file" do
-    @model.save(@file_path)
-    File.exist?(@file_path).should be_true
-  end
+  describe "basic operations" do
+    it "can be saved to a file" do
+      expect {
+        @model.save(@file_path)
+      }.to change { File.exist?(@file_path) }.from(false).to(true)
+    end
 
-  it "can be asked for it's svm_type" do
-    @model.svm_type.should == SvmType::C_SVC
+    it "can be asked for its svm_type" do
+      expect(@model.svm_type).to eq SvmType::C_SVC
+    end
+
+    it "can be asked for its number of classes (aka. labels)" do
+      expect(@model.classes).to eq(2)
+    end
   end
 
-  it "can be asked for it's number of classes (aka. labels)" do
-    @model.classes.should == 2
+  describe "predict" do
+    it "returns floats" do
+      expect(@model.predict(create_example)).to be_an_instance_of(Float)
+    end
   end
 
-  it "can predict" do
-    prediction = @model.predict(create_example)
-    prediction.should_not be_nil
+  describe "support_vectors" do
+    it "returns count" do
+      expect(@model.support_vectors).to eq(3)
+    end
   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 }
+  describe "predict_probability" do
+    let(:result) { @model.predict_probability(create_example) }
+    let(:prediction) { result.first }
+    let(:probabilities) { result.last }
+
+    it "produces prediction" do
+      expect(prediction).not_to be_nil
+    end
+
+    it "produces probabilities for each class" do
+      expect(probabilities.length).to eq(@model.classes)
+    end
+
+    it "can predict probability" do
+      probabilities.each do |p|
+        expect(p).to be_an_instance_of(Float)
+      end
+    end
   end
 end

data/spec/node_spec.rb

@@ -5,20 +5,20 @@ describe "construction of a Node" 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)
+    expect(n.index).to eq 11
+    expect(n.value).to 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)
+    expect(n.index).to eq 12
+    expect(n.value).to 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)
+    expect(n.index).to eq 14
+    expect(n.value).to be_within(0.0001).of(0.14)
   end
 end
 

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - C. Florian Ebeling
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -31,15 +31,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
-description: libsvm and ruby without using swig
+        version: 3.0.0
+description: Self-contained LIBSVM package for Ruby (that doesn't use SWIG). LIBSVM
+  is a popular implementation of SVM, a machine learning classifier.
 email:
 - florian.ebeling@gmail.com
 - neovintage@gmail.com
@@ -57,6 +58,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- examples/iris.rb
 - examples/text.rb
 - examples/toy.rb
 - ext/libsvm/extconf.rb
@@ -96,7 +98,7 @@ rubyforge_project: rb-libsvm
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Ruby language bindings for LIBSVM
+summary: Ruby bindings for LIBSVM
 test_files:
 - spec/model_spec.rb
 - spec/node_spec.rb
@@ -104,4 +106,3 @@ test_files:
 - spec/problem_spec.rb
 - spec/spec_helper.rb
 - spec/usage_spec.rb
-has_rdoc: