.gitignore @@ -4,4 +4,4 @@ $CFLAGS = "#{ENV['CFLAGS']} -Wall -O3 " if CONFIG["MAJOR"].to_i >= 1 && CONFIG["MINOR"].to_i >= 8 $CFLAGS << " -DHAVE_DEFINE_ALLOC_FUNCTION" end -create_makefile('svmc') +create_makefile('libsvm-ruby-swig/libsvm') ext/extconf.rb @@ -4435,11 +4435,11 @@ SWIG_PropagateClientData(void) { #ifdef __cplusplus extern "C" #endif -SWIGEXPORT void Init_svmc(void) { +SWIGEXPORT void Init_libsvm(void) { size_t i; SWIG_InitRuntime(); - mSvmc = rb_define_module("Svmc"); + mSvmc = rb_define_module("LibSVM"); SWIG_InitializeModule(0); for (i = 0; i < swig_module.size; i++) { ext/svmc_wrap.cxx @@ -1,5 +1,5 @@ -require 'svmc' -include Svmc +require 'libsvm-ruby-swig/libsvm' +include LibSVM def _int_array(seq) size = seq.size @@ -196,7 +196,7 @@ class Model param.gamma = 1.0/prob.maxlen end msg = svm_check_parameter(prob.prob,param.param) - raise "ValueError", msg if msg + raise ::ArgumentError, msg if msg @model = svm_train(prob.prob,param.param) end lib/svm.rb ext/svmc.so ec13ea97ca670c90867a3045e91ca4287af8d927 Daniel DeLeo danielsdeleo@mac.com http://github.com/tomz/libsvm-ruby-swig/commit/b47a0282aa236266d3be786696a9c627e11c42a2 b47a0282aa236266d3be786696a9c627e11c42a2 2009-03-21T20:13:42-07:00 2009-03-21T20:13:42-07:00 Follow naming conventions so requiring gem load extensions properly Also fixed an issue where C++ code would try to raise a Python error (oops!) 627a689ee798b93023da568723d5ae0acef741a6 Daniel DeLeo danielsdeleo@mac.com