rb-libsvm 1.0.6 → 1.0.7

data/.gitignore

@@ -7,3 +7,5 @@ pkg/
 Gemfile*
 .rvmrc
 tags
+*.swp
+*~

data/README.md

@@ -17,7 +17,7 @@ independently and from scratch.
 
 None.  Libsvm is bundled with the project.  Just install and go!
 
-Currently using libsvm version 3.1
+Currently using libsvm version 3.12
 
 ## Installation
 
@@ -73,7 +73,3 @@ the license in the file LIBSVM-LICENSE.
 [http://www.csie.ntu.edu.tw/~cjlin/libsvm/](http://www.csie.ntu.edu.tw/~cjlin/libsvm/)
 
 [http://books.google.com/books?id=fEsZ3Ey-Hq4C](http://books.google.com/books?id=fEsZ3Ey-Hq4C)
-
-[http://rubysvm.cilibrar.com/](http://rubysvm.cilibrar.com/)
-
-

data/examples/text.rb

@@ -11,22 +11,23 @@ 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
+# 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.
+# 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 (in a less casual way).
 #
-dictionary = documents.map(&:last).flatten.uniq
+dictionary = documents.map(&:last).map(&:split).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 })]
+documents.each do |doc|
+  features_array = dictionary.map { |x| doc.last.include?(x) ? 1 : 0 }
+  training_set << [doc.first, Libsvm::Node.features(features_array)]
 end
 
 # Lets set up libsvm so that we can test our prediction
@@ -39,7 +40,7 @@ parameter.cache_size = 1 # in megabytes
 parameter.eps = 0.001
 parameter.c   = 10
 
-# train classifier using training set
+# Train classifier using training set
 #
 problem.set_examples(training_set.map(&:first), training_set.map(&:last))
 model = Libsvm::Model.train(problem, parameter)
@@ -47,7 +48,8 @@ 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(/\?|,|\.|\-/,'') }
+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}"
+doc_features = dictionary.map{|x| test_document.include?(x) ? 1 : 0 }
+pred = model.predict(Libsvm::Node.features(doc_features))
+puts "Predicted #{pred==1 ? 'funny' : 'not funny'}"

data/ext/rb-libsvm/extconf.rb

@@ -3,44 +3,9 @@ require 'mkmf'
 # $CFLAGS << " -save-temps -ggdb3 "
 $LDFLAGS << " -lstdc++ "
 
-# find_header('ruby.h')
-# find_library('svm', 'svm_train', '/opt/local/lib/', '/usr/lib/') || raise("svm library not found.")
-# find_header('svm.h', "/opt/local/include/", "/usr/include/libsvm-2.0/libsvm/")
-# create_makefile('libsvm_ext')
-
-LIBDIR = Config::CONFIG['libdir']
-INCLUDEDIR = Config::CONFIG['includedir']
-
-HEADER_DIRS = [
-  # First search /opt/local for macports
-  '/opt/local/include',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/include',
-
-  # Check the ruby install locations
-  INCLUDEDIR,
-
-  # Finally fall back to /usr
-  '/usr/include',
-]
-
-LIB_DIRS = [
-  # First search /opt/local for macports
-  '/opt/local/lib',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/lib',
-
-  # Check the ruby install locations
-  LIBDIR,
-
-  # Finally fall back to /usr
-  '/usr/lib',
-]
+HEADER_DIRS = []
+LIB_DIRS = []
 
 dir_config('rb-libsvm',HEADER_DIRS,LIB_DIRS)
 
-# Don't think I need to search the dirs for the header file
-
 create_makefile('rb-libsvm/libsvm')

data/lib/rb-libsvm/version.rb

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

data/rb-libsvm.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "rb-libsvm"
   s.version     = Libsvm::VERSION
   s.authors     = ["C. Florian Ebeling", "Rimas Silkaitis"]
-  s.email       = ["neovintage@gmail.com"]
+  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}
@@ -18,7 +18,6 @@ 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

@@ -49,7 +49,7 @@ describe "A saved model" do
   include ModelSpecHelper
 
   before(:each) do
-    @filename = "svm_model.model"
+    @filename = "tmp/svm_model.model"
     model = Model.train(create_problem, create_parameter)
     model.save(@filename)
   end
@@ -71,12 +71,13 @@ describe "An Libsvm model" do
     @problem = create_problem
     @parameter = create_parameter
     @model = Model.train(@problem, @parameter)
+    @file_path = "tmp/svm_model.model"
+    File.delete(@file_path) if File.exists?(@file_path)
   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
