rb-gsl 1.16.0.3 → 1.16.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba1fc465df00657b2ba58f3288cd9d94b38f039e
-  data.tar.gz: a806e6d0fe3f9fd531f4730012da7629048feeab
+  metadata.gz: 11528cefa13624ebd32cf6c551a7c7410c281df7
+  data.tar.gz: be51641523d240b11ee736eda5f641d6aed7cffa
 SHA512:
-  metadata.gz: 7bca1ad78222c1554fd2bf97d882841efb50a5a95ebd0f00915ba958398e0fda8ff6e2c1812eff7103a0914c5cb8a37a1ed7494377bf408ece3badc1ba28e9fb
-  data.tar.gz: d1307ac0305e32ee08dc93ffc0561dfbcb05d27001c71de3206f8d18f12b051ee0ee3a612b0d02f270f39ab83c5418b25ad9e480ff6f974f10590a07c7d629b1
+  metadata.gz: 653c3192a1c62bed18a196398943e690abf4ff14c0f654ef3a63b5132afaaadd7d950be1fd39cd5bfa6c1df2722c8249487b86c580ad92c331f1349a107f62a7
+  data.tar.gz: df556cbf1dd73919d566a106a57ff790989f04d942893612c6e03cfae6979b2a5eaa87747248165bcb7e8a6afb0f93134e23d14d590fc5cc46f1d6d40d80647b

data/ChangeLog

@@ -1,3 +1,9 @@
+Fri Dec 19 2014
+  * Ruby/GSL 1.16.0.4
+    * Optimize and extract multiplication and division operations on Fixnum
+      and Float. Pull request #8 by Veselin Vasilev.
+    * Fixed division in GSL::Oper for GSL::Vector::Col. Issue #9.
+
 Tue Oct 21 2014
   * Ruby/GSL 1.16.0.3
     * Fixed RDoc issues. Issue #6 by @bigtunacan.

data/ext/gsl/ool.c

@@ -770,7 +770,7 @@ static VALUE rb_ool_conmin_pgrad_parameters_default(VALUE klass)
 	VALUE ary;
 	ool_conmin_parameters_default(ool_conmin_minimizer_pgrad, (void*) &P);
 	ary = create_parameters_ary_pgrad(&P);
-	RBASIC(ary)->klass = cool_conmin_pgrad_parameters;
+	RBGSL_SET_CLASS(ary, cool_conmin_pgrad_parameters);
 	return ary;
 }
 
@@ -780,7 +780,7 @@ static VALUE rb_ool_conmin_spg_parameters_default(VALUE klass)
 	VALUE ary;
 	ool_conmin_parameters_default(ool_conmin_minimizer_spg, (void*) &P);
 	ary = create_parameters_ary_spg(&P);	
-	RBASIC(ary)->klass = cool_conmin_spg_parameters;	
+	RBGSL_SET_CLASS(ary, cool_conmin_spg_parameters);	
 	return ary;	
 }
 
@@ -790,7 +790,7 @@ static VALUE rb_ool_conmin_gencan_parameters_default(VALUE klass)
 	VALUE ary;
 	ool_conmin_parameters_default(ool_conmin_minimizer_gencan, (void*) &P);
 	ary = create_parameters_ary_gencan(&P);		
-	RBASIC(ary)->klass = cool_conmin_gencan_parameters;	
+	RBGSL_SET_CLASS(ary, cool_conmin_gencan_parameters);	
 	return ary;
 }
 

data/lib/gsl.rb

@@ -5,7 +5,8 @@ end
 
 begin
   require "gsl/#{RUBY_VERSION[/\d+.\d+/]}/gsl_native"
-rescue LoadError
+rescue LoadError => err
+  raise if err.respond_to?(:path) && !err.path
   require 'gsl/gsl_native'
 end
 

data/lib/gsl/oper.rb

