multiarray 0.15.3 → 0.16.0

data/Rakefile

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

data/lib/multiarray.rb

@@ -418,6 +418,38 @@ class Fixnum
 
   end
 
+  # Generate random number
+  #
+  # Generate a random number greater or equal to zero and lower than this number.
+  #
+  # @return [Integer] A random number.
+  def lrand
+    Kernel.rand self
+  end
+
+  # Generate random number
+  #
+  # Generate a random number greater or equal to zero and lower than this number.
+  #
+  # @return [Float] A random number.
+  def drand
+    self * Kernel.rand
+  end
+
+end
+
+# +Float+ is extend with a few methods
+class Float
+
+  # Generate random number
+  #
+  # Generate a random number greater or equal to zero and lower than this number.
+  #
+  # @return [Float] A random number.
+  def drand
+    self * Kernel.rand
+  end
+
 end
 
 # +Range+ is extended with a few methods
@@ -555,6 +587,7 @@ require 'multiarray/node'
 require 'multiarray/element'
 require 'multiarray/composite'
 require 'multiarray/store'
+require 'multiarray/random'
 require 'multiarray/object'
 require 'multiarray/index'
 require 'multiarray/bool'

data/lib/multiarray/gcccontext.rb

@@ -207,6 +207,38 @@ inline void *mallocToPtr( VALUE rbMalloc )
   return retVal;
 }
 
+static unsigned long make_mask( unsigned long x )
+{
+  x = x | x >> 1;
+  x = x | x >> 2;
+  x = x | x >> 4;
+  x = x | x >> 8;
+  x = x | x >> 16;
+#if 4 < SIZEOF_LONG
+  x = x | x >> 32;
+#endif
+  return x;
+}
+
+static unsigned long limited_rand( unsigned long limit )
+{
+  int i;
+  unsigned long mask, val;
+  if ( limit < 2 ) return 0;
+  mask = make_mask( limit - 1 );
+  retry:
+  val = 0;
+  for ( i = SIZEOF_LONG / 4 - 1; 0 <= i; i-- ) {
+    if ( ( mask >> ( i * 32 ) ) & 0xffffffff ) {
+      val |= (unsigned long)rb_genrand_int32() << ( i * 32 );
+      val &= mask;
+      if ( limit <= val )
+        goto retry;
+    };
+  };
+  return val;
+}
+
 #{@instructions}
 
 #{@wrappers}

data/lib/multiarray/gccvalue.rb

@@ -434,6 +434,24 @@ module Hornetseye
       end
     end
 
+    # Generate floating point random number
+    #
+    # @return [GCCValue] C value refering to the result.
+    #
+    # @private
+    def drand
+      GCCValue.new @function, "( rb_genrand_real() * ( #{self} ) )"
+    end
+
+    # Generate integer random number
+    #
+    # @return [GCCValue] C value refering to the result.
+    #
+    # @private
+    def lrand
+      GCCValue.new @function, "limited_rand( #{self} )"
+    end
+
     # Generate code for selecting larger value
     #
     # @param [Object,GCCValue] other Second operand for binary operation.

data/lib/multiarray/random.rb

