ruby-gsl-ng 0.2.4.1 → 0.2.6

data/lib/gslng/vector_view.rb

@@ -11,8 +11,10 @@ module GSLng
       attr_reader :owner 
 
       def initialize(ptr, owner, size, stride = 1) # @private
+        @backend = GSLng.backend
         @owner,@size,@stride = owner,size,stride
         @ptr = FFI::AutoPointer.new(ptr, View.method(:release))
+        @ptr_value = @ptr.to_i
       end
 
       def View.release(ptr)
@@ -24,7 +26,7 @@ module GSLng
       # @return [Vector]
       def dup
         v = Vector.new(@size)
-        GSLng.backend::gsl_vector_memcpy(v.ptr, @ptr)
+        @backend.gsl_vector_memcpy(v.ptr, @ptr)
         return v
       end
       alias_method :clone, :dup

data/ruby-gsl-ng.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-gsl-ng}
-  s.version = "0.2.4.1"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["v01d"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2011-03-07}
   s.description = %q{Ruby/GSL new-generation wrapper}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "ext/extconf.rb", "ext/gslng_extensions.cpp", "ext/plotting.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/stats.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/plotter.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", "ext/extconf.rb", "ext/gslng_extensions.cpp", "ext/plotting.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/stats.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/plotter.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.extra_rdoc_files = ["README.rdoc", "ext/extconf.rb", "ext/gslng_extensions.cpp", "ext/plotting.cpp", "lib/core_extensions/array.rb", "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/stats.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/plotter.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", "Manifest", "README.rdoc", "Rakefile", "ext/extconf.rb", "ext/gslng_extensions.cpp", "ext/plotting.cpp", "lib/core_extensions/array.rb", "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/stats.rb", "lib/gslng/backend_components/vector.rb", "lib/gslng/matrix.rb", "lib/gslng/matrix_view.rb", "lib/gslng/plotter.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"]
   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"]

data/test/benchmark_results

@@ -1,80 +1,92 @@
+#################################### Vector ####################################
+Vector#[]
+Rehearsal --------------------------------------------
+rb-gsl :   0.300000   0.000000   0.300000 (  0.301650)
+GSLng  :   0.360000   0.000000   0.360000 (  0.369323)
+----------------------------------- total: 0.660000sec
+
+               user     system      total        real
+rb-gsl :   0.310000   0.000000   0.310000 (  0.387314)
+GSLng  :   0.340000   0.000000   0.340000 (  0.348130)
+
 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
+Rehearsal --------------------------------------------
+rb-gsl :   0.220000   0.000000   0.220000 (  0.218779)
+GSLng  :   0.200000   0.000000   0.200000 (  0.205919)
+----------------------------------- total: 0.420000sec
 
-                   user     system      total        real
-rb-gsl each:   0.490000   0.000000   0.490000 (  0.502347)
-each       :   0.550000   0.000000   0.550000 (  0.558975)
+               user     system      total        real
+rb-gsl :   0.220000   0.000000   0.220000 (  0.231055)
+GSLng  :   0.200000   0.000000   0.200000 (  0.203754)
 
 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
+rb-gsl :   0.520000   0.000000   0.520000 (  0.521935)
+GSLng  :   0.520000   0.000000   0.520000 (  0.521729)
+----------------------------------- total: 1.040000sec
 
                user     system      total        real
-rb-gsl :   0.520000   0.000000   0.520000 (  0.522474)
-GSLng  :   0.520000   0.000000   0.520000 (  0.522003)
+rb-gsl :   0.520000   0.000000   0.520000 (  0.521828)
+GSLng  :   0.520000   0.000000   0.520000 (  0.521704)
 
 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
+rb-gsl :   0.240000   0.000000   0.240000 (  0.239012)
+GSLng  :   0.260000   0.000000   0.260000 (  0.259632)
+----------------------------------- total: 0.500000sec
 
                user     system      total        real
