feedbackmine-libsvm-ruby 0.1.0 → 0.1.1

data/README.txt

@@ -2,7 +2,7 @@ This is the Ruby binding for LIBSVM.
 Rudi Cilibrasi (cilibrar@cilibrar.com) wrote this Ruby binding.
 It makes it easy to use Support Vector Machines from Ruby.
 
-Improvements made by feedbackmine:
+Improvements made by FeedbackMine (http://www.tweetjobsearch.com):
 Model#save
 Model#load
 Parameter#probability

data/Rakefile

@@ -3,7 +3,7 @@ require 'hoe'
 
 EXT = "ext/blah.#{Hoe::DLEXT}"
 
-Hoe.new('libsvm-ruby', '0.1.0') do |p|
+Hoe.new('libsvm-ruby', '0.1.1') do |p|
   p.author = 'FeedbackMine'
   p.email = 'feedbackmine@feedbackmine.com'
   p.url = 'http://www.tweetjobsearch.com'

data/ext/main.cpp

@@ -44,6 +44,24 @@ VALUE svmpa_new(VALUE cl);
  * value-index svm_node's.
  */
 struct svm_node *rubyArrayToNodelist(VALUE xs)
+{
+  //struct obstack xso;
+  struct svm_node *n;
+  int i;
+  int len = RARRAY(xs)->len;
+  n = (struct svm_node *) calloc(sizeof(struct svm_node), len+1);
+  for (i = 0; i < len; ++i) {
+    n[i].value = NUM2DBL(rb_ary_entry(xs, i));
+    n[i].index = i;
+  }
+  n[i].value = 0;
+  n[i].index = -1;
+
+  return n;
+}
+
+/*value is harcoded as 1, array is sorted features*/
+struct svm_node *rubyArrayToNodelist2(VALUE xs)
 {
   //struct obstack xso;
   struct svm_node *n;
@@ -60,6 +78,7 @@ struct svm_node *rubyArrayToNodelist(VALUE xs)
   return n;
 }
 
+
 /*
  * Serializes an SVMParameter object
  */
@@ -539,6 +558,20 @@ static VALUE svmpm_predict(VALUE self, VALUE xs)
   return rb_float_new(result);
 }
 
+/*
+ * Predicts a value (regression or classification) based on an input vector
+ */
+static VALUE svmpm_predict2(VALUE self, VALUE xs)
+{
+  double result;
+  struct RSVM_Model *rp;
+  Data_Get_Struct(self, struct RSVM_Model, rp);
+  struct svm_node *x = rubyArrayToNodelist2(xs);
+  result = svm_predict(rp->m, x);
+  free(x);
+  return rb_float_new(result);
+}
+
 static VALUE svmpm_save(VALUE self, VALUE filename)
 {
   int result;
@@ -619,6 +652,19 @@ static VALUE svmpr_addex(VALUE self, VALUE y, VALUE xs)
   return Qnil;
 }
 
+static VALUE svmpr_addex2(VALUE self, VALUE y, VALUE xs)
+{
+  struct RSVM_Problem *rp;
+  struct svm_node *fini;
+  double yd;
+  Data_Get_Struct(self, struct RSVM_Problem, rp);
+  yd = NUM2DBL(y);
+  fini = rubyArrayToNodelist2(xs);
+  addExample(rp, yd, fini);
+  if (rp->k == 0) rp->k = RARRAY(xs)->len;
+  return Qnil;
+}
+
 /* To be removed in next version */
 struct svm_model
 {
@@ -663,6 +709,7 @@ void Init_SVM()
   rb_define_method(cSVMProblem, "initialize", (VALUE (*) (...))svmpr_init, 0);
   rb_define_method(cSVMProblem, "size", (VALUE (*) (...))svmpr_size, 0);
   rb_define_method(cSVMProblem, "addExample", (VALUE (*) (...))svmpr_addex, 2);
+  rb_define_method(cSVMProblem, "addExample2", (VALUE (*) (...))svmpr_addex2, 2);
 
   rb_define_const(mSVM, "C_SVC", INT2FIX(C_SVC));
   rb_define_const(mSVM, "NU_SVC", INT2FIX(NU_SVC));
@@ -717,6 +764,7 @@ void Init_SVM()
 
   rb_define_singleton_method(cSVMModel, "new", (VALUE (*) (...))svmpm_new, 2);
   rb_define_method(cSVMModel, "predict", (VALUE (*) (...))svmpm_predict, 1);
+  rb_define_method(cSVMModel, "predict2", (VALUE (*) (...))svmpm_predict2, 1);
   rb_define_method(cSVMModel, "predict_probability", (VALUE (*) (...))svmpm_predict_probability, 1);
   rb_define_method(cSVMModel, "predict_values", (VALUE (*) (...))svmpm_predict_values, 1);
   rb_define_method(cSVMModel, "svcount", (VALUE (*) (...))svmpm_svcount, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: feedbackmine-libsvm-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - FeedbackMine