liblinear-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d838932a4299e6a989377e7d73f46c3718eeff
-  data.tar.gz: 03f5be533321002f919b025ba611200bf58244fb
+  metadata.gz: 5627682e3eced50c405c213569f4c18f178bd6a5
+  data.tar.gz: abdf3297770c99e176b26a74c34d2e2c4eb03de1
 SHA512:
-  metadata.gz: 6ce90555ad269328c7d9f632ffcf6c2341359ec7d13c85f80dcefddda6a29c8627fa2a4256a34bbdd403ef20f569b4582bdbe54b7d51bd43a7e8f619dc32b67a
-  data.tar.gz: f91a4dcdd15a628f5bc7e0f579f519d9f6d8b6513584f85fba2228feac8f66e6fade77ffddaca0a138bac49cdcfe646aba832aba52f98eaf94f14b712b79133b
+  metadata.gz: 71443f67c21c93fbafd8031554045db2b8bdeddd2574b5dc582bf7cd034f5725c2bfe2acf56706fb5b07f5e82b598b43b2595619e14889c7ca913136668bf1ee
+  data.tar.gz: c85b14d11e5a858297826747c49a890ef60e63531750be77cb403cfc3543ca294d440dafa084d25752801387a351cd7da9d7cca8277846345de30b0bb9d02e2e

data/.gitignore

@@ -8,6 +8,7 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+ext/Makefile
 ext/*.o
 ext/*.so
 lib/bundler/man

data/lib/liblinear.rb

@@ -8,7 +8,6 @@ require 'liblinear/problem'
 require 'liblinear/version'
 
 module Liblinear
-  #include Liblinearswig
   # @param ruby_array [Array<Integer>]
   # @return [SWIG::TYPE_p_int]
   def new_int_array(ruby_array)
@@ -41,12 +40,14 @@ module Liblinear
 
   # @param c_array [SWIG::TYPE_p_int]
   # @param size [Integer]
+  # @return [Array<Integer>]
   def int_array_c_to_ruby(c_array, size)
     size.times.map {|index| int_getitem(c_array, index)}
   end
 
   # @param c_array [SWIG::TYPE_p_double]
   # @param size [Integer]
+  # @return [Array<Double>]
   def double_array_c_to_ruby(c_array, size)
     size.times.map {|index| double_getitem(c_array, index)}
   end
@@ -66,7 +67,7 @@ module Liblinear
         example_indexes << index
       end
     else
-      raise TypeError, 'data must be a Hash or an Array'
+      raise TypeError, 'example must be a Hash or an Array'
     end
     example_indexes.sort!
 

data/lib/liblinear/model.rb

@@ -6,6 +6,8 @@ module Liblinear
 
     # @param arg_1 [LibLinear::Problem, String]
     # @param arg_2 [Liblinear::Parameter]
+    # @raise [ArgumentError]
+    # @raise [Liblinear::InvalidParameter]
     def initialize(arg_1, arg_2 = nil)
       if arg_2
         unless arg_1.is_a?(Liblinear::Problem) && arg_2.is_a?(Liblinear::Parameter)
@@ -20,12 +22,12 @@ module Liblinear
       end
     end
 
-    # return [Integer]
+    # @return [Integer]
     def nr_class
       get_nr_class(@model)
     end
 
-    # return [Array<Integer>]
+    # @return [Array<Integer>]
     def labels
       c_int_array = new_int(nr_class)
       get_labels(@model, c_int_array)
@@ -35,6 +37,7 @@ module Liblinear
     end
 
     # @param example [Array, Hash]
+    # @return [Double]
     def predict(example)
       feature_nodes = convert_to_feature_node_array(example, @model.nr_feature, @model.bias)
       prediction = Liblinearswig.predict(@model, feature_nodes)

data/lib/liblinear/problem.rb

@@ -7,6 +7,7 @@ module Liblinear
     # @param labels [Array<Double>]
     # @param examples [Array<Double>, Array<Hash>]
     # @param bias [Double]
+    # @raise [ArgumentError]
     def initialize(labels, examples, bias)
       unless labels.size == examples.size
         raise ArgumentError, 'labels and examples must be same size'

data/lib/liblinear/version.rb

@@ -1,3 +1,3 @@
 module Liblinear
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liblinear-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kei Tsuchiya
@@ -51,7 +51,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/Makefile
 - ext/blas.h
 - ext/blasp.h
 - ext/daxpy.c

data/ext/Makefile

@@ -1,237 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = $(includedir)/$(RUBY_VERSION_NAME)
-hdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-arch_hdrdir = $(rubyhdrdir)/$(arch)
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/home/kei/.rbenv/versions/2.0.0-p195
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) 
-LIBRUBYARG_STATIC = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3 -fno-fast-math
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
-CCDLFLAGS = -fPIC
-CFLAGS   = $(CCDLFLAGS)  -Wall -O3  $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -I'/home/kei/.rbenv/versions/2.0.0-p195/include'  $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L. -L'/home/kei/.rbenv/versions/2.0.0-p195/lib'  -fstack-protector -rdynamic -Wl,-export-dynamic
-dldflags =  
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = g++ -shared
-LDSHAREDXX = $(CXX) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = x86_64-linux
-sitearch = $(arch)
-ruby_version = 2.0.0
-ruby = $(bindir)/ruby
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir --ignore-fail-on-non-empty -p
-MAKEDIRS = /bin/mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir) -Wl,-R$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS =   -lpthread -lrt -ldl -lcrypt -lm   -lc
-ORIG_SRCS = dnrm2.c dscal.c daxpy.c ddot.c liblinear_wrap.cxx linear.cpp tron.cpp
-SRCS = $(ORIG_SRCS) 
-OBJS = dnrm2.o dscal.o daxpy.o ddot.o liblinear_wrap.o linear.o tron.o
-HDRS = $(srcdir)/linear.h $(srcdir)/blas.h $(srcdir)/blasp.h $(srcdir)/tron.h
-TARGET = liblinearswig
-TARGET_NAME = liblinearswig
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) ./.RUBYARCHDIR.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default liblinearswig libraries
-./.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHAREDXX) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)