Fixing issues and splitting out into separate classes

Author: hexgnu

lib/hex-svm.rb

@@ -71,16 +71,25 @@ def _convert_to_svm_node_array(x)
 module SVM
   extend self
 
-  def convert_to_svm_node_array(x, max = 30) 
-    # X is an array of indicies
-    # Make index array 
-    # iter_range = x.sort
-
-    data = svm_node_array(max + 1)
-    svm_node_array_set(data, max, -1, 0)
-
-    x.sort.each do |k|
-      svm_node_array_set(data, k, k, 1)
+  def convert_to_svm_node_array(indicies, max) 
+    # Make index array
+    # x = indexes_to_array(indicies, max)
+    # iter_range = x.each_index.to_a
+    
+    data = svm_node_array(indicies.length + 1)
+    svm_node_array_set(data, indicies.length, -1, 0)
+    
+    # max.times do |i|
+    #   # Set to zero if not in indicies
+    #   if indicies.include?(i)
+    #     svm_node_array_set(data, i, i, 1)
+    #   else
+    #     svm_node_array_set(data, i, i, 0)
+    #   end
+    # end
+    
+    indicies.sort.each_with_index do |idx, i|
+      svm_node_array_set(data, i, idx, 1)
     end
 
     data

lib/libsvm/model.rb

@@ -16,7 +16,7 @@ def initialize(arg1,arg2=nil)
         end
         msg = svm_check_parameter(prob.prob,param.param)
         raise ::ArgumentError, msg if msg
-        @model = svm_train(prob.prob,param.param)
+        @model = svm_train(prob.prob, param.param)
       end
 
       #setup some classwide variables
@@ -29,11 +29,10 @@ def initialize(arg1,arg2=nil)
       delete_int(intarr)
       #check if valid probability model
       @probability = svm_check_probability_model(@model)
-
     end
 
-    def predict(x)
-      data = SVM.convert_to_svm_node_array(x)
+    def predict(x, max = x.max)
+      data = SVM.convert_to_svm_node_array(x, max)
       ret = svm_predict(@model,data)
       svm_node_array_destroy(data)
       return ret
@@ -54,7 +53,7 @@ def get_labels
     def predict_values_raw(x)
       #convert x into svm_node, allocate a double array for return
       n = (@nr_class*(@nr_class-1)/2).floor
-      data = _convert_to_svm_node_array(x)
+      data = SVM.convert_to_svm_node_array(x)
       dblarr = new_double(n)
       svm_predict_values(@model, data, dblarr)
       ret = _double_array_to_list(dblarr, n)
@@ -101,7 +100,7 @@ def predict_probability(x)
       end
 
       #convert x into svm_node, alloc a double array to receive probabilities
-      data = _convert_to_svm_node_array(x)
+      data = SVM.convert_to_svm_node_array(x)
       dblarr = new_double(@nr_class)
       pred = svm_predict_probability(@model, data, dblarr)
       pv = _double_array_to_list(dblarr, @nr_class)

lib/libsvm/problem.rb

@@ -1,9 +1,11 @@
 module SVM
   class Problem
     attr_accessor :prob, :maxlen, :size
+    attr_reader :max
 
     def initialize(y, *x)
       #assert y.size == x.size
+      @max = x.flatten.max #aggh hate doing this...
       @prob = prob = Svm_problem.new 
       @size = size = y.size
 
@@ -14,12 +16,10 @@ def initialize(y, *x)
 
       @x_matrix = x_matrix = svm_node_matrix(size)
       @data = []
-      @maxlen = 0
+      @maxlen = max
       x.each_with_index do |row, i|
-        #data = _convert_to_svm_node_array(row)
-        data = SVM.convert_to_svm_node_array(row)
-        @data << data
-        svm_node_matrix_set(x_matrix, i, data)
+        @data << SVM.convert_to_svm_node_array(row, max)
+        svm_node_matrix_set(x_matrix, i, @data.last)
         @maxlen = [@maxlen, row.size].max
       end
 

spec/problem_spec.rb

@@ -1,19 +1,30 @@
-require File.join(File.dirname(__FILE__), "../lib/svm")
+require File.join(File.dirname(__FILE__), "../lib/hex-svm")
 
 describe SVM::Problem do 
   before(:each) do
     #@model = [1,-1], [1,0,1], [0,0,1]
     @y = [1, -1]
     @x = [[0,2], [2]]
+    
+    prob = SVM::Problem.new(@y, *@x)
+    param = SVM::Parameter.new(:kernel_type => LINEAR, :C => 10)
+    @model = SVM::Model.new(prob, param)
   end
 
 
-  it 'should return the right results' do
-    prob = SVM::Problem.new(@y, *@x)
-    param = SVM::Parameter.new(:kernel_type => RBF, :C => 10)
-    model = SVM::Model.new(prob, param)
-    
-    model.predict([2]).should == -1.0
-    model.predict([0]).should == 1.0
+  it '0,1,2 should retrieve 1' do
+    @model.predict([0,1,2], 3).should == 1.0
+  end
+  
+  it '' do
+    @model.predict([2], 3).should == -1.0
+  end
+  
+  it '' do
+    @model.predict([], 3).should == -1.0
+  end
+  
+  it '' do
+    @model.predict([0], 3).should == 1.0
   end
 end