multiarray 0.23.2 → 0.24.0

data/Rakefile

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

data/lib/multiarray.rb

@@ -98,14 +98,6 @@ class Object
 
   end
 
-  def sexp
-    self
-  end
-
-  def sexp?
-    false
-  end
-
   def matched?
     false
   end
@@ -741,6 +733,7 @@ require 'multiarray/lookup'
 require 'multiarray/elementwise'
 require 'multiarray/inject'
 require 'multiarray/diagonal'
+require 'multiarray/argument'
 require 'multiarray/histogram'
 require 'multiarray/lut'
 require 'multiarray/integral'
@@ -786,7 +779,7 @@ module Hornetseye
           action.call *( args + [ index ] )
         end
         term = Node.match(term).new term unless term.matched?
-        Lambda.new index, term.sexp
+        Lambda.new index, term
       end
     ensure
       Thread.current[ :lazy ] = previous
@@ -842,5 +835,51 @@ module Hornetseye
 
   module_function :sum
 
-end
+  def argument(block, options = {}, &action)
+    arity = options[:arity] || action.arity
+    if arity > 0
+      indices = options[:indices] ||
+                (0 ... arity).collect { Variable.new Hornetseye::INDEX(nil) }
+      term = options[:term] || action.call(*indices)
+      slices = indices[0 ... -1].inject(term) { |t,index| Lambda.new index, t }
+      var1 = options[:var1] || Variable.new(term.typecode)
+      var2 = options[:var2] || Variable.new(term.typecode)
+      block = options[:block] || block.call( var1, var2 )
+      lut = Argument.new(slices, indices.last, block, var1, var2, INT.new(0)).force
+      arr = options[:arr] || Lambda.new(indices.last, slices)
+      id = (0 ... arr.dimension - 1).collect { |j| lazy(*arr.shape[0 ... -1]) { |*i| i[j] } }
+      lut = INT.new(lut) unless lut.matched?
+      sub_arr = Lut.new(*(id + [lut] + [arr])).force
+      indices = (0 ... arity - 1).collect { Variable.new Hornetseye::INDEX(nil) }
+      term = indices.reverse.inject(sub_arr) { |t,index| t.element index }
+      sub_arg = argument nil, :arity => arity - 1, :indices => indices, :term => term,
+                         :arr => sub_arr, :block => block, :var1 => var1, :var2 => var2
+      if sub_arg.empty?
+        [lut[]]
+      elsif sub_arg.first.is_a? Integer
+        sub_arg + [lut[*sub_arg]]
+      else
+        id = lazy(*sub_arg.first.shape) { |*i| i.last }
+        sub_arg + [lut.warp(*(sub_arg + [id]))]
+      end
+    else
+      []
+    end
+  end
+
+  module_function :argument
+  
+  def argmax(&action)
+    argument proc { |a,b| a > b }, &action
+  end
+
+  module_function :argmax
 
+  def argmin(&action)
+    argument proc { |a,b| a < b }, &action
+  end
+
+  module_function :argmin
+
+end
+ 

data/lib/multiarray/argument.rb