+    @model.save(@file_path)
+    File.exist?(@file_path).should be_true
   end
 
   it "can be asked for it's svm_type" do
@@ -92,4 +93,3 @@ describe "An Libsvm model" do
     prediction.should_not be_nil
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-libsvm
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000Z
+date: 2012-05-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70287710299640 !ruby/object:Gem::Requirement
+  requirement: &70308564367400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287710299640
+  version_requirements: *70308564367400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287710298620 !ruby/object:Gem::Requirement
+  requirement: &70308564365620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,9 +33,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70287710298620
+  version_requirements: *70308564365620
 description: libsvm and ruby without using swig
 email:
+- florian.ebeling@gmail.com
 - neovintage@gmail.com
 executables: []
 extensions:
@@ -57,12 +58,10 @@ files:
 - ext/rb-libsvm/ruby-ext.h
 - ext/rb-libsvm/svm.cpp
 - 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
@@ -83,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 932394419047004720
+      hash: -321019146793040831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 932394419047004720
+      hash: -321019146793040831
 requirements: []
 rubyforge_project: rb-libsvm
 rubygems_version: 1.8.10

data/ferret_valgrind.supp

@@ -1,478 +0,0 @@
-{
-   Ruby::mark_locations_array
-   Memcheck:Cond
-   fun:mark_locations_array
-}
-{
-   Ruby::str_make_independent.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:str_make_independent
-}
-{
-   Ruby::gc_mark_children.st_lookup.value4
-   Memcheck:Value4
-   fun:st_lookup
-   fun:rb_mark_generic_ivar
-   fun:gc_mark_children
-}
-{
-   Ruby::env_aset.leak1
-   Memcheck:Leak
-   fun:realloc
-   fun:ruby_xrealloc
-   fun:ruby_setenv
-   fun:env_aset
-}
-{
-   Ruby::env_aset.leak2
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:ruby_strdup
-   fun:ruby_setenv
-   fun:env_aset
-}
-{
-   Ruby::str_new.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:str_new
-}
-{
-   Ruby::gc_mark_children.st_lookup.cond
-   Memcheck:Cond
-   fun:st_lookup
-   fun:rb_mark_generic_ivar
-   fun:gc_mark_children
-}
-{
-   Ruby::gc_mark.cond
-   Memcheck:Cond
-   fun:gc_mark
-}
-{
-   Ruby::gc_mark.value4
-   Memcheck:Value4
-   fun:gc_mark
-}
-{
-   Ruby::gc_mark.addr4
-   Memcheck:Addr4
-   fun:gc_mark
-}
-{
-   Ruby::gc_mark_children.addr1
-   Memcheck:Addr1
-   fun:gc_mark_children
-}
-{
-   Ruby::gc_mark_children.addr4
-   Memcheck:Addr4
-   fun:gc_mark_children
-}
-{
-   Ruby::gc_mark_children.cond
-   Memcheck:Cond
-   fun:gc_mark_children
-}
-{
-   Ruby::gc_mark_children.value4
-   Memcheck:Value4
-   fun:gc_mark_children
-}
-{
-   Ruby::scope_dup.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:scope_dup
-}
-{
-   Ruby::pthread.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:rwlock_have_already
-   fun:pthread_rwlock_rdlock
-}
-{
-   Ruby::str_format.leak
-   Memcheck:Leak
-   fun:realloc
-   fun:ruby_xrealloc
-   fun:rb_str_resize
-   fun:rb_f_sprintf
-   fun:rb_str_format
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-}
-{
-   Ruby::HashCreate.leak
-   Memcheck:Leak
-   fun:calloc
-   fun:st_init_table_with_size
-   fun:st_init_table
-   fun:st_init_numtable
-   fun:rb_ivar_set
-   fun:rb_eval
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_obj_call_init
-   fun:rb_class_new_instance
-   fun:call_cfunc
-   fun:rb_call0
-}
-{
-   Ruby::re_compile.leak2
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:ruby_re_compile_pattern
-}
-{
-   Ruby::rb_intern.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:st_add_direct
-   fun:rb_intern
-   fun:rb_str_intern
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_eval
-   fun:rb_yield_0
-   fun:rb_yield
-   fun:int_dotimes
-}
-{
-   Ruby::copy_node_scope.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:copy_node_scope
-   fun:rb_eval
-}
-{
-   Ruby::eval_str_append.leak
-   Memcheck:Leak
-   fun:realloc
-   fun:ruby_xrealloc
-   fun:rb_str_buf_append
-}
-{
-   Ruby::ary_new.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:ary_new
-}
-{
-   Ruby::ary_store.leak
-   Memcheck:Leak
-   fun:realloc
-   fun:ruby_xrealloc
-   fun:rb_ary_store
-}
-{
-   Ruby::h_new_str.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:h_new_str
-}
-{
-   Ruby::ary_new.leak
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:ary_new
-   fun:rb_ary_new
-}
-{
-   Ruby::hash_new.leak
-   Memcheck:Leak
-   fun:calloc
-   fun:st_init_table_with_size
-   fun:st_init_table
-}
-{
-   GLIBC.cond
-   Memcheck:Cond
-   obj:/lib/ld-2.3.6.so
-}
-{
-   GLIBC.value4
-   Memcheck:Value4
-   obj:/lib/ld-2.3.6.so
-}
-{
-   GLIBC.addr4
-   Memcheck:Addr4
-   obj:/lib/ld-2.3.6.so
-}
-{
-   thread_clone
-   Memcheck:Param
-   clone(child_tidptr)
-   fun:clone
-   fun:clone
-}
-{
-   GLIBC_2::dl_load
-   Memcheck:Leak
-   fun:malloc
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-}
-{
-   Ruby::rb_load
-   Memcheck:Leak
-   fun:calloc
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_eval
-   fun:rb_load
-}
-{
-   Ruby::rb_f_require
-   Memcheck:Leak
-   fun:malloc
-   fun:add_to_global
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-}
-{
-   Ruby::add_heap
-   Memcheck:Leak
-   fun:malloc
-   fun:add_heap
-   fun:ruby_init
-   fun:main
-}
-{
-   Ruby::rb_require_safe
-   Memcheck:Leak
-   fun:malloc
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-}
-{
-   PThread::rb_require_safe
-   Memcheck:Leak
-   fun:calloc
-   fun:pthread_setspecific
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_eval
-}
-{
-   Ruby::rb_f_require
-   Memcheck:Leak
-   fun:malloc
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-}
-{
-   GLIBC_2::dl_open_worker
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-}
-{
-   Leak6
-   Memcheck:Leak
-   fun:calloc
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-}
-{
-   Leak7
-   Memcheck:Leak
-   fun:calloc
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   obj:/lib/ld-2.3.6.so
-   fun:dl_open_worker
-   obj:/lib/ld-2.3.6.so
-   fun:_dl_open
-   fun:dlopen_doit
-   obj:/lib/ld-2.3.6.so
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-}
-{
-   Leak8
-   Memcheck:Leak
-   fun:calloc
-   fun:rehash
-   fun:st_insert
-}
-{
-   Leak9
-   Memcheck:Leak
-   fun:malloc
-   fun:st_init_table_with_size
-   fun:st_init_strtable_with_size
-   fun:Init_sym
-   fun:rb_call_inits
-   fun:ruby_init
-   fun:main
-}
-{
-   Leak10
-   Memcheck:Leak
-   fun:realloc
-   fun:ruby_xrealloc
-   fun:rb_str_buf_cat
-   fun:rb_str_cat
-   fun:rb_str_cat2
-   fun:rb_set_class_path
-   fun:rb_define_class_under
-   fun:Init_Exception
-   fun:rb_call_inits
-   fun:ruby_init
-   fun:main
-}
-{
-   Leak11
-   Memcheck:Leak
-   fun:malloc
-   fun:st_add_direct
-   fun:rb_intern
-}
-{
-   Leak12
-   Memcheck:Leak
-   fun:malloc
-   fun:st_insert
-}
-{
-   Leak13
-   Memcheck:Leak
-   fun:calloc
-   fun:st_init_table_with_size
-   fun:st_init_table
-   fun:st_init_numtable
-   fun:Init_var_tables
-   fun:rb_call_inits
-   fun:ruby_init
-   fun:main
-}
-{
-   Leak14
-   Memcheck:Leak
-   fun:malloc
-   fun:ruby_xmalloc
-   fun:ruby_strdup
-   fun:rb_intern
-}
-{
-   Leak15
-   Memcheck:Leak
-   fun:calloc
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_load
-   fun:rb_require_safe
-}
-{
-   Leak16
-   Memcheck:Leak
-   fun:calloc
-   fun:pthread_setspecific
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.1
-   fun:dln_load
-   fun:rb_require_safe
-   fun:rb_f_require
-   fun:call_cfunc
-   fun:rb_call0
-   fun:rb_call
-   fun:rb_eval
-   fun:rb_load
-}
-