multiarray 0.22.0 → 0.23.1

data/lib/multiarray/index.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
@@ -46,15 +46,14 @@ module Hornetseye
         "INDEX(#{size.descriptor( hash )})"
       end
 
-      # Get type of result of delayed operation
-      #
-      # @return [Class] Type of result.
-      #
-      # @private
-      def array_type
+      def typecode
         INT
       end
 
+      def shape
+        []
+      end
+
       # Strip of all values
       #
       # Split up into variables, values, and a term where all values have been
@@ -115,7 +114,7 @@ module Hornetseye
   # @return [Class] Returns a class deriving from +INDEX_+.
   def INDEX( size )
     retval = Class.new INDEX_
-    size = INT.new( size ) unless size.is_a? Node
+    size = INT.new(size) unless size.matched?
     retval.size = size
     retval
   end

data/lib/multiarray/inject.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
@@ -50,6 +50,10 @@ module Hornetseye
         value, index, initial, block, var1, var2
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -66,17 +70,12 @@ module Hornetseye
          "#{@index.descriptor( hash )},#{@block.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
-    #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      retval = @value.to_type( @block.typecode ).array_type
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    def typecode
+      @block.typecode
+    end
+
+    def shape
+      @value.to_type(@block.typecode).shape
     end
 
     # Reevaluate computation

data/lib/multiarray/int.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,6 +33,13 @@ module Hornetseye
       # signed integer or not.
       attr_accessor :signed
 
+      def inherit(bits, signed)
+        retval = Class.new self
+        retval.bits = bits
+        retval.signed = signed
+        retval
+      end
+
       # Memory type required to store elements of this type
       #
       # @return [Class] Returns +Malloc+.
@@ -138,12 +145,8 @@ module Hornetseye
       #         "BYTE").
       def inspect
         unless bits.nil? or signed.nil?
-          retval = IDENTIFIER[ [ bits, signed ] ] ||
-                   "INT(#{bits.inspect},#{ signed ? 'SIGNED' : 'UNSIGNED' })"
-          ( class << self; self; end ).instance_eval do
-            define_method( :inspect ) { retval }
-          end
-          retval
+          IDENTIFIER[ [ bits, signed ] ] ||
+            "INT(#{bits.inspect},#{ signed ? 'SIGNED' : 'UNSIGNED' })"
         else
           super
         end
@@ -305,10 +308,7 @@ module Hornetseye
     if signed.nil?
       INT.new arg
     else
-      retval = Class.new INT_
-      retval.bits = arg
-      retval.signed = signed
-      retval
+      INT_.inherit arg, signed
     end
   end
 
@@ -439,3 +439,4 @@ module Hornetseye
 
 
 end
+

data/lib/multiarray/integral.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
@@ -43,6 +43,10 @@ module Hornetseye
       @dest, @source = dest, source
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -54,17 +58,12 @@ module Hornetseye
       "Integral(#{@dest.descriptor( hash )},#{@source.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
-    #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      retval = @dest.array_type
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    def typecode
+      @dest.typecode
+    end
+
+    def shape
+      @dest.shape
     end
 
     # Reevaluate computation

data/lib/multiarray/lambda.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
@@ -26,11 +26,15 @@ module Hornetseye
     # @param [Node] term The term based on that variable.
     #
     # @return [Lambda] Lambda object.
-    def initialize( index, term )
+    def initialize(index, term)
       @index = index
       @term = term
     end
 
+    def sexp?
+      true
+    end
+
     # Get storage object if there is any
     #
     # @return [Malloc,List,NilClass] Object storing the data.
@@ -69,17 +73,18 @@ module Hornetseye
       "Lambda(#{@index.descriptor( hash )},#{@term.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
+    # Element-type of this term
     #
-    # @return [Class] Type of result.
+    # @return [Class] Element-type of this datatype.
+    def typecode
+      @term.typecode
+    end
+
+    # Get shape of this term
     #
-    # @private
-    def array_type
-      retval = Hornetseye::Sequence @term.array_type, @index.size.get
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    # @return [Array<Integer>] Returns shape of array.
+    def shape
+      @term.shape + [@index.size.get]
     end
 
     # Get variables contained in this term
@@ -159,14 +164,14 @@ module Hornetseye
     # @return [Node,Object] Result of inserting +i+ for lambda argument.
     #
     # @private
-    def element( i )
-      unless i.is_a? Node
-        unless ( 0 ... shape.last ).member? i
+    def element(i)
+      unless i.matched?
+        unless (0 ... shape.last).member? i
           raise "Index must be in 0 ... #{shape.last} (was #{i})"
         end
         i = INT.new i
       end
-      i.size = @index.size if i.is_a?( Variable ) and @index.size.get
+      i.size = @index.size if i.is_a?(Variable) and @index.size.get
       @term.subst @index => i
     end
 
@@ -179,14 +184,14 @@ module Hornetseye
     #
     # @private
     def slice( start, length )
-      unless start.is_a?( Node ) or length.is_a?( Node )
+      unless start.matched? or length.matched?
         if start < 0 or start + length > shape.last
           raise "Range must be in 0 ... #{shape.last} " +
                 "(was #{start} ... #{start + length})"
         end
       end