@@ -1,68 +1,43 @@
-class Fixnum
-  alias :_orig_mul :*
-  alias :_orig_div :/
-  def *(other)
-    if other.kind_of?(GSL::Matrix) or other.kind_of?(GSL::Vector) or other.kind_of?(GSL::Matrix::Int) or other.kind_of?(GSL::Vector::Int) or other.kind_of?(GSL::Vector::Complex)or other.kind_of?(GSL::Matrix::Complex)
-      other.scale(self)
-    else
-      if GSL.have_tensor?
-        if other.kind_of?(GSL::Tensor) or other.kind_of?(GSL::Tensor::Int)
-          other.scale(self)
-        else
-          self._orig_mul(other)
-        end
-      else
-        self._orig_mul(other)
-      end
-    end
-  end
+module GSL::Oper
 
-  def /(other)
-    if other.kind_of?(GSL::Poly) or other.kind_of?(GSL::Poly::Int)
-      a = GSL::Poly[1]; a[0] = self
-      GSL::Rational.new(a, other)
-    elsif other.kind_of?(GSL::Vector::Col) 
-      other.scale(1.0/GSL::pow_2(other.dnrm2))
-    elsif other.kind_of?(GSL::Vector::Int::Col)
-      v = other.to_f
-      v.scale(1.0/GSL::pow_2(v.dnrm2))
-    else
-      self._orig_div(other)
-    end
-  end
-end
+  def self.included(base)
+    base.class_eval {
+      alias_method :_gsl_oper_original_mul, :*
+      alias_method :_gsl_oper_original_div, :/
 
-class Float
-  alias :_orig_mul :*
-  alias :_orig_div :/
+      def *(other)
+        case other
+          when Numeric
+            _gsl_oper_original_mul(other)
+          when GSL::Matrix,          GSL::Vector,
+               GSL::Matrix::Int,     GSL::Vector::Int,
+               GSL::Vector::Complex, GSL::Matrix::Complex,
+               *GSL.have_tensor? ? [GSL::Tensor, GSL::Tensor::Int] : []
+            other.scale(self)
+          else
+            _gsl_oper_original_mul(other)
+        end
+      end
 
-  def *(other)
-    if other.kind_of?(GSL::Matrix) or other.kind_of?(GSL::Vector) or other.kind_of?(GSL::Matrix::Int) or other.kind_of?(GSL::Vector::Int) or other.kind_of?(GSL::Vector::Complex)or other.kind_of?(GSL::Matrix::Complex)
-      other.scale(self)
-    else
-      if GSL.have_tensor?
-        if other.kind_of?(GSL::Tensor) or other.kind_of?(GSL::Tensor::Int)
-          other.scale(self)
-        else
-          self._orig_mul(other)
+      def /(other)
+        case other
+          when Numeric
+            _gsl_oper_original_div(other)
+          when GSL::Poly, GSL::Poly::Int
+            a = GSL::Poly[1]; a[0] = self
+            GSL::Rational.new(a, other)
+          when GSL::Vector::Col
+            other.scale(self / GSL.pow_2(other.dnrm2))
+          when GSL::Vector::Int::Col
+            v = other.to_f
+            v.scale(self / GSL.pow_2(v.dnrm2))
+          else
+            _gsl_oper_original_div(other)
         end
-      else
-        self._orig_mul(other)
       end
-    end
+    }
   end
 
-  def /(other)
-    if other.kind_of?(GSL::Poly) or other.kind_of?(GSL::Poly::Int)
-      a = GSL::Poly[1]; a[0] = self
-      GSL::Rational.new(a, other)
-    elsif other.kind_of?(GSL::Vector::Col) 
-      other.scale(1.0/GSL::pow_2(other.dnrm2))
-    elsif other.kind_of?(GSL::Vector::Int::Col)
-      v = other.to_f
-      v.scale(1.0/GSL::pow_2(v.dnrm2))
-    else
-      self._orig_div(other)
-    end
-  end
 end
+
+[Fixnum, Float].each { |klass| klass.send(:include, GSL::Oper) }

data/lib/gsl/version.rb

