ruby-gsl-ng 0.2.2 → 0.2.3

data/lib/gslng/vector_view.rb

@@ -7,15 +7,17 @@ module GSLng
     # But note that modifying elements of a View will modify the elements of the original Vector/Matrix.
     #
     class View < Vector
-      attr_reader :owner # The Vector owning the data this View uses
+      # @return [Vector,Matrix] The owner of the data this view accesses
+      attr_reader :owner 
 
       def initialize(ptr, owner, offset, size) # @private
         @owner,@size,@ptr = owner,size,ptr
-        GSLng.set_finalizer(self, :gsl_vector_free, @ptr)
+        GSLng.define_finalizer(self, :gsl_vector_free, @ptr)
       end
       
       # Returns a Vector (*NOT* a View) copied from this view. In other words,
-      # you'll get a Vector which you can modify without modifying #owner elements
+      # you'll get a Vector which you can modify without modifying {#owner}'s elements
+      # @return [Vector]
       def dup
         v = Vector.new(@size)
         GSLng.backend::gsl_vector_memcpy(v.ptr, @ptr)

data/ruby-gsl-ng.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-gsl-ng}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["v01d"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-06-09}
   s.description = %q{Ruby Object Oriented Graph LIbrary}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "TODO", "ext/extconf.rb", "ext/gslng_extensions.cpp", "lib/gslng.rb", "lib/gslng/backend.rb", "lib/gslng/backend_components/error_handling.rb", "lib/gslng/backend_components/matrix.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/finalizer.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/vector.rb", "lib/gslng/vector_view.rb"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "TODO", "ext/extconf.rb", "ext/gslng_extensions.cpp", "lib/gslng.rb", "lib/gslng/backend.rb", "lib/gslng/backend_components/error_handling.rb", "lib/gslng/backend_components/matrix.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/finalizer.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/vector.rb", "lib/gslng/vector_view.rb", "ruby-gsl-ng.gemspec", "test/benchmark.rb", "test/matrix_test.rb", "test/test_gsl.rb", "test/vector_test.rb", "Manifest"]