-rb-gsl :   0.340000   0.000000   0.340000 (  0.336404)
-GSLng  :   0.360000   0.000000   0.360000 (  0.366505)
+rb-gsl :   0.250000   0.000000   0.250000 (  0.245187)
+GSLng  :   0.240000   0.000000   0.240000 (  0.235865)
 
 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)
+rb-gsl :   0.620000   0.000000   0.620000 (  0.655681)
+GSLng  :   0.620000   0.010000   0.630000 (  0.652757)
 ----------------------------------- 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)
+rb-gsl :   1.170000   0.000000   1.170000 (  1.178990)
+GSLng  :   1.170000   0.000000   1.170000 (  1.172545)
 
 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)
+rb-gsl :   0.440000   0.000000   0.440000 (  0.441440)
+GSLng  :   0.440000   0.000000   0.440000 (  0.444755)
 ----------------------------------- 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)
+rb-gsl :   0.430000   0.000000   0.430000 (  0.440950)
+GSLng  :   0.450000   0.010000   0.460000 (  0.447733)
 
 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
+rb-gsl :   0.470000   0.000000   0.470000 (  0.490407)
+GSLng  :   0.470000   0.000000   0.470000 (  0.472971)
+----------------------------------- total: 0.940000sec
 
                user     system      total        real
-rb-gsl :   0.650000   0.000000   0.650000 (  0.649093)
-GSLng  :   0.680000   0.000000   0.680000 (  0.678858)
+rb-gsl :   0.450000   0.000000   0.450000 (  0.452365)
+GSLng  :   0.460000   0.000000   0.460000 (  0.450768)
 
 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
+rb-gsl :   0.730000   0.140000   0.870000 (  0.868696)
+GSLng  :   0.650000   0.160000   0.810000 (  0.811343)
+----------------------------------- total: 1.680000sec
 
                user     system      total        real
-rb-gsl :   0.060000   0.020000   0.080000 (  0.082620)
-GSLng  :   0.050000   0.020000   0.070000 (  0.072373)
+rb-gsl :   0.730000   0.000000   0.730000 (  0.727155)
+GSLng  :   0.650000   0.000000   0.650000 (  0.644819)
 
-Vector#[]
+#################################### Matrix ####################################
+Matrix#[] - 50 x 50
 Rehearsal --------------------------------------------
-rb-gsl :   0.230000   0.010000   0.240000 (  0.233887)
-GSLng  :   0.500000   0.000000   0.500000 (  0.503229)
------------------------------------ total: 0.740000sec
+rb-gsl :   0.380000   0.080000   0.460000 (  0.455793)
+GSLng  :   0.530000   0.000000   0.530000 (  0.542278)
+----------------------------------- total: 0.990000sec
 
                user     system      total        real
-rb-gsl :   0.230000   0.000000   0.230000 (  0.232901)
-GSLng  :   0.510000   0.000000   0.510000 (  0.510925)
+rb-gsl :   0.360000   0.000000   0.360000 (  0.367216)
+GSLng  :   0.510000   0.000000   0.510000 (  0.510689)
 

data/test/matrix_test.rb

@@ -111,6 +111,15 @@ class TestMatrix < Test::Unit::TestCase
     assert_equal(Matrix[[2,3,4],[1,2,3],[3,4,5]], m.swap_rows(0,1))
     assert_equal(Matrix[[3,2,4],[2,1,3],[4,3,5]], m.swap_columns(0,1))
     assert_equal(Matrix[[3,2,4],[2,1,3],[4,3,5]], m.swap_rowcol(0,0))
+
+    m = Matrix[[1,2,3],[4,5,6],[7,8,9]]
+    assert_equal(Matrix[[0, 0, 0],[0, 1, 2],[0, 4, 5]], m.slide(1, 1))
+
+    m = Matrix[[1,2,3],[4,5,6],[7,8,9]]
+    assert_equal(Matrix[[5, 6, 0],[8, 9, 0],[0, 0, 0]], m.slide(-1, -1))
+
+    m = Matrix[[1,2,3],[4,5,6],[7,8,9]]
+    assert_equal(Matrix[[4, 5, 6],[7, 8, 9],[0, 0, 0]], m.slide(-1, 0))
   end
 
   def test_view