-      start = INT.new start unless start.is_a? Node
-      length = INT.new length unless length.is_a? Node
+      start = INT.new start unless start.matched?
+      length = INT.new length unless length.matched?
       index = Variable.new Hornetseye::INDEX( length )
       Lambda.new( index, @term.subst( @index => index ).
                          skip( index, start ) ).unroll

data/lib/multiarray/list.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/lookup.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
       @p, @index, @stride = p, index, stride
     end
 
+    def sexp?
+      true
+    end
+
     # Get storage object if there is any
     #
     # @return [Malloc,List,NilClass] Object storing the data.
@@ -36,6 +40,13 @@ module Hornetseye
       @p.memory
     end
 
+    # Get shape of this term
+    #
+    # @return [Array<Integer>] Returns shape of array.
+    def shape
+      @p.shape
+    end
+    
     # Get strides of array
     #
     # @return [Array<Integer>,NilClass] Array strides of this type.
@@ -66,17 +77,11 @@ module Hornetseye
         "#{@stride.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
+    # Element-type of this term
     #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      retval = @p.array_type
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    # @return [Class] Element-type of this datatype.
+    def typecode
+      @p.typecode
     end
 
     # Substitute variables
@@ -154,8 +159,8 @@ module Hornetseye
     # @return [Node,Object] Element of lookup term.
     #
     # @private
-    def element( i )
-      Lookup.new @p.element( i ), @index, @stride
+    def element(i)
+      Lookup.new @p.element(i), @index, @stride
     end
 
     # Extract array view with part of array

data/lib/multiarray/lut.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
@@ -44,6 +44,10 @@ module Hornetseye
       @sources, @table = args[ 0 ... -1 ], args.last
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -56,21 +60,14 @@ module Hornetseye
         "#{@table.descriptor( hash )})"
     end
 
-    # Get type of result of delayed operation
-    #
-    # @return [Class] Type of result.
-    #
-    # @private
-    def array_type
-      source_type = @sources.collect { |source| source.array_type }.
-        inject { |a,b| a.coercion b }
-      shape = @table.shape.first( @table.dimension - @sources.size ) +
-        source_type.shape
-      retval = Hornetseye::MultiArray @table.typecode, *shape
-      ( class << self; self; end ).instance_eval do
-        define_method( :array_type ) { retval }
-      end
-      retval
+    def typecode
+      @table.typecode
+    end
+
+    def shape
+      source_shape = @sources.collect { |source| source.shape }.
+        inject { |a,b| a.size > b.size ? a : b }
+      @table.shape.first(@table.dimension - @sources.size) + source_shape
     end
 
     # Reevaluate computation

data/lib/multiarray/malloc.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/mask.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
@@ -45,6 +45,10 @@ module Hornetseye
       @dest, @source, @m, @index = dest, source, m, index
     end
 
+    def sexp?
+      true
+    end
+
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.
@@ -57,13 +61,12 @@ module Hornetseye
         "#{@m.descriptor( hash )},#{@index.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
 
     # Perform masking operation

data/lib/multiarray/methods.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
@@ -57,8 +57,8 @@ module Hornetseye
     # @private
     def define_unary_method( mod, op, conversion = :identity )
       mod.module_eval do
-        define_method( "#{op}_with_hornetseye" ) do |a|
-          if a.is_a? Node
+        define_method "#{op}_with_hornetseye" do |a|
+          if a.matched?
             if a.dimension == 0 and a.variables.empty?
               target = a.typecode.send conversion
               target.new mod.send( op, a.simplify.get )
@@ -66,7 +66,7 @@ module Hornetseye
               Hornetseye::ElementWise( lambda { |x| mod.send op, x },
                                        "#{mod}.#{op}",
                                        lambda { |x| x.send conversion } ).
-                new( a ).force
+                new(a.sexp).force
             end
           else
             send "#{op}_without_hornetseye", a
@@ -90,19 +90,19 @@ module Hornetseye
     # @private
     def define_binary_method( mod, op, coercion = :coercion )
       mod.module_eval do
-        define_method( "#{op}_with_hornetseye" ) do |a,b|
-          if a.is_a? Node or b.is_a? Node
-            a = Node.match( a, b ).new a unless a.is_a? Node
-            b = Node.match( b, a ).new b unless b.is_a? Node
+        define_method "#{op}_with_hornetseye" do |a,b|
+          if a.matched? or b.matched?
+            a = Node.match(a, b).new a unless a.matched?
+            b = Node.match(b, a).new b unless b.matched?
             if a.dimension == 0 and a.variables.empty? and
                b.dimension == 0 and b.variables.empty?
               target = a.typecode.send coercion, b.typecode
-              target.new mod.send( op, a.simplify.get, b.simplify.get )
+              target.new mod.send(op, a.simplify.get, b.simplify.get)
             else
               Hornetseye::ElementWise( lambda { |x,y| mod.send op, x, y },
                                        "#{mod}.#{op}",
                                        lambda { |t,u| t.send coercion, u } ).
-                new( a, b ).force
+                new(a.sexp, b.sexp).force
             end
           else
             send "#{op}_without_hornetseye", a, b