liblinear-ruby 0.0.6 → 0.0.7

data/{liblinear-1.95 → liblinear-2.1}/tron.cpp

@@ -41,10 +41,11 @@ void TRON::info(const char *fmt,...)
 	(*tron_print_string)(buf);
 }
 
-TRON::TRON(const function *fun_obj, double eps, int max_iter)
+TRON::TRON(const function *fun_obj, double eps, double eps_cg, int max_iter)
 {
 	this->fun_obj=const_cast<function *>(fun_obj);
 	this->eps=eps;
+	this->eps_cg=eps_cg;
 	this->max_iter=max_iter;
 	tron_print_string = default_print;
 }
@@ -68,23 +69,28 @@ void TRON::tron(double *w)
 	int search = 1, iter = 1, inc = 1;
 	double *s = new double[n];
 	double *r = new double[n];
-	double *w_new = new double[n];
 	double *g = new double[n];
 
+	// calculate gradient norm at w=0 for stopping condition.
+	double *w0 = new double[n];
 	for (i=0; i<n; i++)
-		w[i] = 0;
+		w0[i] = 0;
+	fun_obj->fun(w0);
+	fun_obj->grad(w0, g);
+	double gnorm0 = dnrm2_(&n, g, &inc);
+	delete [] w0;
 
 	f = fun_obj->fun(w);
 	fun_obj->grad(w, g);
 	delta = dnrm2_(&n, g, &inc);
-	double gnorm1 = delta;
-	double gnorm = gnorm1;
+	double gnorm = delta;
 
-	if (gnorm <= eps*gnorm1)
+	if (gnorm <= eps*gnorm0)
 		search = 0;
 
 	iter = 1;
 
+	double *w_new = new double[n];
 	while (iter <= max_iter && search)
 	{
 		cg_iter = trcg(delta, g, s, r);
@@ -130,7 +136,7 @@ void TRON::tron(double *w)
 			fun_obj->grad(w, g);
 
 			gnorm = dnrm2_(&n, g, &inc);
-			if (gnorm <= eps*gnorm1)
+			if (gnorm <= eps*gnorm0)
 				break;
 		}
 		if (f < -1.0e+32)
@@ -172,7 +178,7 @@ int TRON::trcg(double delta, double *g, double *s, double *r)
 		r[i] = -g[i];
 		d[i] = r[i];
 	}
-	cgtol = 0.1*dnrm2_(&n, g, &inc);
+	cgtol = eps_cg*dnrm2_(&n, g, &inc);
 
 	int cg_iter = 0;
 	rTr = ddot_(&n, r, &inc, r, &inc);

data/{liblinear-1.95 → liblinear-2.1}/tron.h