data/test/test_gsl.rb

@@ -7,4 +7,5 @@ require 'test/unit'
 
 require 'vector_test'
 require 'matrix_test'
-
+require 'rng_test'
+require 'test_special'

data/test/vector_test.rb

@@ -4,6 +4,7 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 $:.unshift File.join(File.dirname(__FILE__),'..','ext')
 
+require 'rubygems'
 require 'test/unit'
 require 'gslng'
 
@@ -15,6 +16,10 @@ class VectorTest < Test::Unit::TestCase
 		assert_equal(10, Vector.zero(10).size)
 		assert(Vector.zero(10).zero?)
 		assert_nothing_raised { Vector.random(10) }
+    assert_equal(Vector[0], Vector.linspace(0, 1, 1.5))
+    assert_equal(Vector[0,1], Vector.linspace(0, 1, 1))
+    assert_equal(Vector[0,0.5,1], Vector.linspace(0, 1, 0.5))
+    assert_equal(Vector[0,0.7], Vector.linspace(0, 1, 0.7))
   end
 
 	def test_to_s
@@ -31,7 +36,10 @@ class VectorTest < Test::Unit::TestCase
 		assert_equal(Vector[1,2,3], Vector[1,2,3])
     assert_equal(Vector[0...3], [0,1,2])
 		assert_equal(Vector.zero(3), Vector.zero(3))
-		assert_not_equal(Vector.zero(4), Vector.zero(3))		
+		assert_not_equal(Vector.zero(4), Vector.zero(3))
+
+    assert(Vector[1,2,3].eql?(Vector[1,2,3]))
+    assert(!Vector[1,2,3].eql?(Vector[1,2,4]))
 	end
 
   def test_each
@@ -49,6 +57,11 @@ class VectorTest < Test::Unit::TestCase
 		assert_equal(v1.dup, v2)
 	end
 
+  def test_stats
+    assert_equal(Vector[1, 2, 3, 4, 5].median, 3)
+    assert_equal(Vector[1, 2, 3, 4].median, 2.5)
+  end
+
 	def test_sets
 		assert_equal(Vector.zero(3).set!(1), Vector[1,1,1])
 		assert_equal(Vector.zero(3).set!(1).zero!, Vector.zero(3))
@@ -115,9 +128,9 @@ class VectorTest < Test::Unit::TestCase
   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)
+    v = Vector[1,2,8,-1,11]
+    assert_equal(Vector[0,0,-1,1,-2],v.wrap!(5))
+    assert_equal(Vector[1,2,3,4,1], v)
   end
 
   def test_predicate

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  - 1
-  version: 0.2.4.1
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - v01d
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -03:00
+date: 2011-03-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +54,7 @@ extra_rdoc_files:
 - ext/extconf.rb
 - ext/gslng_extensions.cpp
 - ext/plotting.cpp
+- lib/core_extensions/array.rb
 - lib/gslng.rb
 - lib/gslng/backend.rb
 - lib/gslng/backend_components/error_handling.rb
@@ -74,11 +74,13 @@ extra_rdoc_files:
 - lib/gslng/vector_view.rb
 files: 
 - History.txt
+- Manifest
 - README.rdoc
 - Rakefile
 - ext/extconf.rb
 - ext/gslng_extensions.cpp
 - ext/plotting.cpp
+- lib/core_extensions/array.rb
 - lib/gslng.rb
 - lib/gslng/backend.rb
 - lib/gslng/backend_components/error_handling.rb
@@ -104,7 +106,6 @@ files:
 - test/test_gsl.rb
 - test/test_special.rb
 - test/vector_test.rb
-- Manifest
 has_rdoc: true
 homepage: http://github.com/v01d/ruby-gsl-ng
 licenses: []