multiarray 0.22.0 → 0.23.1

data/lib/multiarray/pointer.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
@@ -109,22 +109,6 @@ module Hornetseye
         target.basetype
       end
 
-      # Get type of result of delayed operation
-      #
-      # @return [Class] Type of result.
-      #
-      # @private
-      def array_type
-        target
-      end
-
-      # Get corresponding pointer type
-      #
-      # @return [Class] Returns +self+.
-      def pointer_type
-        self
-      end
-
       # Check whether objects of this class are finalised computations
       #
       # @return [Boolean] Returns +false+.
@@ -143,6 +127,10 @@ module Hornetseye
       @value = value
     end
 
+    def sexp?
+      true
+    end
+
     # Get access to storage object
     #
     # @return [Malloc,List] The object used to store the data.
@@ -209,7 +197,7 @@ module Hornetseye
     # @private
     def store( value )
       result = value.simplify
-      self.class.target.new( result.get ).write @value
+      self.class.target.new(result.get).write @value
       result
     end
 
@@ -221,7 +209,7 @@ module Hornetseye
     #
     # @private
     def demand
-      self.class.target.fetch( @value ).simplify
+      self.class.target.fetch(@value).simplify
     end
 
     # Lookup element of an array

data/lib/multiarray/random.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
@@ -29,6 +29,10 @@ module Hornetseye
       @dest, @n = dest, n
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -40,13 +44,12 @@ module Hornetseye
       "Random(#{@dest.descriptor( hash )},#{@n.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
-    #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      @dest.array_type
+    def typecode
+      @dest.typecode
+    end
+
+    def shape
+      @dest.shape
     end
 
     # Reevaluate computation

data/lib/multiarray/rgb.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
@@ -33,8 +33,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
 
       # Defines a unary operation
@@ -46,9 +46,9 @@ module Hornetseye
       # @return [Proc] The new method.
       #
       # @private
-      def define_unary_op( op )
-        define_method( op ) do
-          RGB.new r.send( op ), g.send( op ), b.send( op )
+      def define_unary_op(op)
+        define_method op do
+          RGB.new r.send(op), g.send(op), b.send(op)
         end
       end
 
@@ -61,8 +61,8 @@ module Hornetseye
       # @return [Proc] The new method.
       #
       # @private
-      def define_binary_op( op )
-        define_method( op ) do |other|
+      def define_binary_op(op)
+        define_method op do |other|
           if other.is_a? RGB
             RGB.new r.send( op, other.r ), g.send( op, other.g ),
                     b.send( op, other.b )
@@ -125,7 +125,7 @@ module Hornetseye
     # @return [Object] Returns +value+.
     #
     # @private
-    def assign( value )
+    def assign(value)
       @r, @g, @b = value.r, value.g, value.b
     end
 
@@ -136,7 +136,7 @@ module Hornetseye
     # @return [Array<RGB>] Result of coercion.
     #
     # @private
-    def coerce( other )
+    def coerce(other)
       if other.is_a? RGB
         return other, self
       else
@@ -197,11 +197,11 @@ module Hornetseye
     #
     # @return [Boolean] Returns boolean indicating whether objects are
     #         equal or not.
-    def ==( other )
+    def ==(other)
       if other.is_a? RGB
         @r.eq( other.r ).and( @g.eq( other.g ) ).and( @b.eq( other.b ) )
       elsif RGB.generic? other
-        @r.eq( other ).and( @g.eq( other ) ).and( @b.eq( other ) )
+        @r.eq(other).and( @g.eq(other) ).and( @b.eq(other) )
       else
         false
       end
@@ -214,7 +214,7 @@ module Hornetseye
     # @return [Node] An array with the three channel values as elements.
     #
     # @private
-    def decompose( i )
+    def decompose(i)
       [ @r, @g, @b ][ i ]
     end
 
@@ -238,10 +238,16 @@ module Hornetseye
       # @return The return value should be ignored.
       #
       # @private
-      def inherited( subclass )
+      def inherited(subclass)
         subclass.num_elements = 3
       end
 
+      def inherit(element_type)
+        retval = Class.new self
+        retval.element_type = element_type
+        retval
+      end
+
       # Construct new object from arguments
       #
       # @param [Object] r Value for red channel.
@@ -283,11 +289,7 @@ module Hornetseye
       # @return [String] Text with information about this class (e.g. "DFLOATRGB").
       def inspect
         unless element_type.nil?
