multiarray 0.22.0 → 0.23.1

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.22.0'
+PKG_VERSION = '0.23.1'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/multiarray.rb

@@ -98,6 +98,18 @@ class Object
 
   end
 
+  def sexp
+    self
+  end
+
+  def sexp?
+    false
+  end
+
+  def matched?
+    false
+  end
+
   # Boolean negation
   #
   # @return [FalseClass] Returns +false+.
@@ -105,7 +117,7 @@ class Object
   # @see NilClass#not
   # @see FalseClass#not
   def not
-     false
+    false
   end
 
   # Boolean 'and' operation
@@ -116,7 +128,7 @@ class Object
   # @see FalseClass#and
   # @see NilClass#and
   def and( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       other
     else
       x, y = other.coerce self
@@ -132,7 +144,7 @@ class Object
   # @see FalseClass#or
   # @see NilClass#or
   def or( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       self
     else
       x, y = other.coerce self
@@ -150,7 +162,7 @@ class Object
   # @see Hornetseye::Node
   # @see Hornetseye::Binary_
   def eq( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       self == other
     else
       x, y = other.coerce self
@@ -168,7 +180,7 @@ class Object
   # @see Hornetseye::Node
   # @see Hornetseye::Binary_
   def ne( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       ( self == other ).not
     else
       x, y = other.coerce self
@@ -230,7 +242,7 @@ class NilClass
   # @see Object#and
   # @see FalseClass#and
   def and( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       self
     else
       x, y = other.coerce self
@@ -246,7 +258,7 @@ class NilClass
   # @see Object#or
   # @see FalseClass#or
   def or( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       other
     else
       x, y = other.coerce self
@@ -318,7 +330,7 @@ class FalseClass
   # @see Object#and
   # @see NilClass#and
   def and( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       self
     else
       x, y = other.coerce self
@@ -334,7 +346,7 @@ class FalseClass
   # @see Object#or
   # @see NilClass#or
   def or( other )
-    unless other.is_a? Hornetseye::Node
+    unless other.matched?
       other
     else
       x, y = other.coerce self
@@ -473,7 +485,7 @@ class Fixnum
     #
     # @private
     def power_with_hornetseye( other )
-      if other.is_a? Hornetseye::Node
+      if other.matched?
         x, y = other.coerce self
         x ** y
       else
@@ -609,7 +621,13 @@ class Array
     # 
     # @return [Array] An array with the filter elements.
     def gauss_blur_filter( sigma, max_error = 1.0 / 0x100 )
-      def erf( x, sigma )
+      # Error function
+      #
+      # @param [Float] x Function argument
+      # @param [Float] sigma Function parameter
+      #
+      # @private
+      def erf(x, sigma)
         0.5 * Math.erf( x / ( Math.sqrt( 2.0 ) * sigma.abs ) )
       end
       raise 'Sigma must be greater than zero.' if sigma <= 0
@@ -639,7 +657,13 @@ class Array
     # 
     # @return [Array] An array with the filter elements.
     def gauss_gradient_filter( sigma, max_error = 1.0 / 0x100 )
-      def gauss( x, sigma )
+      # Gaussian function
+      #
+      # @param [Float] x Function argument
+      # @param [Float] sigma Function parameter
+      #
+      # @private
+      def gauss(x, sigma)
         1.0 / ( Math.sqrt( 2.0 * Math::PI ) * sigma.abs ) *
           Math.exp( -x**2 / ( 2.0 * sigma**2 ) )
       end
@@ -674,6 +698,18 @@ class Array
     zip( ( 0 ... size ).to_a ).collect &action
   end
 
+  def strip
+    collect { |arg| arg.strip }.inject [[], [], []] do |retval,s|
+      [retval[0] + s[0], retval[1] + s[1], retval[2] + [s[2]]]
+    end
+  end
+
+end
+
+class String
+  def method_name
+    tr '(),+\-*/%.@?~&|^<=>', '0123\456789ABCDEFGH'
+  end
 end
 
 begin
@@ -711,6 +747,7 @@ require 'multiarray/integral'
 require 'multiarray/mask'
 require 'multiarray/unmask'
 require 'multiarray/components'
+require 'multiarray/field'
 require 'multiarray/operations'
 require 'multiarray/methods'
 require 'multiarray/rgb'
@@ -748,8 +785,8 @@ module Hornetseye
         term = lazy *( shape + [ :arity => arity - 1 ] ) do |*args|
           action.call *( args + [ index ] )
         end
-        term = Node.match( term ).new term unless term.is_a? Node
-        Lambda.new index, term
+        term = Node.match(term).new term unless term.matched?
+        Lambda.new index, term.sexp
       end
     ensure
       Thread.current[ :lazy ] = previous
@@ -770,7 +807,7 @@ module Hornetseye
     Thread.current[ :lazy ] = false
     begin
       retval = lazy *shape, &action
-      retval.is_a?( Node ) ? retval.force : retval
+      retval.matched? ? retval.force : retval
     ensure
       Thread.current[ :lazy ] = previous
     end
@@ -790,7 +827,7 @@ module Hornetseye
     arity = options[ :arity ] || [ action.arity, shape.size ].max
     if arity <= 0
       term = action.call
-      term.is_a?( Node ) ? term.to_type( term.typecode.maxint ) : term
+      term.matched? ? term.to_type(term.typecode.maxint) : term
     else
       index = Variable.new shape.empty? ? Hornetseye::INDEX( nil ) :
                            Hornetseye::INDEX( shape.pop )

data/lib/multiarray/bool.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

data/lib/multiarray/complex.rb

@@ -1,5 +1,5 @@
 # multiarray - Lazy multi-dimensional arrays for Ruby
-# Copyright (C) 2010 Jan Wedekind
+# Copyright (C) 2010, 2011 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+class Complex
+
+  def decompose(i)
+    [real, imag][i]
+  end
+
+end
+
 # Namespace of Hornetseye computer vision library
 module Hornetseye
 
@@ -35,8 +43,8 @@ module Hornetseye
       #         coercion.
       #
       # @private
-      def generic?( value )
-        value.is_a?( Numeric ) or value.is_a?( GCCValue )
+      def generic?(value)
+        value.is_a?(Numeric) or value.is_a?(GCCValue)
       end
 
       # Construct complex number using polar coordinates
@@ -48,7 +56,7 @@ module Hornetseye
       #
       # @private
       def polar( r, theta )
-        new r * Math.cos( theta ), r * Math.sin( theta )
+        new r * Math.cos(theta), r * Math.sin(theta)
       end
 
     end
@@ -98,7 +106,7 @@ module Hornetseye
     # @return [Object] Returns +value+.
     #
     # @private
-    def assign( value )
+    def assign(value)
       @real, @imag = value.real, value.imag
     end
 
@@ -109,7 +117,7 @@ module Hornetseye
     # @return [Array<InternalComplex>] Result of coercion.
     #
     # @private
-    def coerce( other )
+    def coerce(other)
       if other.is_a? InternalComplex
         return other, self
       elsif other.is_a? Complex
@@ -180,8 +188,8 @@ module Hornetseye
     # @return [InternalComplex] The result
     #
     # @private
-    def +( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def +(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         InternalComplex.new @real + other.real, @imag + other.imag
       elsif InternalComplex.generic? other
         InternalComplex.new @real + other, @imag
@@ -198,8 +206,8 @@ module Hornetseye
     # @return [InternalComplex] The result
     #
     # @private
-    def -( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def -(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         InternalComplex.new @real - other.real, @imag - other.imag
       elsif InternalComplex.generic? other
         InternalComplex.new @real - other, @imag
@@ -216,8 +224,8 @@ module Hornetseye
     # @return [InternalComplex] The result
     #
     # @private
-    def *( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def *(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         InternalComplex.new @real * other.real - @imag * other.imag,
                     @real * other.imag + @imag * other.real
       elsif InternalComplex.generic? other
@@ -235,8 +243,8 @@ module Hornetseye
     # @return [InternalComplex] The result
     #
     # @private
-    def /( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def /(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         self * other.conj / other.abs2
       elsif InternalComplex.generic? other
         InternalComplex.new @real / other, @imag / other
@@ -254,13 +262,13 @@ module Hornetseye
     # @return [InternalComplex] The result
     #
     # @private
-    def **( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def **(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         r, theta = polar
         ore = other.real
         oim = other.imag
-        nr = Math.exp ore * Math.log( r ) - oim * theta
-        ntheta = theta * ore + oim * Math.log( r )
+        nr = Math.exp ore * Math.log(r) - oim * theta
+        ntheta = theta * ore + oim * Math.log(r)
         InternalComplex.polar nr, ntheta
       elsif InternalComplex.generic? other
         r, theta = polar
@@ -306,11 +314,11 @@ module Hornetseye
     #         equal or not.
     #
     # @private
-    def ==( other )
-      if other.is_a?( InternalComplex ) or other.is_a?( Complex )
+    def ==(other)
+      if other.is_a?(InternalComplex) or other.is_a?(Complex)
         @real.eq( other.real ).and( @imag.eq( other.imag ) )
       elsif InternalComplex.generic? other
-        @real.eq( other ).and( @imag.eq( 0 ) )
+        @real.eq(other).and( @imag.eq( 0 ) )
       else
         false
       end
@@ -323,8 +331,8 @@ module Hornetseye
     # @return [Numeric,GCCValue] Returns the requested component.
     #
     # @private
-    def decompose( i )
-      [ @real, @imag ][ i ]
+    def decompose(i)
+      [@real, @imag][i]
     end
 
   end
@@ -341,7 +349,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def sqrt_with_internalcomplex( z )
+  def sqrt_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = sqrt( ( z.abs + z.real ) / 2 )
       imag = ( z.imag < 0 ).conditional -sqrt( ( z.abs - z.real ) / 2 ),
@@ -363,7 +371,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def exp_with_internalcomplex( z )
+  def exp_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = exp( z.real ) * cos( z.imag )
       imag = exp( z.real ) * sin( z.imag )
@@ -384,7 +392,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def cos_with_internalcomplex( z )
+  def cos_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = cos( z.real ) * cosh( z.imag )
       imag = -sin( z.real ) * sinh( z.imag )
@@ -405,7 +413,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def sin_with_internalcomplex( z )
+  def sin_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = sin( z.real ) * cosh( z.imag )
       imag = cos( z.real ) * sinh( z.imag )
@@ -426,9 +434,9 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def tan_with_internalcomplex( z )
+  def tan_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
-      sin( z ) / cos( z )
+      sin(z) / cos(z)
     else
       tan_without_internalcomplex z
     end
@@ -445,7 +453,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def cosh_with_internalcomplex( z )
+  def cosh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = cosh( z.real ) * cos( z.imag )
       imag = sinh( z.real ) * sin( z.imag )
@@ -466,7 +474,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def sinh_with_internalcomplex( z )
+  def sinh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       real = sinh( z.real ) * cos( z.imag )
       imag = cosh( z.real ) * sin( z.imag )
@@ -487,9 +495,9 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def tanh_with_internalcomplex( z )
+  def tanh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
-      sinh( z ) / cosh( z )
+      sinh(z) / cosh(z)
     else
       tanh_without_internalcomplex z
     end
@@ -506,7 +514,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def log_with_internalcomplex( z )
+  def log_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       r, theta = z.polar
       Hornetseye::InternalComplex.new log( r.abs ), theta
@@ -526,9 +534,9 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def log10_with_internalcomplex( z )
+  def log10_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
-      log( z ) / log( 10 )
+      log(z) / log( 10 )
     else
       log10_without_internalcomplex z
     end
@@ -545,7 +553,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def acos_with_internalcomplex( z )
+  def acos_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       -1.0.im * log( z + 1.0.im * sqrt( 1.0 - z * z ) )
     else
@@ -564,7 +572,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def asin_with_internalcomplex( z )
+  def asin_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       -1.0.im * log( 1.0.im * z + sqrt( 1.0 - z * z ) )
     else
@@ -583,7 +591,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def atan_with_internalcomplex( z )
+  def atan_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       1.0.im * log( ( 1.0.im + z ) / ( 1.0.im - z ) ) / 2.0
     else
@@ -602,7 +610,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def acosh_with_internalcomplex( z )
+  def acosh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       log( z + sqrt( z * z - 1.0 ) )
     else
@@ -621,7 +629,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def asinh_with_internalcomplex( z )
+  def asinh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       log( z + sqrt( 1.0 + z * z ) )
     else
@@ -640,7 +648,7 @@ module Math
   # @return [Object,Hornetseye::InternalComplex] Result of method call.
   #
   # @private
-  def atanh_with_internalcomplex( z )
+  def atanh_with_internalcomplex(z)
     if z.is_a? Hornetseye::InternalComplex
       log( ( 1.0 + z ) / ( 1.0 - z ) ) / 2.0
     else
@@ -701,10 +709,16 @@ module Hornetseye
       # @return The return value should be ignored.
       #
       # @private
-      def inherited( subclass )
+      def inherited(subclass)
         subclass.num_elements = 2
       end
 
+      def inherit(element_type)
+        retval = Class.new self
+        retval.element_type = element_type
+        retval
+      end
+
       # Construct new object from arguments
       #
       # @param [Object] real Real component of complex number.
@@ -747,11 +761,7 @@ module Hornetseye
       #         "SCOMPLEX").
       def inspect
         unless element_type.nil?
-          retval = IDENTIFIER[ element_type ] || "COMPLEX(#{element_type.inspect})"
-          ( class << self; self; end ).instance_eval do
-            define_method( :inspect ) { retval }
-          end
-          retval
+          IDENTIFIER[ element_type ] || "COMPLEX(#{element_type.inspect})"
         else
           super
         end
@@ -782,11 +792,11 @@ module Hornetseye
       # @return [Class] Result of coercion.
       #
       # @private
-      def coercion( other )
+      def coercion(other)
         if other < COMPLEX_
           Hornetseye::COMPLEX element_type.coercion( other.element_type )
         elsif other < INT_ or other < FLOAT_
-          Hornetseye::COMPLEX element_type.coercion( other )
+          Hornetseye::COMPLEX element_type.coercion(other)
         else
           super other
         end
@@ -799,11 +809,11 @@ module Hornetseye
       # @return [Array<Class>] Result of coercion.
       #
       # @private
-      def coerce( other )
+      def coerce(other)
         if other < COMPLEX_
           return other, self
         elsif other < INT_ or other < FLOAT_
-          return Hornetseye::COMPLEX( other ), self
+          return Hornetseye::COMPLEX(other), self
         else
           super other
         end        
@@ -814,7 +824,7 @@ module Hornetseye
       # @param [Object] other Object to compare with.
       #
       # @return [Boolean] Boolean indicating whether classes are equal.
-      def ==( other )
+      def ==(other)
         other.is_a? Class and other < COMPLEX_ and
           element_type == other.element_type
       end
@@ -835,7 +845,7 @@ module Hornetseye
       # @return [Boolean] Returns +true+ if objects are equal.
       #
       # @private
-      def eql?( other )
+      def eql?(other)
         self == other
       end
 
@@ -877,7 +887,7 @@ module Hornetseye
     # @return [Object] Returns +value+.
     #
     # @private
-    def assign( value )
+    def assign(value)
       value = value.simplify
       if @value.real.respond_to? :assign
         @value.real.assign value.get.real
@@ -954,9 +964,9 @@ module Hornetseye
       # @return [Class] Result of type alignment.
       #
       # @private
-      def align( context )
+      def align(context)
         if self < COMPLEX_
-          Hornetseye::COMPLEX element_type.align( context )
+          Hornetseye::COMPLEX element_type.align(context)
         else
           super context
         end
@@ -969,7 +979,7 @@ module Hornetseye
   end
 
   # Module providing the operations to manipulate array expressions
-  module Operations
+  class Node
 
     define_unary_op :real, :scalar
     define_unary_op :imag, :scalar
@@ -978,7 +988,7 @@ module Hornetseye
     #
     # @return [Node] Array with real values.
     def real_with_decompose
-      if typecode == OBJECT or is_a?( Variable )
+      if typecode == OBJECT or is_a?(Variable) or Thread.current[:lazy]
         real_without_decompose
       elsif typecode < COMPLEX_
         decompose 0
@@ -994,7 +1004,7 @@ module Hornetseye
     # @param [Object] Value or array of values to assign to real components.
     #
     # @return [Object] Returns +value+.
-    def real=( value )
+    def real=(value)
       if typecode < COMPLEX_
         decompose( 0 )[] = value
       elsif typecode == OBJECT
@@ -1010,7 +1020,7 @@ module Hornetseye
     #
     # @return [Node] Array with imaginary values.
     def imag_with_decompose
-      if typecode == OBJECT or is_a?( Variable )
+      if typecode == OBJECT or is_a?(Variable) or Thread.current[:lazy]
         imag_without_decompose
       elsif typecode < COMPLEX_
         decompose 1
@@ -1026,7 +1036,7 @@ module Hornetseye
     # @param [Object] Value or array of values to assign to imaginary components.
     #
     # @return [Object] Returns +value+.
-    def imag=( value )
+    def imag=(value)
       if typecode < COMPLEX_
         decompose( 1 )[] = value
       elsif typecode == OBJECT
@@ -1034,7 +1044,7 @@ module Hornetseye
           real + value * Complex::I
         end
       else
-        raise "Cannot assign imaginary values to object of type #{array_type.inspect}"
+        raise "Cannot assign imaginary values to elements of type #{typecode.inspect}"
       end
     end
 
@@ -1052,9 +1062,7 @@ module Hornetseye
   # @see COMPLEX_
   # @see COMPLEX_.element_type
   def COMPLEX( element_type )
-    retval = Class.new COMPLEX_
-    retval.element_type = element_type
-    retval
+    COMPLEX_.inherit element_type
   end
 
   module_function :COMPLEX
@@ -1074,7 +1082,7 @@ module Hornetseye
   # @return [SCOMPLEX] The wrapped Complex value.
   #
   # @private
-  def SCOMPLEX( value )
+  def SCOMPLEX(value)
     SCOMPLEX.new value
   end
 
@@ -1087,7 +1095,7 @@ module Hornetseye
   # @return [DCOMPLEX] The wrapped Complex value.
   #
   # @private
-  def DCOMPLEX( value )
+  def DCOMPLEX(value)
     DCOMPLEX.new value
   end