@@ -1,5 +1,5 @@
 module GSL
 
-  RUBY_GSL_VERSION = RB_GSL_VERSION = '1.16.0.3'
+  RUBY_GSL_VERSION = RB_GSL_VERSION = '1.16.0.4'
 
 end

data/test/gsl/oper_test.rb

@@ -0,0 +1,98 @@
+require 'test_helper'
+
+class OperTest < GSL::TestCase
+
+  def test_multiplication_matrix
+    matrix = GSL::Matrix.ones(1)
+
+    mul_int   = 2 * matrix
+    mul_float = 0.2 * matrix
+
+    assert_equal 2,   mul_int[0, 0]
+    assert_equal 0.2, mul_float[0, 0]
+  end
+
+  def test_multiplication_matrix_int
+    matrix = GSL::Matrix::Int.ones(1)
+
+    mul_int   = 2 * matrix
+    mul_float = 0.2 * matrix
+
+    assert_equal 2, mul_int[0, 0]
+    assert_equal 0, mul_float[0, 0]
+  end
+
+  def test_multiplication_matrix_complex
+    matrix = GSL::Matrix::Complex.eye(1)
+
+    result = 0.2 * matrix
+
+    assert_equal 0.2, result[0][0]
+  end
+
+  def test_multiplication_vector
+    vector = GSL::Vector[1, 2]
+
+    mul_int   = 2 * vector
+    mul_float = 0.2 * vector
+
+    assert_equal 2,   mul_int[0]
+    assert_equal 0.2, mul_float[0]
+  end
+
+  def test_multiplication_vector_int
+    vector = GSL::Vector::Int[1, 2]
+
+    mul_int   = 2 * vector
+    mul_float = 0.2 * vector
+
+    assert_equal 2, mul_int[0]
+    assert_equal 0, mul_float[0]
+  end
+
+  def test_multiplication_vector_complex
+    re = GSL::Vector[1..4]
+    im = GSL::Vector[5..8]
+
+    vector = GSL::Vector::Complex[re, im]
+
+    mul_int   = 2 * vector
+    mul_float = 0.2 * vector
+
+    assert_equal 10,  mul_int[0][1]
+    assert_equal 1.0, mul_float[0][1]
+  end
+
+  def test_division_poly
+    poly = GSL::Poly.alloc([2])
+
+    a = GSL::Poly[1]; a[0] = 2
+
+    result   = 2 / poly
+    expected = GSL::Rational.new(a, poly)
+
+    assert_equal expected.num, result.num
+    assert_equal expected.den, result.den
+  end
+
+  def test_division_vector_col
+    vector = GSL::Vector[1, 2].col
+
+    result1 = 2 / vector
+    result2 = 2 / result1
+
+    assert_in_epsilon 0.4, result1[0]
+    assert_equal result2, vector
+  end
+
+  def test_division_vector_int_col
+    vector = GSL::Vector::Int[1, 2].col
+
+    result1 = 2 / vector
+    result2 = 2 / result1
+
+    assert_in_epsilon 0.4, result1[0]
+    assert_equal result2.to_a.map(&:to_i), vector.to_a
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-gsl
 version: !ruby/object:Gem::Version
-  version: 1.16.0.3
+  version: 1.16.0.4
 platform: ruby
 authors:
 - Yoshiki Tsunesada
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -32,20 +32,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -744,6 +744,7 @@ files:
 - test/gsl/multiroot_test.rb
 - test/gsl/multiset_test.rb
 - test/gsl/odeiv_test.rb
+- test/gsl/oper_test.rb
 - test/gsl/poly_test.rb
 - test/gsl/qrng_test.rb
 - test/gsl/quartic_test.rb
@@ -765,7 +766,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- Ruby/GSL (v1.16.0.3)
+- Ruby/GSL (v1.16.0.4)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -789,7 +790,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - GSL (http://www.gnu.org/software/gsl/)
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the GNU Scientific Library [Ruby 2.x and GSL 1.16 compatible