-          retval = IDENTIFIER[ element_type ] || "RGB(#{element_type.inspect})"
-          ( class << self; self; end ).instance_eval do
-            define_method( :inspect ) { retval }
-          end
-          retval
+          IDENTIFIER[ element_type ] || "RGB(#{element_type.inspect})"
         else
           super
         end
@@ -318,11 +320,11 @@ module Hornetseye
       # @return [Class] Result of coercion.
       #
       # @private
-      def coercion( other )
+      def coercion(other)
         if other < RGB_
           Hornetseye::RGB element_type.coercion( other.element_type )
         elsif other < INT_ or other < FLOAT_
-          Hornetseye::RGB element_type.coercion( other )
+          Hornetseye::RGB element_type.coercion(other)
         else
           super other
         end
@@ -335,11 +337,11 @@ module Hornetseye
       # @return [Array<Class>] Result of coercion.
       #
       # @private
-      def coerce( other )
+      def coerce(other)
         if other < RGB_
           return other, self
         elsif other < INT_ or other < FLOAT_
-          return Hornetseye::RGB( other ), self
+          return Hornetseye::RGB(other), self
         else
           super other
         end
@@ -350,7 +352,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 < RGB_ and
           element_type == other.element_type
       end
@@ -371,7 +373,7 @@ module Hornetseye
       # @return [Boolean] Returns +true+ if objects are equal.
       #
       # @private
-      def eql?( other )
+      def eql?(other)
         self == other
       end
 
@@ -423,7 +425,7 @@ module Hornetseye
     # @return [Object] Returns +value+.
     #
     # @private
-    def assign( value )
+    def assign(value)
       value = value.simplify
       if @value.r.respond_to? :assign
         @value.r.assign value.get.r
@@ -502,9 +504,9 @@ module Hornetseye
       # @param [Class] context Other type to align with.
       #
       # @private
-      def align( context )
+      def align(context)
         if self < RGB_
-          Hornetseye::RGB element_type.align( context )
+          Hornetseye::RGB element_type.align(context)
         else
           super context
         end
@@ -516,7 +518,7 @@ module Hornetseye
 
   end
 
-  module Operations
+  class Node
 
     define_unary_op :r, :scalar
     define_unary_op :g, :scalar
@@ -527,7 +529,7 @@ module Hornetseye
     #
     # @return [Node] Array with red channel.
     def r_with_decompose
-      if typecode == OBJECT or is_a?( Variable )
+      if typecode == OBJECT or is_a?(Variable) or Thread.current[:lazy]
         r_without_decompose
       elsif typecode < RGB_
         decompose 0
@@ -543,7 +545,7 @@ module Hornetseye
     # @param [Object] Value or array of values to assign to red channel.
     #
     # @return [Object] Returns +value+.
-    def r=( value )
+    def r=(value)
       if typecode < RGB_
         decompose( 0 )[] = value
       elsif typecode == OBJECT
@@ -551,7 +553,7 @@ module Hornetseye
           value * RGB.new( 1, 0, 0 ) + g * RGB.new( 0, 1, 0 ) + b * RGB.new( 0, 0, 1 )
         end
       else
-        raise "Cannot assign red channel to object of type #{array_type.inspect}"
+        raise "Cannot assign red channel to elements of type #{typecode.inspect}"
       end
     end
 
@@ -559,7 +561,7 @@ module Hornetseye
     #
     # @return [Node] Array with green channel.
     def g_with_decompose
-      if typecode == OBJECT or is_a?( Variable )
+      if typecode == OBJECT or is_a?(Variable) or Thread.current[:lazy]
         g_without_decompose
       elsif typecode < RGB_
         decompose 1
@@ -575,7 +577,7 @@ module Hornetseye
     # @param [Object] Value or array of values to assign to green channel.
     #
     # @return [Object] Returns +value+.
-    def g=( value )
+    def g=(value)
       if typecode < RGB_
         decompose( 1 )[] = value
       elsif typecode == OBJECT
@@ -583,7 +585,7 @@ module Hornetseye
           r * RGB.new( 1, 0, 0 ) + value * RGB.new( 0, 1, 0 ) + b * RGB.new( 0, 0, 1 )
         end
       else
-        raise "Cannot assign green channel to object of type #{array_type.inspect}"
+        raise "Cannot assign green channel to elements of type #{typecode.inspect}"
       end
     end
 
@@ -591,7 +593,7 @@ module Hornetseye
     #
     # @return [Node] Array with blue channel.
     def b_with_decompose
