multiarray 0.2.4 → 0.4.0

data/test/ts_multiarray.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'tc_int'
 require 'tc_object'
 require 'tc_sequence'
 require 'tc_multiarray'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multiarray
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 +00:00
+date: 2010-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,19 +37,17 @@ files:
 - .document
 - lib/multiarray.rb
 - lib/multiarray/sequence_.rb
-- lib/multiarray/composite_type.rb
+- lib/multiarray/pointer.rb
 - lib/multiarray/multiarray.rb
+- lib/multiarray/lazy.rb
 - lib/multiarray/sequence.rb
 - lib/multiarray/list.rb
-- lib/multiarray/descriptortype.rb
-- lib/multiarray/type_operation.rb
+- lib/multiarray/malloc.rb
 - lib/multiarray/int.rb
+- lib/multiarray/pointer_.rb
 - lib/multiarray/type.rb
-- lib/multiarray/storage.rb
 - lib/multiarray/object.rb
 - lib/multiarray/int_.rb
-- lib/multiarray/memory.rb
-- lib/multiarray/sequence_operation.rb
 - test/ts_multiarray.rb
 - test/tc_multiarray.rb
 - test/tc_object.rb

data/lib/multiarray/composite_type.rb

@@ -1,67 +0,0 @@
-module Hornetseye
-
-  # Abstract class for arrays and composite numbers
-  #
-  # @abstract
-  class CompositeType < Type
-
-    class << self
-
-      # Type of elements this type is composed of
-      #
-      # @return [Type,Sequence_] The element type of this type.
-      attr_accessor :element_type
-
-      # Number of elements this type is composed of
-      #
-      # @return [Integer] The number of elements this type is composed of.
-      attr_accessor :num_elements
-
-      # Returns the type of storage object for storing values
-      #
-      # @return [Class] Returns the storage type for the element type.
-      #
-      # @private
-      def storage
-        element_type.storage
-      end
-
-      # Number of bytes for storing an object of this type
-      #
-      # @return [Integer] Number of bytes to store +num_elements+ elements of
-      # type +element_type+.
-      #
-      # @private
-      def bytesize
-        element_type.bytesize * num_elements
-      end
-
-      # Returns the element type of this composite type
-      #
-      # @return [Class] Returns +element_type.basetype+.
-      #
-      # @private
-      def basetype
-        element_type.basetype
-      end
-
-    end
-
-    # The element type of this object's type
-    #
-    # @return [Type,Sequence_] The element type of this object's type.
-    def element_type
-      self.class.element_type
-    end
-
-    # The number of elements this object's type is composed of
-    #
-    # @return [Integer] The number of elements this object's type is composed
-    # of.
-    def num_elements
-      self.class.num_elements
-    end
-
-  end
-
-end

data/lib/multiarray/descriptortype.rb

@@ -1,43 +0,0 @@
-module Hornetseye
-
-  # Abstract class for describing scalar data types
-  #
-  # This class is for descriping scalar data types which are known to the Ruby
-  # standard library. I.e. there is a descriptor for +Array#pack+ and
-  # +String#unpack+.
-  #
-  # @see Array#pack
-  # @see String#unpack
-  #
-  # @abstract
-  class DescriptorType < Type
-
-    class << self
-
-      # Convert a Ruby object to a string containing the native representation
-      #
-      # @return [String] A string with the native representation of the value.
-      #
-      # @see Array#pack
-      #
-      # @private
-      def pack( value )
-        [ value ].pack descriptor
-      end
-
-      # Convert a string with the native representation to a Ruby object
-      #
-      # @return [Object] The corresponding Ruby object to the native value.
-      #
-      # @see String#unpack
-      #
-      # @private
-      def unpack( value )
-        value.unpack( descriptor ).first
-      end
-
-    end
-
-  end
-
-end

data/lib/multiarray/memory.rb