@@ -0,0 +1,95 @@
+# multiarray - Lazy multi-dimensional arrays for Ruby
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Namespace of Hornetseye computer vision library
+module Hornetseye
+
+  class Argument < Node
+    
+    class << self
+  
+      def finalised?
+        false
+      end
+  
+    end
+  
+    def initialize(value, index, block, var1, var2, zero)
+      @value, @index, @block, @var1, @var2, @zero = value, index, block, var1, var2, zero
+    end
+  
+    def descriptor(hash)
+      hash = hash.merge @index => ((hash.values.max || 0) + 1)
+      hash = hash.merge @var1 => ((hash.values.max || 0) + 1)
+      hash = hash.merge @var2 => ((hash.values.max || 0) + 1)
+      "Argument(#{@value.descriptor(hash)},#{@index.descriptor(hash)}," +
+        "#{@block.descriptor(hash)},#{@zero.descriptor(hash)})"
+    end
+  
+    def typecode
+      INT
+    end
+  
+    def shape
+      @value.shape
+    end
+  
+    def demand
+      initial = @value.subst(@index => INT.new(0)).simplify
+      retval = @zero.simplify
+      INT.new(0).upto @index.size - 1 do |i|
+        sub = @value.subst @index => INT.new(i)
+        cond = @block.subst @var1 => sub, @var2 => initial
+        retval.assign cond.conditional(INT.new(i), retval)
+        initial.assign cond.conditional(sub, initial)
+      end
+      retval
+    end
+  
+    def element(i)
+      self.class.new @value.element(i), @index, @block, @var1, @var2, @zero
+    end
+  
+    def variables
+      @value.variables + @zero.variables - @index.variables
+    end
+  
+    def strip
+      meta_vars, meta_values, var = @index.strip
+      vars, values, term = @value.subst(@index => var).strip
+      block_vars, block_values, block_term = @block.strip
+      zero_vars, zero_values, zero_term = @zero.strip
+      return vars + meta_vars + block_vars + zero_vars,
+        values + meta_values + block_values + zero_values,
+        self.class.new(term, var, block_term, @var1, @var2, zero_term)
+    end
+  
+    def subst(hash)
+      subst_var = @index.subst hash
+      value = @value.subst(@index => subst_var).subst hash
+      block = @block.subst hash
+      zero = @zero.subst hash
+      self.class.new value, subst_var, block, @var1, @var2, zero
+    end
+  
+    def compilable?
+      @value.compilable? and @block.compilable? and @zero.compilable?
+    end
+  
+  end
+
+end
+  

data/lib/multiarray/components.rb

@@ -47,10 +47,6 @@ module Hornetseye
         dest, source, default, zero, labels, rank, n
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/diagonal.rb

@@ -53,10 +53,6 @@ module Hornetseye
         value, index0, index1, index2, initial, block, var1, var2
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/elementwise.rb

@@ -74,10 +74,6 @@ module Hornetseye
       check_shape *values
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/field.rb

@@ -151,9 +151,9 @@ module Hornetseye
         n = typecode.maxint.new n unless n.matched?
         retval = new *shape
         unless compilable? and dimension > 0
-          Random.new(retval.sexp, n).demand
+          Random.new(retval, n).demand
         else
-          GCCFunction.run Random.new(retval.sexp, n)
+          GCCFunction.run Random.new(retval, n)
         end
         retval
       end

data/lib/multiarray/histogram.rb

@@ -44,10 +44,6 @@ module Hornetseye
       @dest, @weight, @sources = dest, weight, sources
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/inject.rb

@@ -50,10 +50,6 @@ 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.
@@ -95,7 +91,7 @@ module Hornetseye
       end
       offset.upto @index.size - 1 do |i|
         sub = @value.subst @index => INT.new( i )
-        retval.assign @block.subst( @var1 => retval, @var2 => sub )
+        retval.assign @block.subst(@var1 => retval, @var2 => sub)
       end
       retval
     end

data/lib/multiarray/integral.rb

@@ -43,10 +43,6 @@ module Hornetseye
       @dest, @source = dest, source
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/lambda.rb

@@ -31,10 +31,6 @@ module Hornetseye
       @term = term
     end
 
-    def sexp?
-      true
-    end
-
     # Get storage object if there is any
     #
     # @return [Malloc,List,NilClass] Object storing the data.

data/lib/multiarray/lookup.rb

@@ -29,10 +29,6 @@ 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.

data/lib/multiarray/lut.rb

@@ -44,10 +44,6 @@ 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.

data/lib/multiarray/mask.rb

@@ -45,10 +45,6 @@ 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.

data/lib/multiarray/methods.rb

@@ -66,7 +66,7 @@ module Hornetseye
               Hornetseye::ElementWise( proc { |x| mod.send op, x },
                                        "#{mod}.#{op}",
                                        proc { |x| x.send conversion } ).
-                new(a.sexp).force
+                new(a).force
             end
           else
             send "#{op}_without_hornetseye", a
@@ -102,7 +102,7 @@ module Hornetseye
               Hornetseye::ElementWise( proc { |x,y| mod.send op, x, y },
                                        "#{mod}.#{op}",
                                        proc { |t,u| t.send coercion, u } ).
-                new(a.sexp, b.sexp).force
+                new(a, b).force
             end
           else
             send "#{op}_without_hornetseye", a, b

data/lib/multiarray/node.rb

@@ -598,9 +598,9 @@ module Hornetseye
       if indices.empty?
         check_shape value
         unless compilable? and value.compilable? and dimension > 0