-      if typecode == OBJECT or is_a?( Variable )
+      if typecode == OBJECT or is_a?(Variable) or Thread.current[:lazy]
         b_without_decompose
       elsif typecode < RGB_
         decompose 2
@@ -607,7 +609,7 @@ module Hornetseye
     # @param [Object] Value or array of values to assign to blue channel.
     #
     # @return [Object] Returns +value+.
-    def b=( value )
+    def b=(value)
       if typecode < RGB_
         decompose( 2 )[] = value
       elsif typecode == OBJECT
@@ -615,7 +617,7 @@ module Hornetseye
           r * RGB.new( 1, 0, 0 ) + g * RGB.new( 0, 1, 0 ) + value * RGB.new( 0, 0, 1 )
         end
       else
-        raise "Cannot assign blue channel to object of type #{array_type.inspect}"
+        raise "Cannot assign blue channel to elements of type #{typecode.inspect}"
       end
     end
 
@@ -694,9 +696,7 @@ module Hornetseye
   # @see RGB_.element_type
   def RGB( arg, g = nil, b = nil )
     if g.nil? and b.nil?
-      retval = Class.new RGB_
-      retval.element_type = arg
-      retval
+      RGB_.inherit arg
     else
       RGB.new arg, g, b
     end
@@ -743,7 +743,7 @@ module Hornetseye
   # @return [BYTERGB] The wrapped RGB value.
   #
   # @private
-  def BYTERGB( value )
+  def BYTERGB(value)
     BYTERGB.new value
   end
 
@@ -756,7 +756,7 @@ module Hornetseye
   # @return [UBYTERGB] The wrapped RGB value.
   #
   # @private
-  def UBYTERGB( value )
+  def UBYTERGB(value)
     UBYTERGB.new value
   end
 
@@ -769,7 +769,7 @@ module Hornetseye
   # @return [SINTRGB] The wrapped RGB value.
   #
   # @private
-  def SINTRGB( value )
+  def SINTRGB(value)
     SINTRGB.new value
   end
 
@@ -782,7 +782,7 @@ module Hornetseye
   # @return [USINTRGB] The wrapped RGB value.
   #
   # @private
-  def USINTRGB( value )
+  def USINTRGB(value)
     USINTRGB.new value
   end
 
@@ -795,7 +795,7 @@ module Hornetseye
   # @return [INTRGB] The wrapped RGB value.
   #
   # @private
-  def INTRGB( value )
+  def INTRGB(value)
     INTRGB.new value
   end
 
@@ -808,7 +808,7 @@ module Hornetseye
   # @return [UINTRGB] The wrapped RGB value.
   #
   # @private
-  def UINTRGB( value )
+  def UINTRGB(value)
     UINTRGB.new value
   end
 
@@ -821,7 +821,7 @@ module Hornetseye
   # @return [LONGRGB] The wrapped RGB value.
   #
   # @private
-  def LONGRGB( value )
+  def LONGRGB(value)
     LONGRGB.new value
   end
 
@@ -834,7 +834,7 @@ module Hornetseye
   # @return [ULONGRGB] The wrapped RGB value.
   #
   # @private
-  def ULONGRGB( value )
+  def ULONGRGB(value)
     ULONGRGB.new value
   end
 
@@ -847,7 +847,7 @@ module Hornetseye
   # @return [SFLOATRGB] The wrapped RGB value.
   #
   # @private
-  def SFLOATRGB( value )
+  def SFLOATRGB(value)
     SFLOATRGB.new value
   end
 
@@ -860,7 +860,7 @@ module Hornetseye
   # @return [DFLOATRGB] The wrapped RGB value.
   #
   # @private
-  def DFLOATRGB( value )
+  def DFLOATRGB(value)
     DFLOATRGB.new value
   end
 
@@ -920,7 +920,7 @@ class Fixnum
     # @return [Object] Result of binary operation.
     #
     # @private
-    def power_with_rgb( other )
+    def power_with_rgb(other)
       if other.is_a? Hornetseye::RGB
         x, y = other.coerce self
         x ** y
@@ -937,7 +937,7 @@ end
 
 module Math
 
-  def sqrt_with_rgb( c )
+  def sqrt_with_rgb(c)
     if c.is_a? Hornetseye::RGB
       Hornetseye::RGB.new sqrt( c.r ), sqrt( c.g ), sqrt( c.b )
     else