@@ -0,0 +1,128 @@
+# multiarray - Lazy multi-dimensional arrays for Ruby
+# Copyright (C) 2010 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/>.
+
+module Hornetseye
+
+  # Class for generating random number arrays
+  class Random < Node
+
+    # Constructor
+    #
+    # @param [Node] dest Target array to write array to.
+    # @param [Node] n Upper boundary for random value.
+    #
+    # @private
+    def initialize( dest, n )
+      @dest, @n = dest, n
+    end
+
+    # Get unique descriptor of this object
+    #
+    # @param [Hash] hash Labels for any variables.
+    #
+    # @return [String] Descriptor of this object,
+    #
+    # @private
+    def descriptor( hash )
+      "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
+    end
+
+    # Reevaluate computation
+    #
+    # @return [Node,Object] Result of computation
+    #
+    # @see #force
+    #
+    # @private
+    def demand
+      if variables.empty?
+        if dimension > 0
+          shape.last.times do |i|
+            dest = @dest.element INT.new( i )
+            Random.new( dest, @n ).demand
+          end  
+        else
+          if @n.typecode < INT_ or ( @n.typecode < OBJECT and @n.get.is_a? Integer )
+            @dest.store @n.typecode.new( @n.get.lrand )
+          else
+            @dest.store @n.typecode.new( @n.get.drand )
+          end
+        end
+        @dest
+      else
+        super
+      end
+    end
+
+    # Substitute variables
+    #
+    # Substitute the variables with the values given in the hash.
+    #
+    # @param [Hash] hash Substitutions to apply.
+    #
+    # @return [Node] Term with substitutions applied.
+    #
+    # @private
+    def subst( hash )
+      self.class.new @dest.subst( hash ), @n.subst( hash )
+    end
+
+    # Get variables contained in this term
+    #
+    # @return [Set] Returns list of variables.
+    #
+    # @private
+    def variables
+      @dest.variables + @n.variables
+    end
+
+    # Strip of all values
+    #
+    # Split up into variables, values, and a term where all values have been
+    # replaced with variables.
+    #
+    # @return [Array<Array,Node>] Returns an array of variables, an array of
+    # values, and the term based on variables.
+    #
+    # @private
+    def strip
+      vars1, values1, term1 = @dest.strip
+      vars2, values2, term2 = @n.strip
+      return vars1 + vars2, values1 + values2, Random.new( term1, term2 )
+    end
+  
+    # Check whether this term is compilable
+    #
+    # @return [Boolean] Returns whether this term is compilable.
+    #
+    # @private
+    def compilable?
+      @dest.compilable? and @n.compilable?
+    end
+
+  end
+
+end
+

data/lib/multiarray/sequence.rb

@@ -117,6 +117,17 @@ module Hornetseye
         end
       end
 
+      def random( n = 1 )
+        n = typecode.maxint.new n unless n.is_a? Node
+        retval = new
+        unless compilable? and dimension > 0
+          Random.new( retval, n ).demand
+        else
+          GCCFunction.run Random.new( retval, n )
+        end
+        retval
+      end
+
       # Construct native array from Ruby array
       #
       # @param [Array<Object>] args Array with Ruby values.

data/test/tc_sequence.rb

@@ -26,6 +26,7 @@ class TC_Sequence < Test::Unit::TestCase
   O = Hornetseye::OBJECT
   B = Hornetseye::BOOL
   I = Hornetseye::INT
+  F = Hornetseye::DFLOAT
   S = Hornetseye::Sequence
   C = Hornetseye::INTRGB
   X = Hornetseye::DCOMPLEX
@@ -76,6 +77,18 @@ class TC_Sequence < Test::Unit::TestCase
                  S( C, 2 ).indgen( C( 1, 2, 3 ), C( 2, 3, 4 ) )
   end
 
+  def test_sequence_random
+    r = S( O, 100 ).random( 10 ).range
+    assert r.begin >= 0
+    assert r.end < 10
+    r = S( I, 100 ).random( 10 ).range
+    assert r.begin >= 0
+    assert r.end < 10
+    r = S( F, 100 ).random( 10.0 ).range
+    assert r.begin >= 0
+    assert r.end < 10
+  end
+
   def test_sequence_at
     assert_equal "Sequence(INT,3):\n[ 1, 2, 3 ]",
                  S( I, 3 )[ 1, 2, 3 ].inspect

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: multiarray
 version: !ruby/object:Gem::Version 
-  hash: 37
   prerelease: false
   segments: 
   - 0
-  - 15
-  - 3
-  version: 0.15.3
+  - 16
+  - 0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,6 +89,7 @@ files:
 - lib/multiarray/lookup.rb
 - lib/multiarray/gccvalue.rb
 - lib/multiarray/complex.rb
+- lib/multiarray/random.rb
 - lib/multiarray/lut.rb
 - lib/multiarray.rb
 - test/ts_multiarray.rb
@@ -117,7 +115,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -126,7 +123,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"