-          Store.new(self, value.sexp).demand
+          Store.new(self, value).demand
         else
-          GCCFunction.run Store.new(self, value.sexp)
+          GCCFunction.run Store.new(self, value)
         end
         value
       else
@@ -660,11 +660,11 @@ module Hornetseye
         self
       elsif compilable?
         retval = allocate
-        GCCFunction.run Store.new(retval.sexp, self)
+        GCCFunction.run Store.new(retval, self)
         retval.demand.get
       else
         retval = allocate
-        Store.new(retval.sexp, self).demand
+        Store.new(retval, self).demand
         retval.demand.get
       end
     end
@@ -689,7 +689,7 @@ module Hornetseye
     # @private
     def coerce(other)
       if other.matched?
-        return other.sexp, self
+        return other, self
       else
         return Node.match(other, self).new(other), self
       end

data/lib/multiarray/operations.rb

@@ -63,7 +63,7 @@ module Hornetseye
           else
             Hornetseye::ElementWise(proc { |x,y| x.send op, y }, op,
                                     proc { |t,u| t.send coercion, u } ).
-              new(sexp, other.sexp).force
+              new(self, other).force
           end
         end
       end
@@ -221,7 +221,7 @@ module Hornetseye
       else
         Hornetseye::ElementWise(proc { |x,y,z| x.conditional y, z }, :conditional,
                                 proc { |t,u,v| t.cond u, v }).
-          new(self, a.sexp, b.sexp).force
+          new(self, a, b).force
       end
     end
 
@@ -368,7 +368,7 @@ module Hornetseye
       block = options[ :block ] || action.call( var1, var2 )
       if dimension == 0
         if initial
-          block.subst( var1 => initial, var2 => self ).simplify
+          block.subst(var1 => initial, var2 => self).simplify
         else
           demand
         end
@@ -577,7 +577,7 @@ module Hornetseye
       filter = Node.match( filter, typecode ).new filter unless filter.matched?
       array = self
       (dimension - filter.dimension).times { array = array.roll }
-      array.table(filter.sexp) { |a,b| a * b }.diagonal { |s,x| s + x }
+      array.table(filter) { |a,b| a * b }.diagonal { |s,x| s + x }
     end
 
     # Erosion
@@ -723,7 +723,7 @@ module Hornetseye
     # @return [Node] The integral image of this array.
     def integral
       left = allocate
-      block = Integral.new left.sexp, self
+      block = Integral.new left, self
       if block.compilable?
         GCCFunction.run block
       else
@@ -750,8 +750,8 @@ module Hornetseye
       labels = Sequence.new target, size; labels[0] = 0
       rank = Sequence.uint size; rank[0] = 0
       n = Hornetseye::Pointer( INT ).new; n.store INT.new( 0 )
-      block = Components.new left.sexp, self, default.sexp, target.new(0),
-                             labels.sexp, rank.sexp, n
+      block = Components.new left, self, default, target.new(0),
+                             labels, rank, n
       if block.compilable?
         Hornetseye::GCCFunction.run block
       else
@@ -773,7 +773,7 @@ module Hornetseye
                                          [ m.size ] )
       index = Hornetseye::Pointer( INT ).new
       index.store INT.new( 0 )
-      block = Mask.new left.sexp, self, m.sexp, index
+      block = Mask.new left, self, m, index
       if block.compilable?
         GCCFunction.run block
       else
@@ -806,7 +806,7 @@ module Hornetseye
         coercion(default.typecode).new *(shape[1 .. -1] + m.shape)
       index = Hornetseye::Pointer(INT).new
       index.store INT.new(0)
-      block = Unmask.new left.sexp, self, m.sexp, index, default.sexp
+      block = Unmask.new left, self, m, index, default
       if block.compilable?
         GCCFunction.run block
       else
@@ -955,7 +955,7 @@ class Array
     end
     left = Hornetseye::MultiArray(weight.typecode, ret_shape.size).new *ret_shape
     left[] = 0
-    block = Hornetseye::Histogram.new left.sexp, weight.sexp, *self
+    block = Hornetseye::Histogram.new left, weight, *self
     if block.compilable?
       Hornetseye::GCCFunction.run block
     else

data/lib/multiarray/pointer.rb

@@ -127,10 +127,6 @@ module Hornetseye
       @value = value
     end
 
-    def sexp?
-      true
-    end
-
     # Get access to storage object
     #
     # @return [Malloc,List] The object used to store the data.

data/lib/multiarray/random.rb

@@ -29,10 +29,6 @@ module Hornetseye
       @dest, @n = dest, n
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/store.rb

@@ -29,10 +29,6 @@ module Hornetseye
       @dest, @source = dest, source
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/unmask.rb

@@ -45,10 +45,6 @@ module Hornetseye
       @dest, @source, @m, @index, @default = dest, source, m, index, default
     end
 
-    def sexp?
-      true
-    end
-
     # Get unique descriptor of this object
     #
     # @param [Hash] hash Labels for any variables.

data/lib/multiarray/variable.rb

@@ -38,10 +38,6 @@ module Hornetseye
       @meta = meta
     end
 
-    def sexp?
-      true
-    end
-
     # Display string with information about this object
     #
     # @return [String] String with information about this object (e.g.

data/test/tc_multiarray.rb

@@ -52,6 +52,14 @@ class TC_MultiArray < Test::Unit::TestCase
     Hornetseye::sum *args, &action
   end
 
+  def argmin( *args, &action )
+    Hornetseye::argmin *args, &action
+  end
+
+  def argmax( *args, &action )
+    Hornetseye::argmax *args, &action
+  end
+
   def finalise( *args, &action )
     Hornetseye::finalise *args, &action
   end
@@ -361,6 +369,18 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_equal [ [ 1, 2, 3 ] , [ 4, 5, 6 ] ], sum { || m }.to_a
   end
 
+  def test_argmin
+    assert_equal [[0, 0, 1]],
+                 argmin { |i| M[[1, 2, 3], [4, 3, 2]][i] }.collect { |x| x.to_a }
+    assert_equal [2, 1], argmin { |i,j| M[[1, 2, 3], [4, 3, 0]][i,j] }
+    m = M[[[1,0,3,4],[5,4,3,2],[1,2,1,0]],[[3,2,4,1],[7,4,8,2],[2,1,9,1]]]
+    assert_equal [[[0, 0, 0, 1], [0, 0, 0, 0], [0, 1, 0, 0]]],
+                 argmin { |i| m[i] }.collect { |x| x.to_a }
+    assert_equal [[0, 0, 2, 2], [0, 0, 0, 0]],
+                 argmin { |i,j| m[i,j] }.collect { |x| x.to_a }
+    assert_equal [1, 0, 0], argmin { |i,j,k| m[i,j,k] }
+  end
+
   def test_min
     assert_equal 1, M[ [ 5, 3, 7 ], [ 2, 1, 6 ] ].min
   end

data/test/tc_sequence.rb

@@ -48,6 +48,14 @@ class TC_Sequence < Test::Unit::TestCase
     Hornetseye::sum *args, &action
   end
 
+  def argmin( *args, &action )
+    Hornetseye::argmin *args, &action
+  end
+
+  def argmax( *args, &action )
+    Hornetseye::argmax *args, &action
+  end
+
   def setup
   end
 
@@ -307,6 +315,22 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal 384, sum { |i| S[ 128, 128, 128 ][i] }
   end
 
+  def test_argmin
+    [S(O), S(I)].each do |t|
+      assert_equal [], argmin { t[1, 0, 2] }
+      assert_equal [], argmin { || t[1, 0, 2] }
+      assert_equal [1], argmin { |i| t[1, 0, 2][i] }
+    end
+  end
+
+  def test_argmax
+    [S(O), S(I)].each do |t|
+      assert_equal [], argmax { t[1, 3, 2] }
+      assert_equal [], argmax { || t[1, 3, 2] }
+      assert_equal [1], argmax { |i| t[1, 3, 2][i] }
+    end
+  end
+
   def test_min
     [O, I].each do |t|
       assert_equal 2, S(t)[4, 2, 3].min

metadata

@@ -2,7 +2,7 @@
 name: multiarray
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.23.2
+  version: 0.24.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -65,6 +65,7 @@ files:
 - lib/multiarray/pointer.rb
 - lib/multiarray/element.rb
 - lib/multiarray/composite.rb
+- lib/multiarray/argument.rb
 - lib/multiarray/lookup.rb
 - lib/multiarray/sequence.rb
 - lib/multiarray/gcctype.rb