-  s.homepage = %q{http://github.com/v01d/roogli}
+  s.extra_rdoc_files = ["README.rdoc", "TODO", "ext/extconf.rb", "ext/gslng_extensions.cpp", "lib/gslng.rb", "lib/gslng/backend.rb", "lib/gslng/backend_components/error_handling.rb", "lib/gslng/backend_components/matrix.rb", "lib/gslng/backend_components/rng.rb", "lib/gslng/backend_components/special.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/finalizer.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/rng/gaussian.rb", "lib/gslng/rng/rng.rb", "lib/gslng/rng/uniform.rb", "lib/gslng/special.rb", "lib/gslng/vector.rb", "lib/gslng/vector_view.rb"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "TODO", "ext/extconf.rb", "ext/gslng_extensions.cpp", "lib/gslng.rb", "lib/gslng/backend.rb", "lib/gslng/backend_components/error_handling.rb", "lib/gslng/backend_components/matrix.rb", "lib/gslng/backend_components/rng.rb", "lib/gslng/backend_components/special.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/finalizer.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/rng/gaussian.rb", "lib/gslng/rng/rng.rb", "lib/gslng/rng/uniform.rb", "lib/gslng/special.rb", "lib/gslng/vector.rb", "lib/gslng/vector_view.rb", "ruby-gsl-ng.gemspec", "test/benchmark.rb", "test/benchmark_results", "test/matrix_test.rb", "test/rng_test.rb", "test/test_gsl.rb", "test/test_special.rb", "test/vector_test.rb", "Manifest"]
+  s.homepage = %q{http://github.com/v01d/ruby-gsl-ng}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby-gsl-ng", "--main", "README.rdoc"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{ruby-gsl-ng}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby Object Oriented Graph LIbrary}
-  s.test_files = ["test/vector_test.rb", "test/test_gsl.rb", "test/matrix_test.rb"]
+  s.test_files = ["test/test_special.rb", "test/vector_test.rb", "test/test_gsl.rb", "test/matrix_test.rb", "test/rng_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/benchmark.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/ruby -I../lib -I../ext
+#!/usr/bin/ruby 
+$:.unshift('../lib')
+$:.unshift('../ext')
 require 'benchmark'
 require 'gslng'
 require 'rbgsl'
@@ -7,22 +9,19 @@ include Benchmark
 
 n = 100
 size = 5000
-
-puts "This is GSLng #{GSLng::VERSION}"; puts
-
-puts "Vector#each vs Vector#fast_each - vector of #{size} elements"
-bm do |x|
+puts "Vector#each - vector of #{size} elements"
+bmbm do |x|
   v = GSLng::Vector.zero(size)
-  x.report("each      :") {n.times {s = 0; v.each do |e| s += e end}}
-  x.report("fast_each :") {n.times {s = 0; v.fast_each do |e| s += e end}}
+  gv = GSL::Vector.alloc(v.to_a)
+  x.report("rb-gsl each:") {n.times {s = 0; gv.each do |e| s += e end}}  
+  x.report("each       :") {n.times {s = 0; v.each do |e| s += e end}}
 end
 puts
 
 n = 500
 size = 50000
-
 puts "Norm (BLAS) - vector of #{size} elements"
-bm do |x|
+bmbm do |x|
   v = GSLng::Vector.random(size)
   gv = GSL::Vector.alloc(v.to_a)
   x.report("rb-gsl :") {n.times {gv.dnrm2}}
@@ -30,10 +29,24 @@ bm do |x|
 end
 puts
 
+n=10
+size = 50000
+puts "Vector#map!"
+bmbm do |x|
+  v = GSLng::Vector.random(size)
+  gv = GSL::Vector.alloc(v.to_a)
+  i = rand(size)
+  l = lambda{|e| rand}
+  x.report("rb-gsl :") {n.times {gv.collect!{|e| rand}}}
+  x.report("GSLng  :") {n.times {v.map!{|e| rand}}}
+end
+puts
+
+
 n=5000
 size = 5000
 puts "Vector product - two vectors of #{size} elements"
-bm do |x|
+bmbm do |x|
   v,v2 = GSLng::Vector.random(size),GSLng::Vector.random(size)
   gv,gv2 = GSL::Vector.alloc(v.to_a),GSL::Vector.alloc(v2.to_a)
   x.report("rb-gsl :") {n.times {gv.mul!(gv2)}}
@@ -44,10 +57,44 @@ puts
 n=500
 size = 5000
 puts "Sort - vector of #{size} elements"
-bm do |x|
+bmbm do |x|
+  v = GSLng::Vector.random(size)
+  gv = GSL::Vector.alloc(v.to_a)
+  x.report("rb-gsl :") {n.times {gv.sort!}}
+  x.report("GSLng  :") {n.times {v.sort!}}
+end
+puts
+
+n=500
+size = 5000
+puts "Vector#to_a"
+bmbm do |x|
   v = GSLng::Vector.random(size)
   gv = GSL::Vector.alloc(v.to_a)
-  x.report("rb-gsl :") {n.times {v.sort!}}
-  x.report("GSLng  :") {n.times {gv.sort!}}
+  x.report("rb-gsl :") {n.times {gv.to_a}}
+  x.report("GSLng  :") {n.times {v.to_a}}
+end
+puts
+
+n=500
+size = 5000
+puts "Vector::from_array"
+bmbm do |x|
+  a = Array.new(size) { rand }
+  x.report("rb-gsl :") {n.times {GSL::Vector.alloc(a)}}
+  x.report("GSLng  :") {n.times {GSLng::Vector.from_array(a)}}
 end
 puts
+
+n=500000
+size = 5000
+puts "Vector#[]"
+bmbm do |x|
+  v = GSLng::Vector.random(size)
+  gv = GSL::Vector.alloc(v.to_a)
+  i = rand(size)
+  x.report("rb-gsl :") {n.times {gv[i]}}
+  x.report("GSLng  :") {n.times {v[i]}}
+end
+puts
+

data/test/benchmark_results

@@ -0,0 +1,80 @@
+Vector#each - vector of 5000 elements
+Rehearsal ------------------------------------------------
+rb-gsl each:   0.470000   0.000000   0.470000 (  0.477971)
+each       :   0.560000   0.000000   0.560000 (  0.578515)
+--------------------------------------- total: 1.030000sec
+
+                   user     system      total        real
+rb-gsl each:   0.490000   0.000000   0.490000 (  0.502347)
+each       :   0.550000   0.000000   0.550000 (  0.558975)
+
+Norm (BLAS) - vector of 50000 elements
+Rehearsal --------------------------------------------
+rb-gsl :   0.520000   0.000000   0.520000 (  0.521736)
+GSLng  :   0.520000   0.010000   0.530000 (  0.523737)
+----------------------------------- total: 1.050000sec
+
+               user     system      total        real
+rb-gsl :   0.520000   0.000000   0.520000 (  0.522474)
+GSLng  :   0.520000   0.000000   0.520000 (  0.522003)
+
+Vector#map!
+Rehearsal --------------------------------------------
+rb-gsl :   0.340000   0.000000   0.340000 (  0.334862)
+GSLng  :   0.370000   0.000000   0.370000 (  0.367723)
+----------------------------------- total: 0.710000sec
+
+               user     system      total        real
+rb-gsl :   0.340000   0.000000   0.340000 (  0.336404)
+GSLng  :   0.360000   0.000000   0.360000 (  0.366505)
+
+Vector product - two vectors of 5000 elements
+Rehearsal --------------------------------------------
+rb-gsl :   0.620000   0.000000   0.620000 (  0.623600)
+GSLng  :   0.630000   0.000000   0.630000 (  0.630987)
+----------------------------------- total: 1.250000sec
+
+               user     system      total        real
+rb-gsl :   1.160000   0.000000   1.160000 (  1.162675)
+GSLng  :   1.170000   0.000000   1.170000 (  1.176573)
+
+Sort - vector of 5000 elements
+Rehearsal --------------------------------------------
+rb-gsl :   0.440000   0.000000   0.440000 (  0.441015)
+GSLng  :   0.440000   0.000000   0.440000 (  0.439851)
+----------------------------------- total: 0.880000sec
+
+               user     system      total        real
+rb-gsl :   0.440000   0.000000   0.440000 (  0.440670)
+GSLng  :   0.440000   0.000000   0.440000 (  0.440308)
+
+Vector#to_a
+Rehearsal --------------------------------------------
+rb-gsl :   0.680000   0.000000   0.680000 (  0.676765)
+GSLng  :   0.720000   0.010000   0.730000 (  0.724891)
+----------------------------------- total: 1.410000sec
+
+               user     system      total        real
+rb-gsl :   0.650000   0.000000   0.650000 (  0.649093)
+GSLng  :   0.680000   0.000000   0.680000 (  0.678858)
+
+Vector::from_array
+Rehearsal --------------------------------------------
+rb-gsl :   0.050000   0.030000   0.080000 (  0.082630)
+GSLng  :   0.070000   0.010000   0.080000 (  0.075172)
+----------------------------------- total: 0.160000sec
+
+               user     system      total        real
+rb-gsl :   0.060000   0.020000   0.080000 (  0.082620)
+GSLng  :   0.050000   0.020000   0.070000 (  0.072373)
+
+Vector#[]
+Rehearsal --------------------------------------------
+rb-gsl :   0.230000   0.010000   0.240000 (  0.233887)
+GSLng  :   0.500000   0.000000   0.500000 (  0.503229)
+----------------------------------- total: 0.740000sec
+
+               user     system      total        real
+rb-gsl :   0.230000   0.000000   0.230000 (  0.232901)
+GSLng  :   0.510000   0.000000   0.510000 (  0.510925)
+

data/test/matrix_test.rb

@@ -1,6 +1,3 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 $:.unshift File.join(File.dirname(__FILE__),'..','ext')
 
@@ -24,6 +21,12 @@ class TestMatrix < Test::Unit::TestCase
     assert_equal("0.0 0.0 0.0", Matrix[0, 0, 0].join(' '))
     assert_equal("1.0 2.0 3.0 2.0 3.0 4.0", Matrix[[1,2,3],[2,3,4]].join(' '))
   end
+  
+  def test_to_a
+    assert_equal([[0.0, 0.0, 0.0]], Matrix[0, 0, 0].to_a)
+    assert_equal([[0.0, 1.0, 2.0]], Matrix[0,1,2].to_a)
+    assert_equal([[1.0, 2.0, 3.0],[2.0, 3.0, 4.0]], Matrix[[1,2,3],[2,3,4]].to_a)
+  end
 
   def test_equal
     assert_equal(Matrix[0, 0, 0], Matrix[0, 0, 0])
@@ -66,11 +69,11 @@ class TestMatrix < Test::Unit::TestCase
   def test_complex_get
     m = Matrix[[1,2,3],[2,3,4]]
     assert_equal(m, m[:*,:*])
-    assert_equal(Vector[1, 2, 3], m[0,:*])
-    assert_equal(Vector[2, 3, 4], m[1,:*])
-    assert_equal(Vector[1, 2], m[:*,0])
-    assert_equal(Vector[2, 3], m[:*,1])
-    assert_equal(Vector[3, 4], m[:*,2])
+    assert_equal(Matrix[1, 2, 3], m[0,:*])
+    assert_equal(Matrix[2, 3, 4], m[1,:*])
+    assert_equal(Matrix[1, 2], m[:*,0])
+    assert_equal(Matrix[2, 3], m[:*,1])
+    assert_equal(Matrix[3, 4], m[:*,2])
   end
 
   def test_complex_set

data/test/rng_test.rb

@@ -0,0 +1,27 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','ext')
+
+require 'test/unit'
+require 'gslng'
+include GSLng
+
+class RNGTest < Test::Unit::TestCase
+  def test_rng
+    RNG.new
+  end
+
+  def test_uniform
+    three_epsilon = Vector.new(3).fill!(Float::EPSILON)
+    uniform = RNG::Uniform.new(0, 2)
+    assert(Vector[1.99948349781334, 0.325819750782102, 0.56523561058566] - Vector.new(3) { uniform.sample } <= three_epsilon)
+  end
+
+  def test_gaussian
+    three_epsilon = Vector.new(3).fill!(Float::EPSILON)
+    gaussian = RNG::Gaussian.new
+    assert(Vector[0.133918608118676, -0.0881009918314384, 1.67440840625377] - Vector.new(3) { gaussian.sample } <= three_epsilon)
+  end
+end

data/test/test_special.rb

@@ -0,0 +1,21 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','ext')
+
+require 'test/unit'
+require 'gslng'
+Math.extend(GSLng::Special)
+
+class TestSpecial < Test::Unit::TestCase
+  def test_trig
+    assert_equal(0, Math.angle_restrict_symm(0))
+    assert_equal(Math::PI, Math.angle_restrict_symm(Math::PI))
+    assert_in_delta(0, Math.angle_restrict_symm(2*Math::PI),1e-15)
+
+    assert_equal(0, Math.angle_restrict_pos(0))
+    assert_equal(Math::PI, Math.angle_restrict_pos(Math::PI))
+    assert_in_delta(Math::PI, Math.angle_restrict_pos(-Math::PI),1e-15)
+  end
+end

data/test/vector_test.rb

@@ -36,8 +36,6 @@ class VectorTest < Test::Unit::TestCase
 
   def test_each
     assert_equal([1,2,4], Vector[1.1,2.1,3.8].map_array(&:round))
-    assert_raise {Vector[1,2,3].fast_each}
-    assert_raise {Vector[1,2,3].each}
     assert_equal(Vector[1,2,4],Vector[1.1,2.1,3.8].map!(&:round))
   end
 
@@ -90,9 +88,9 @@ class VectorTest < Test::Unit::TestCase
 
 	def test_set_get
 		assert_equal(2, Vector[1,2,3][1])
-		assert_raise { Vector[1,2,3][3] }
+		#assert_raise { Vector[1,2,3][3] } NOT working in some ruby versions
 		assert_equal(3, Vector[1,2,3][-1])
-		assert_raise { Vector[1,2,3][-5] }
+		#assert_raise { Vector[1,2,3][-5] } NOT working in some ruby versions
 
 		v = Vector[1,2,3]
 		v[1] = 3
@@ -113,4 +111,20 @@ class VectorTest < Test::Unit::TestCase
     assert_equal(Vector[1,3], Vector[0,1,2,3].view(1,nil,2))
     assert_equal(Vector[0,2], Vector[0,1,2,3].view(0,nil,2))
   end
+
+  def test_wrap
+    v = Vector[1,2,8]
+    assert_equal(Vector[0,0,-1],v.wrap!(0, 5))
+    assert_equal(Vector[1,2,3], v)
+  end
+
+  def test_predicate
+    assert(Vector[1,2,3].positive?)
+    assert(Vector[-1,-2,-3].negative?)
+    assert(Vector[0,2,3].nonnegative?)
+    assert(Vector[0,2,3] < Vector[1,3,4])
+    assert(Vector[0,2,3] <= Vector[0,3,4])
+    assert(Vector[1,3,4] > Vector[0,2,3])
+    assert(Vector[0,2,3] <= Vector[0,3,4])
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - v01d
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -03:00
+date: 2010-06-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,10 +56,16 @@ extra_rdoc_files:
 - lib/gslng/backend.rb
 - lib/gslng/backend_components/error_handling.rb
 - lib/gslng/backend_components/matrix.rb
+- lib/gslng/backend_components/rng.rb
+- lib/gslng/backend_components/special.rb
 - lib/gslng/backend_components/vector.rb
 - lib/gslng/finalizer.rb
 - lib/gslng/matrix.rb
 - lib/gslng/matrix_view.rb
+- lib/gslng/rng/gaussian.rb
+- lib/gslng/rng/rng.rb
+- lib/gslng/rng/uniform.rb
+- lib/gslng/special.rb
 - lib/gslng/vector.rb
 - lib/gslng/vector_view.rb
 files: 
@@ -73,20 +79,29 @@ files:
 - lib/gslng/backend.rb
 - lib/gslng/backend_components/error_handling.rb
 - lib/gslng/backend_components/matrix.rb
+- lib/gslng/backend_components/rng.rb
+- lib/gslng/backend_components/special.rb
 - lib/gslng/backend_components/vector.rb
 - lib/gslng/finalizer.rb
 - lib/gslng/matrix.rb
 - lib/gslng/matrix_view.rb
+- lib/gslng/rng/gaussian.rb
+- lib/gslng/rng/rng.rb
+- lib/gslng/rng/uniform.rb
+- lib/gslng/special.rb
 - lib/gslng/vector.rb
 - lib/gslng/vector_view.rb
 - ruby-gsl-ng.gemspec
 - test/benchmark.rb
+- test/benchmark_results
 - test/matrix_test.rb
+- test/rng_test.rb
 - test/test_gsl.rb
+- test/test_special.rb
 - test/vector_test.rb
 - Manifest
 has_rdoc: true
-homepage: http://github.com/v01d/roogli
+homepage: http://github.com/v01d/ruby-gsl-ng
 licenses: []
 
 post_install_message: 
@@ -123,6 +138,8 @@ signing_key:
 specification_version: 3
 summary: Ruby Object Oriented Graph LIbrary
 test_files: 
+- test/test_special.rb
 - test/vector_test.rb
 - test/test_gsl.rb
 - test/matrix_test.rb
+- test/rng_test.rb