@@ -1,112 +0,0 @@
-module Hornetseye
-
-  # Class for creating views on raw memory
-  #
-  # @see Storage
-  # @see List
-  # @private
-  class Memory < Storage
-
-    class << self
-
-      # Create a +Memory+ object viewing a new +Malloc+ object
-      #
-      # @param [Integer] bytesize Number of bytes to allocate.
-      # @return [Memory] The new +Memory+ object.
-      #
-      # @see Malloc
-      # @private
-      def alloc( bytesize )
-        Memory.new Malloc.new( bytesize )
-      end
-
-      # Create a +Memory+ object viewing a new +Malloc+ object initialised with
-      # the content of a string
-      #
-      # @param [String] str A Ruby string with data to write to memory.
-      # object.
-      # @return [Memory] The new +Memory+ object initialised with the data.
-      #
-      # @private
-      def import( str )
-        retval = alloc str.bytesize
-        retval.import str
-        retval
-      end
-
-    end
-
-    # Create zero-offset view on a +Malloc+ object
-    #
-    # @param [Malloc] ptr A +Malloc+ object with the raw data.
-    #
-    # @private
-    def initialize( ptr )
-      super ptr
-    end
-
-    # Read an element from the memory
-    #
-    # @param [Type] typecode Information for converting native data type to
-    # a Ruby object.
-    # @return [Object] The element from the memory.
-    #
-    # @see #store
-    # @see List#load
-    # @private
-    def load( typecode )
-      typecode.unpack export( typecode.bytesize )
-    end
-
-    # Write an element to the memory
-    #
-    # @param [Type] typecode Information for converting Ruby object to native
-    # data type.
-    # @return [Object] Returns the parameter +value+.
-    #
-    # @see #load
-    # @see List#store
-    # @private
-    def store( typecode, value )
-      import typecode.pack( value )
-      value
-    end
-
-    # Write multiple elements to memory
-    #
-    # @param [String] data A ruby string with data to write to memory.
-    # @return [String] The parameter +data+.
-    #
-    # @see #export
-    # @see List#import
-    # @private
-    def import( data )
-      @data.write data
-    end
-
-    # Read multiple elements from memory
-    #
-    # @param [Integer] bytesize Number of bytes to read from memory.
-    # @return [String] A Ruby string with the resulting data.
-    #
-    # @see #import
-    # @see List#export
-    # @private
-    def export( bytesize )
-      @data.read bytesize
-    end
-
-    # Create a new view with the specified offset
-    #
-    # @param [Integer] offset A non-negative offset.
-    # @return [Memory] A new view for the specified part of the memory.
-    #
-    # @see List#+
-    # @private
-    def +( offset )
-      Memory.new @data + offset
-    end
-
-  end
-
-end

data/lib/multiarray/sequence_operation.rb

@@ -1,52 +0,0 @@
-module Hornetseye
-
-  # @private
-  module SequenceOperation
-
-    # @private
-    def set( value = typecode.default )
-      if value.is_a? Array
-        for i in 0 ... num_elements
-          assign i, i < value.size ? value[ i ] : typecode.default
-        end
-      else
-        op( value ) { |x| set x }
-      end
-      value
-    end
-
-    # @private
-    def get
-      self
-    end
-
-    # @private
-    def sel( *indices )
-      if indices.empty?
-        super *indices
-      else
-        unless ( 0 ... num_elements ).member? indices.last
-          raise "Index must be in 0 ... #{num_elements} " +
-                "(was #{indices.last.inspect})"
-        end
-        element_storage = @storage + indices.last * stride * typecode.bytesize
-        element_type.wrap( element_storage ).sel *indices[ 0 ... -1 ]
-      end
-    end
-
-    # @private
-    def op( *args, &action )
-      for i in 0 ... num_elements
-        sub_args = args.collect do |arg|
-          arg.is_a?( Sequence_ ) ? arg[ i ] : arg
-        end
-        sel( i ).op *sub_args, &action
-      end
-      self
-    end
-
-  end
-
-  Sequence_.class_eval { include SequenceOperation }
-
-end

data/lib/multiarray/storage.rb

@@ -1,23 +0,0 @@
-module Hornetseye
-
-  # Abstract class inherited by +Memory+ and +List+
-  #
-  # @see Memory
-  # @see List
-  #
-  # @private
-  # @abstract
-  class Storage
-
-    # Create storage object based on raw data or Ruby array
-    #
-    # @param [Malloc,Array] data Delegate object for storing the data.
-    #
-    # @private
-    def initialize( data )
-      @data = data
-    end
-
-  end
-
-end

data/lib/multiarray/type_operation.rb

@@ -1,32 +0,0 @@
-module Hornetseye
-
-  # @private
-  module TypeOperation
-
-    # @private
-    def set( value = typecode.default )
-      @storage.store self.class, value
-      value
-    end
-
-    # @private
-    def get
-      @storage.load self.class
-    end
-
-    # @private
-    def sel
-      self
-    end
-
-    # @private
-    def op( *args, &action )
-      instance_exec *args, &action
-      self
-    end
-
-  end
-
-  Type.class_eval { include TypeOperation }
-
-end