@@ -15,7 +15,7 @@ public:
 class TRON
 {
 public:
-	TRON(const function *fun_obj, double eps = 0.1, int max_iter = 1000);
+	TRON(const function *fun_obj, double eps = 0.1, double eps_cg = 0.1, int max_iter = 1000);
 	~TRON();
 
 	void tron(double *w);
@@ -26,6 +26,7 @@ private:
 	double norm_inf(int n, double *x);
 
 	double eps;
+	double eps_cg;
 	int max_iter;
 	function *fun_obj;
 	void info(const char *fmt,...);

data/liblinear-ruby.gemspec

@@ -1,24 +1,23 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'liblinear/version'
+require 'liblinear'
 
 Gem::Specification.new do |spec|
-  spec.name          = "liblinear-ruby"
+  spec.name          = 'liblinear-ruby'
   spec.version       = Liblinear::VERSION
-  spec.authors       = ["Kei Tsuchiya"]
-  spec.email         = ["kei.tsuchiya86@gmail.com"]
+  spec.authors       = ['Kei Tsuchiya']
+  spec.email         = ['kei.tsuchiya86@gmail.com']
   spec.description   = %q{Ruby wrapper of LIBLINEAR using SWIG}
   spec.summary       = %q{Ruby wrapper of LIBLINEAR using SWIG}
-  spec.homepage      = "https://github.com/kei500/liblinear-ruby"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/kei500/liblinear-ruby'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
   spec.extensions << 'ext/extconf.rb'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: liblinear-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kei Tsuchiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby wrapper of LIBLINEAR using SWIG
@@ -46,7 +46,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,45 +71,45 @@ files:
 - lib/liblinear/parameter.rb
 - lib/liblinear/problem.rb
 - lib/liblinear/version.rb
-- liblinear-1.95/COPYRIGHT
-- liblinear-1.95/Makefile
-- liblinear-1.95/Makefile.win
-- liblinear-1.95/README
-- liblinear-1.95/blas/Makefile
-- liblinear-1.95/blas/blas.h
-- liblinear-1.95/blas/blasp.h
-- liblinear-1.95/blas/daxpy.c
-- liblinear-1.95/blas/ddot.c
-- liblinear-1.95/blas/dnrm2.c
-- liblinear-1.95/blas/dscal.c
-- liblinear-1.95/heart_scale
-- liblinear-1.95/linear.cpp
-- liblinear-1.95/linear.def
-- liblinear-1.95/linear.h
-- liblinear-1.95/matlab/Makefile
-- liblinear-1.95/matlab/README
-- liblinear-1.95/matlab/libsvmread.c
-- liblinear-1.95/matlab/libsvmwrite.c
-- liblinear-1.95/matlab/linear_model_matlab.c
-- liblinear-1.95/matlab/linear_model_matlab.h
-- liblinear-1.95/matlab/make.m
-- liblinear-1.95/matlab/predict.c
-- liblinear-1.95/matlab/train.c
-- liblinear-1.95/predict.c
-- liblinear-1.95/python/Makefile
-- liblinear-1.95/python/README
-- liblinear-1.95/python/liblinear.py
-- liblinear-1.95/python/liblinearutil.py
-- liblinear-1.95/train.c
-- liblinear-1.95/tron.cpp
-- liblinear-1.95/tron.h
-- liblinear-1.95/windows/liblinear.dll
-- liblinear-1.95/windows/libsvmread.mexw64
-- liblinear-1.95/windows/libsvmwrite.mexw64
-- liblinear-1.95/windows/predict.exe
-- liblinear-1.95/windows/predict.mexw64
-- liblinear-1.95/windows/train.exe
-- liblinear-1.95/windows/train.mexw64
+- liblinear-2.1/COPYRIGHT
+- liblinear-2.1/Makefile
+- liblinear-2.1/Makefile.win
+- liblinear-2.1/README
+- liblinear-2.1/blas/Makefile
+- liblinear-2.1/blas/blas.h
+- liblinear-2.1/blas/blasp.h
+- liblinear-2.1/blas/daxpy.c
+- liblinear-2.1/blas/ddot.c
+- liblinear-2.1/blas/dnrm2.c
+- liblinear-2.1/blas/dscal.c
+- liblinear-2.1/heart_scale
+- liblinear-2.1/linear.cpp
+- liblinear-2.1/linear.def
+- liblinear-2.1/linear.h
+- liblinear-2.1/matlab/Makefile
+- liblinear-2.1/matlab/README
+- liblinear-2.1/matlab/libsvmread.c
+- liblinear-2.1/matlab/libsvmwrite.c
+- liblinear-2.1/matlab/linear_model_matlab.c
+- liblinear-2.1/matlab/linear_model_matlab.h
+- liblinear-2.1/matlab/make.m
+- liblinear-2.1/matlab/predict.c
+- liblinear-2.1/matlab/train.c
+- liblinear-2.1/predict.c
+- liblinear-2.1/python/Makefile
+- liblinear-2.1/python/README
+- liblinear-2.1/python/liblinear.py
+- liblinear-2.1/python/liblinearutil.py
+- liblinear-2.1/train.c
+- liblinear-2.1/tron.cpp
+- liblinear-2.1/tron.h
+- liblinear-2.1/windows/liblinear.dll
+- liblinear-2.1/windows/libsvmread.mexw64
+- liblinear-2.1/windows/libsvmwrite.mexw64
+- liblinear-2.1/windows/predict.exe
+- liblinear-2.1/windows/predict.mexw64
+- liblinear-2.1/windows/train.exe
+- liblinear-2.1/windows/train.mexw64
 - liblinear-ruby.gemspec
 - spec/liblinear/cross_validator_spec.rb
 - spec/liblinear/model_spec.rb
@@ -126,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper of LIBLINEAR using SWIG
@@ -146,4 +146,3 @@ test_files:
 - spec/liblinear/parameter_spec.rb
 - spec/liblinear/problem_spec.rb
 - spec/liblinear_spec.rb
-has_rdoc: 

data/liblinear-1.95/matlab/make.m

@@ -1,21 +0,0 @@
-% This make.m is for MATLAB and OCTAVE under Windows, Mac, and Unix
-
-try
-	Type = ver;
-	% This part is for OCTAVE
-	if(strcmp(Type(1).Name, 'Octave') == 1)
-		mex libsvmread.c
-		mex libsvmwrite.c
-		mex train.c linear_model_matlab.c ../linear.cpp ../tron.cpp ../blas/daxpy.c ../blas/ddot.c ../blas/dnrm2.c ../blas/dscal.c
-		mex predict.c linear_model_matlab.c ../linear.cpp ../tron.cpp ../blas/daxpy.c ../blas/ddot.c ../blas/dnrm2.c ../blas/dscal.c
-	% This part is for MATLAB
-	% Add -largeArrayDims on 64-bit machines of MATLAB
-	else
-		mex CFLAGS="\$CFLAGS -std=c99" -largeArrayDims libsvmread.c
-		mex CFLAGS="\$CFLAGS -std=c99" -largeArrayDims libsvmwrite.c
-		mex CFLAGS="\$CFLAGS -std=c99" -largeArrayDims train.c linear_model_matlab.c ../linear.cpp ../tron.cpp ../blas/daxpy.c ../blas/ddot.c ../blas/dnrm2.c ../blas/dscal.c
-		mex CFLAGS="\$CFLAGS -std=c99" -largeArrayDims predict.c linear_model_matlab.c ../linear.cpp ../tron.cpp ../blas/daxpy.c ../blas/ddot.c ../blas/dnrm2.c ../blas/dscal.c
-	end
-catch
-	fprintf('If make.m fails, please check README about detailed instructions.\n');
-end