rb-libsvm 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04b43e9bcd03b81b5e928566c8449f91650bfc4
-  data.tar.gz: 1338454d938aeffdb2bfcc371f994177982bd984
+  metadata.gz: b45728dc2dd8a43e475299b21ca321ac440ec240
+  data.tar.gz: bb1e9e59c680fa2bff83e37b636f8354327e63fe
 SHA512:
-  metadata.gz: f4dbead862bfa6284ed286759cd6215764fe3f4124162bcd3e7f5a441ac540ba41eab7ada12a4a2c221220ff322b443421f4e663189eb65bc7d939eb8dfa9236
-  data.tar.gz: 5512309213d09e792e2e12b2c753a12b800020f7696f6b46dd04fe5e67e5041af9b61e199465ac87c58f18ab9c4bc4f78cfa6edf51270d769a65ff7fbd0ea979
+  metadata.gz: 04f4b3a390f705f41e78e1f6531af1117bfb944a1901fc17cee3e12a668d0ff58761ee6cbb69c59c474a66fc9549fdb1f9e1339b663e73b7d2e535232b8998ec
+  data.tar.gz: 27d948de88f60491aa3ff226f074411dd168d821193e9f1b43db5a1f78f5aa75b1ffa01c6021e846f34fa3022199fd369bb9a8f397920250537f51125e138838

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - 2.1.5
   - 2.2.0
   - ruby-head
+sudo: false

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [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/README.md

@@ -22,7 +22,7 @@ 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.

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/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.0"
 end

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.0
 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: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rb-libsvm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for LIBSVM
@@ -112,4 +112,3 @@ test_files:
 - spec/problem_spec.rb
 - spec/spec_helper.rb
 - spec/usage_spec.rb
-has_rdoc: