narray 0.5.9.4 → 0.5.9.5

data/src/narray.h

@@ -1,7 +1,7 @@
 /*
   narray.h
   Numerical Array Extention for Ruby
-    (C) Copyright 1999-2003 by Masahiro TANAKA
+    (C) Copyright 1999-2008 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -19,8 +19,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.5.9p4"
-#define NARRAY_VERSION_CODE 594
+#define NARRAY_VERSION "0.5.9p5"
+#define NARRAY_VERSION_CODE 595
 
 /*
   Data types used in NArray :

data/src/narray_local.h

@@ -1,7 +1,7 @@
 /*
   narray_local.h
   Numerical Array Extention for Ruby
-    (C) Copyright 1999-2003 by Masahiro TANAKA
+    (C) Copyright 1999-2008 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program

metadata

@@ -3,14 +3,14 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: narray
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.4
-date: 2008-01-28 00:00:00 +09:00
+  version: 0.5.9.5
+date: 2008-06-10 00:00:00 +09:00
 summary: N-dimensional Numerical Array class for Ruby
 require_paths: 
 - .
 email: masa16.tanaka@gmail.com
 homepage: http://narray.rubyforge.org/
-rubyforge_project: 
+rubyforge_project: narray
 description: 
 autorequire: 
 default_executable: 
@@ -51,42 +51,6 @@ files:
 - src/narray_local.h
 - src/lib/narray_ext.rb
 - src/lib/nmatrix.rb
-- src/nimage/README.en
-- src/nimage/extconf.rb
-- src/nimage/nimage.c
-- src/nimage/demo
-- src/nimage/demo/fits.rb
-- src/nimage/demo/fits_convol.rb
-- src/nimage/demo/fits_fftdemo.rb
-- src/nimage/demo/fitsdemo1.rb
-- src/nimage/demo/fitsdemo2.rb
-- src/nimage/demo/fitsdemo3.rb
-- src/nimage/demo/fitsmorph.rb
-- src/nimage/demo/life_na.rb
-- src/nimage/demo/mandel.rb
-- src/nimage/lib
-- src/nimage/lib/nimage.rb
-- src/speed/add.py
-- src/speed/add.rb
-- src/speed/add_int.py
-- src/speed/add_int.rb
-- src/speed/lu.m
-- src/speed/lu.rb
-- src/speed/mat.m
-- src/speed/mat.rb
-- src/speed/mul.py
-- src/speed/mul.rb
-- src/speed/mul2.py
-- src/speed/mul2.rb
-- src/speed/mul_comp.py
-- src/speed/mul_comp.rb
-- src/speed/mul_int.py
-- src/speed/mul_int.rb
-- src/speed/mybench.py
-- src/speed/mybench.rb
-- src/speed/solve.m
-- src/speed/solve.py
-- src/speed/solve.rb
 - src/test/statistics.rb
 - src/test/testarray.rb
 - src/test/testbit.rb
@@ -111,6 +75,13 @@ files:
 - src/test/teststr.rb
 - src/test/testtrans.rb
 - src/test/testwhere.rb
+- src/bench/all.rb
+- src/bench/bench.m
+- src/bench/bench.py
+- src/bench/bench.rb
+- src/bench/dummy.m
+- src/bench/dummy.py
+- src/bench/dummy.rb
 test_files: []
 
 rdoc_options: []

data/src/nimage/README.en

@@ -1,38 +0,0 @@
-
-NAME
-
-   NImage --- A Ruby Extension Library for displaying Images on X11
-	      by Masahiro Tanaka 2000/07/05
-
-DESCRIPTION
-
-  NImage is a simple Ruby class for displaying 2-D Data as images
-  on X11 display.
-
-REQUIREMENT
-
-  Ruby (ver 1.4.4 or later)
-  NArray (ver 0.3.1 or later)
-
-INSTALLATION
-
-  ruby extconf.rb
-  make
-  make install
-
-USAGE
-
-  require "nimage"
-  image = NArray.float(100,100) # some 2-D array
-  win = NImage.show image
-  win.close
-
-ACKNOWLEDGMENT
-
-  moriq-san for Ruby/X11 which is useful for prototyping
-
-PS
-
-  FITS image file is not included. Sorry.
-
-END

data/src/nimage/demo/fits.rb

@@ -1,97 +0,0 @@
-# A simple class for handling FITS images
-#	by Masahiro TANAKA 1999/12/19
-#    No document, sorry.
-#
-# Require:  Ruby/NArray
-#    http://koala.astro.isas.ac.jp/~masa/ruby/
-#
-# Example:
-#    f = Fits.read('somthing.fits')
-#    f.data # => 2-dimentional NArray data
-
-require 'narray'
-
-class Fits
-  attr_accessor :data
-  attr_accessor :header
-
-  def initialize
-    @data   = ""
-    @header = []
-  end
-
-  def data_to_narray(data,type,shape)
-    NArray.to_na( data, type, *shape ).ntoh
-  end
-
-
-  def read(fname)
-    f = File.open(fname, "r")
-    @header = []
-    nbytes = 0
-    foo = {}
-
-    while 
-      line = f.read(80)
-      nbytes += 80;
-
-      @header.push line
-
-      name = line[0,8].strip!
-      break if name=="END"
-
-      rest = line[8..-1]
-      if rest =~ /^= +('[^']*')/ #'
-	foo[name] = $1
-      elsif rest =~ /^= +([^\s\/]+)/
-	foo[name] = $1
-      end
-    end
-
-    # skip extra space
-    nbytes %= 2880
-    f.read(2880-nbytes) if nbytes > 0
-
-    naxis = foo["NAXIS"].to_i
-
-    case foo["BITPIX"]
-    when "8";	elm_size = 1; type = NArray::BYTE
-    when "16";	elm_size = 2; type = NArray::SINT
-    when "32";	elm_size = 4; type = NArray::LINT
-    when "-32";	elm_size = 4; type = NArray::SFLOAT
-    when "-64";	elm_size = 8; type = NArray::DFLOAT
-    end
-
-    size = 1
-    dims = []
-    for i in 1..naxis
-      key = "NAXIS#{i}"
-      if foo.key? key
-	n = foo[key].to_i
-	size = size * n
-	dims.push n
-	#printf "%s=%i\n", key,n
-      end
-    end
-
-    @data = data_to_narray( f.read(size*elm_size), type, dims )
-    f.close
-
-    if foo.key? "BSCALE"
-      s = foo["BSCALE"].to_f
-      @data = @data.to_f.mul!(s) if s != 1
-    end
-
-    if foo.key? "BZERO"
-      s = foo["BZERO"].to_f
-      @data = @data.to_f.add!(s) if s != 0
-    end
-
-    self
-  end
-
-end
-
-def Fits.read(*a)
-  Fits.new.read(*a)
-end

data/src/nimage/demo/fits_convol.rb

@@ -1,28 +0,0 @@
-# FITS-FFT demo 
-require 'fits'
-require 'nimage'
-
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-nx,ny = f.data.shape
-
-NImage.show f.data #, 'M51'
-
-# FFT low-pass filtering
-z = 50.0/nx
-x = NArray.float(nx).indgen! * z
-y = NArray.float(ny).indgen! * z
-x[-(nx/2)..-1] = x[nx/2..1]
-y[-(ny/2)..-1] = y[ny/2..1]
-y.reshape!(1,ny)
-# Operation between [nx,1] and [1,ny] arrays makes [nx,ny].
-filt = NMath::exp(-(x**2)-(y**2))
-filt /= filt.sum
-
-print "Now executing FFT...\n"
-lowpass = FFTW::convol(f.data,filt)
-
-NImage.show lowpass #, 'M51 (FFT low-pass)'
-
-print "Hit return key..."
-STDIN.getc

data/src/nimage/demo/fits_fftdemo.rb

@@ -1,27 +0,0 @@
-# FITS-FFT demo 
-require 'fits'
-require 'nimage'
-
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-nx,ny = f.data.shape
-
-NImage.show f.data #, 'M51'
-
-# FFT low-pass filtering
-x = NArray.float(nx).indgen! / (nx*0.1)
-y = NArray.float(ny).indgen! / (nx*0.1)
-x[-nx/2] = x[nx/2-1..0]
-y[-ny/2] = y[ny/2-1..0]
-y.reshape!(1,ny)
-# Operation between [nx,1] and [1,ny] arrays makes [nx,ny].
-filt = 1 / (x**2 + y**2 + 1)
-
-print "Now executing FFT...\n"
-spec = FFTW.fftw(f.data,-1)
-lowpass = FFTW.fftw(spec*filt,1).real / (nx*ny)
-
-NImage.show  lowpass #, 'M51 (FFT low-pass)'
-
-print "Hit return key..."
-STDIN.getc

data/src/nimage/demo/fitsdemo1.rb

@@ -1,13 +0,0 @@
-# FITS demo 
-require 'fits'
-require 'nimage'
-
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-p f.data
-
-v = NImage.show f.data
-
-print "Hit return key..."
-STDIN.getc
-v.close

data/src/nimage/demo/fitsdemo2.rb

@@ -1,30 +0,0 @@
-# FITS demo 
-require 'fits'
-require 'nimage'
-
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-
-NImage.show f.data #, 'M51'
-
-nx = f.data.shape[0]
-ny = f.data.shape[1]
-
-x = NArray.int(nx/2).indgen!*2
-y = NArray.int(ny/2).indgen!*2
-NImage.show f.data[x,y] #, 'M51 (x0.5)'
-
-x = NArray.float(nx*1.5).indgen!/1.5
-y = NArray.float(ny*1.5).indgen!/1.5
-NImage.show f.data[x,y] #, 'M51 (x1.5)'
-
-x = NArray.float(nx).indgen!
-y = NArray.float(ny).indgen!.newdim!(0)
-i = y / (ny/2) - 1
-i = (x-nx/2) * NMath.sqrt(i.abs) + nx/2 + y*nx
-d = f.data.clone.fill!(0)
-d[i] = f.data
-NImage.show d #, 'M51 (x1.5)'
-
-print "Hit return key..."
-STDIN.getc

data/src/nimage/demo/fitsdemo3.rb

@@ -1,26 +0,0 @@
-# FITS demo 
-require 'fits'
-require 'nimage'
-
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-image = f.data
-
-NImage.show image
-
-nx = image.shape[0]
-ny = image.shape[1]
-
-# re-sampling
-x = NArray.int(nx/2).indgen!*2
-y = NArray.int(ny/2).indgen!*2
-NImage.show image[x,y]
-# 'M51 (x0.5, resample)'
-
-# averaging
-NImage.show image[0...nx/2*2,0...ny/2*2].to_f.
-  reshape!(2,nx/2,2,ny/2).sum(0,2).div!(4).reshape!
-# 'M51 (x0.5, average)'
-
-print "Hit return key..."
-STDIN.getc

data/src/nimage/demo/fitsmorph.rb

@@ -1,39 +0,0 @@
-# FITS demo 
-require 'fits'
-require 'nimage'
-
-def triang x, px
-  y = NArray.float(*x.shape)
-  i1,i2  = (x>px).where2
-  y[i1] = NMath.sin((1-x[i1]) * (Math::PI/2/(1-px)) )
-  y[i2] = NMath.sin((1+x[i2]) * (Math::PI/2/(1+px)) )
-  p y.min
-  y
-end
-
-# Read-in Image
-f = Fits.new
-f.read( $*.shift || 'dss_m51.fits' )
-
-NImage.show f.data
-
-nx,ny = f.data.shape
-
-# Morphing parameters
-px,py = [ 0.3, -0.6]
-dx,dy = [-0.3,  0.7]
-
-indx = NArray.float(nx,1).indgen!
-indy = NArray.float(1,ny).indgen!
-
-ix = triang indx/(nx-1)*2-1, px
-iy = triang indy/(ny-1)*2-1, py
-
-ii = ix * iy
-ix = (indx + ii*(dx*(nx-1)/2)).round
-iy = (indy + ii*(dy*(ny-1)/2)).round
-
-NImage.show f.data[ix+iy*nx]
-
-print "Hit return key..."
-STDIN.getc

data/src/nimage/demo/life_na.rb

@@ -1,57 +0,0 @@
-# NArray demo : life game
-# by Masahiro Tanaka <masa@ir.isas.ac.jp>  2001-01-18
-
-require 'narray'
-require 'nimage'
-
-class NArray
-  def magnify(n)
-    src = shape.collect{|x| [1,x]}.flatten
-    dst = shape.collect{|x| [n,x]}.flatten
-    a = NArray.new(typecode,*dst)
-    a[*[true]*(rank*2)] = self.reshape(*src)
-    a.reshape!(*NArray[*shape]*n)
-  end
-end
-
-class LifeGame
-  def initialize(nx,ny)
-    @d = NArray.byte(nx,ny)
-    w = 50
-    @d[nx/2-w,ny/2-w] = NArray.byte(w*2+1,w*2+1).random!(2)
-    @step = 0
-    @win = NImage.show @d #.magnify(2)
-  end
-
-  def life_step
-    sum = 
-      @d[0..-3,0..-3] + @d[0..-3,1..-2] + @d[0..-3,2..-1] +
-      @d[1..-2,0..-3]                   + @d[1..-2,2..-1] +
-      @d[2..-1,0..-3] + @d[2..-1,1..-2] + @d[2..-1,2..-1]
-    @d[1,1] =
-      (sum.eq 3) | ((sum.eq 2) & @d[1..-2,1..-2])
-    @step += 1
-    @win.update( (@d*(NImage.ncolors-1)).to_s )
-  end
-
-  def close
-    @win.close
-  end
-
-  attr_reader :step
-end
-
-srand(1)
-a = LifeGame.new(200,200)
-
-print "Hit return key to start..."
-STDIN.getc
-
-begin
-  loop{ a.life_step }
-ensure
-  printf "step=%i\n",a.step
-  print "Hit return key..."
-  STDIN.getc
-  a.close
-end