multiarray 0.2.0 → 0.2.1

data/Makefile

@@ -2,13 +2,15 @@
 .SUFFIXES: .gem .o .cc .hh .rb .tar .gz .bz2
 
 RUBY_VERSION = 1.8
-MULTIARRAY_VERSION = 0.2.0
+MULTIARRAY_VERSION = 0.2.1
 
 CP = cp
-RM = rm -f
+RM = rm -Rf
 MKDIR = mkdir -p
 GEM = gem$(RUBY_VERSION)
 RUBY = ruby$(RUBY_VERSION)
+YARDOC = yardoc
+RI = ri$(RUBY_VERSION)
 TAR = tar
 GIT = git
 SITELIBDIR = $(shell $(RUBY) -r mkmf -e "puts \"\#{Config::CONFIG['sitelibdir']}\"")
@@ -41,6 +43,9 @@ install-gem:: multiarray-$(MULTIARRAY_VERSION).gem
 uninstall-gem::
 	$(GEM) uninstall multiarray || echo Nothing to uninstall
 
+yardoc:: README $(LIB)
+	$(YARDOC)
+
 check:: $(LIB) $(PKG_LIB) $(TEST)
 	$(RUBY) -rrubygems -Ilib -Itest test/ts_multiarray.rb
 
@@ -70,4 +75,4 @@ multiarray-$(MULTIARRAY_VERSION).tar.bz2: $(SOURCES)
 	$(TAR) cjf $@ $(SOURCES)
 
 clean::
-	rm -f *~ lib/*~ lib/multiarray/*~ test/*~ doc/*~ *.gem
+	$(RM) *~ lib/*~ lib/multiarray/*~ test/*~ *.gem doc

data/lib/multiarray.rb

@@ -2,13 +2,14 @@ require 'malloc'
 require 'multiarray/storage'
 require 'multiarray/list'
 require 'multiarray/memory'
-require 'multiarray/type_operation'
 require 'multiarray/type'
+require 'multiarray/type_operation'
 require 'multiarray/descriptortype'
-require 'multiarray/int'
+require 'multiarray/int_'
 require 'multiarray/composite_type'
-require 'multiarray/sequence_operation'
+require 'multiarray/sequence_'
 require 'multiarray/sequence'
+require 'multiarray/sequence_operation'
 require 'multiarray/multiarray'
 
 class Proc

data/lib/multiarray/sequence.rb

@@ -1,130 +1,17 @@
 module Hornetseye
 
-  class Sequence_ < CompositeType
+  class Sequence
 
     class << self
 
-      attr_accessor :stride
-
-      def inspect
-        to_s
-      end
-
-      def default
-        retval = new
-        retval.set
-        retval
-      end
-
-      def to_s
-        "Sequence(#{element_type.to_s},#{num_elements.to_s})"
-      end
-
-      def typecode
-        element_type.typecode
-      end
-
-      def empty?
-        num_elements == 0
-      end
-
-      def shape
-        element_type.shape + [ num_elements ]
+      def new( element_type, num_elements )
+        Hornetseye::Sequence( element_type, num_elements ).new
       end
 
     end
 
-    def stride
-      self.class.stride
-    end
-
-    def inspect( indent = nil, lines = nil )
-      if indent
-        prepend = ''
-      else
-        prepend = "#{self.class.inspect}:\n"
-        indent = 0
-        lines = 0
-      end
-      if empty?
-        retval = '[]'
-      else
-        retval = '[ '
-        for i in 0 ... num_elements
-          x = at i
-          if x.is_a? Sequence_
-            if i > 0
-              retval += ",\n  "
-              lines += 1
-              if lines >= 10
-                retval += '...' if indent == 0
-                break
-              end
-              retval += '  ' * indent
-            end
-            str = x.inspect indent + 1, lines
-            lines += str.count "\n"
-            retval += str
-            if lines >= 10
-              retval += '...' if indent == 0
-              break
-            end
-          else
-            retval += ', ' if i > 0
-            str = x.inspect
-            if retval.size + str.size >= 74 - '...'.size -
-                '[  ]'.size * indent.succ
-              retval += '...'
-              break
-            else
-              retval += str
-            end
-          end
-        end
-        retval += ' ]' unless lines >= 10
-      end
-      prepend + retval
-    end
-
-    def to_a
-      ( 0 ... num_elements ).collect do |i|
-        x = at i
-        x.is_a?( Sequence_ ) ? x.to_a : x
-      end
-    end
-
-    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
-
-    def get
-      self
-    end
-
-    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_memory = @memory + indices.last * stride * typecode.bytesize
-        element_type.new( :memory => element_memory ).sel *indices[ 0 ... -1 ]
-      end
-    end
-
   end
 
-  Sequence_.class_eval { include SequenceOperation }
-
   def Sequence( element_type, num_elements,
                 stride = element_type.size )
     retval = Class.new Sequence_

data/lib/multiarray/sequence_.rb

@@ -0,0 +1,112 @@
+module Hornetseye
+
+  class Sequence_ < CompositeType
+
+    class << self
+
+      attr_accessor :stride
+
+      def inspect
+        to_s
+      end
+
+      def default
+        retval = new
+        retval.set
+        retval
+      end
+
+      def to_s
+        if element_type
+          shortcut = element_type < Sequence_ ? 'MultiArray' : 'Sequence'
+          typename = typecode.to_s
+          if typename =~ /^[A-Z]+$/
+            "#{shortcut}.#{typename.downcase}(#{shape.join ','})"
+          else
+            "#{shortcut}(#{typename},#{shape.join ','})"
+          end
+        else
+          'Sequence_'
+        end
+      end
+
+      def typecode
+        element_type.typecode
+      end
+
+      def empty?
+        num_elements == 0
+      end
+
+      def shape
+        element_type.shape + [ num_elements ]
+      end
+
+    end
+
+    def stride
+      self.class.stride
+    end
+
+    def inspect( indent = nil, lines = nil )
+      if indent
+        prepend = ''
+      else
+        prepend = "#{self.class.inspect}:\n"
+        indent = 0
+        lines = 0
+      end
+      if empty?
+        retval = '[]'
+      else
+        retval = '[ '
+        for i in 0 ... num_elements
+          x = at i
+          if x.is_a? Sequence_
+            if i > 0
+              retval += ",\n  "
+              lines += 1
+              if lines >= 10
+                retval += '...' if indent == 0
+                break
+              end
+              retval += '  ' * indent
+            end
+            str = x.inspect indent + 1, lines
+            lines += str.count "\n"
+            retval += str
+            if lines >= 10
+              retval += '...' if indent == 0
+              break
+            end
+          else
+            retval += ', ' if i > 0
+            str = x.inspect
+            if retval.size + str.size >= 74 - '...'.size -
+                '[  ]'.size * indent.succ
+              retval += '...'
+              break
+            else
+              retval += str
+            end
+          end
+        end
+        retval += ' ]' unless lines >= 10
+      end
+      prepend + retval
+    end
+
+    def to_s
+      to_a.to_s
+    end
+
+    def to_a
+      ( 0 ... num_elements ).collect do |i|
+        x = at i
+        x.is_a?( Sequence_ ) ? x.to_a : x
+      end
+    end
+
+  end
+
+end

data/lib/multiarray/sequence_operation.rb

@@ -2,6 +2,34 @@ module Hornetseye
 
   module SequenceOperation
 
+    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
+
+    def get
+      self
+    end
+
+    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_memory = @memory + indices.last * stride * typecode.bytesize
+        element_type.wrap( element_memory ).sel *indices[ 0 ... -1 ]
+      end
+    end
+
     def op( *args, &action )
       for i in 0 ... num_elements
         sub_args = args.collect do |arg|
@@ -14,4 +42,6 @@ module Hornetseye
 
   end
 
+  Sequence_.class_eval { include SequenceOperation }
+
 end

data/lib/multiarray/type.rb

@@ -8,6 +8,10 @@ module Hornetseye
         memory.alloc bytesize
       end
 
+      def wrap( memory )
+        new :memory => memory
+      end
+
       def typecode
         self
       end
@@ -76,19 +80,6 @@ module Hornetseye
       get.to_a
     end
 
-    def set( value = typecode.default )
-      @memory.store self.class, value
-      value
-    end
-
-    def get
-      @memory.load self.class
-    end
-
-    def sel
-      self
-    end
-
     def at( *indices )
       sel( *indices ).get
     end
@@ -103,6 +94,4 @@ module Hornetseye
 
   end
 
-  Type.class_eval { include TypeOperation }
-
 end

data/lib/multiarray/type_operation.rb

@@ -2,6 +2,19 @@ module Hornetseye
 
   module TypeOperation
 
+    def set( value = typecode.default )
+      @memory.store self.class, value
+      value
+    end
+
+    def get
+      @memory.load self.class
+    end
+
+    def sel
+      self
+    end
+
     def op( *args, &action )
       instance_exec *args, &action
       self
@@ -9,4 +22,6 @@ module Hornetseye
 
   end
 
+  Type.class_eval { include TypeOperation }
+
 end

data/source.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{multiarray}
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.platform = Gem::Platform::RUBY
   s.date = Date.today.to_s
   s.summary = %q{Multi-dimensional and uniform Ruby arrays}
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.test_files = Dir.glob( 'test/tc_*.rb' )
   s.require_paths = [ 'lib' ]
   s.rubyforge_project = %q{hornetseye}
-  s.has_rdoc = true
-  s.extra_rdoc_files = [ 'README' ]
-  s.rdoc_options = %w{--exclude=/Makefile|.*\.(rb)/ --main README}
+  s.has_rdoc = 'yard'
+  # s.extra_rdoc_files = [ 'README' ]
+  # s.rdoc_options = %w{--exclude=/Makefile|.*\.(rb)/ --main README}
   s.add_dependency %q<malloc>, [ '~> 0.2' ]
 end

data/test/tc_int.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'multiarray'
+Kernel::require 'multiarray'
 
 class TC_Int < Test::Unit::TestCase
 

data/test/tc_sequence.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'multiarray'
+Kernel::require 'multiarray'
 
 class TC_Sequence < Test::Unit::TestCase
 
@@ -24,15 +24,24 @@ class TC_Sequence < Test::Unit::TestCase
     end
   end
 
+  def test_sequence_new
+    for t in @@types
+      s = Hornetseye::Sequence.new t, 3
+      s.set
+      assert_equal [ 0, 0, 0 ], s.to_a
+    end
+  end
+
   def test_sequence_to_s
     for t in @@types
-      assert_equal "Sequence(#{t.to_s},3)", Hornetseye::Sequence( t, 3 ).to_s
+      assert_equal "Sequence.#{t.to_s.downcase}(3)",
+                   Hornetseye::Sequence( t, 3 ).to_s
     end
   end
 
   def test_sequence_inspect
     for t in @@types
-      assert_equal "Sequence(#{t.inspect},3)",
+      assert_equal "Sequence.#{t.inspect.downcase}(3)",
                    Hornetseye::Sequence( t, 3 ).inspect
     end
   end
@@ -72,7 +81,15 @@ class TC_Sequence < Test::Unit::TestCase
     for t in @@types
       s = Hornetseye::Sequence( t, 3 ).new
       s[] = [ 1, 2, 3 ]
-      assert_equal "Sequence(#{t.inspect},3):\n[ 1, 2, 3 ]", s.inspect
+      assert_equal "Sequence.#{t.inspect.downcase}(3):\n[ 1, 2, 3 ]", s.inspect
+    end
+  end
+
+  def test_to_s
+    for t in @@types
+      s = Hornetseye::Sequence( t, 3 ).new
+      s[] = [ 1, 2, 3 ]
+      assert_equal '123', s.to_s
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multiarray
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +00:00
+date: 2009-12-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,37 +28,36 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
 - source.gemspec
 - Makefile
 - README
 - COPYING
 - lib/multiarray.rb
+- lib/multiarray/sequence_.rb
 - lib/multiarray/composite_type.rb
 - lib/multiarray/multiarray.rb
 - lib/multiarray/sequence.rb
 - lib/multiarray/list.rb
 - lib/multiarray/descriptortype.rb
 - lib/multiarray/type_operation.rb
-- lib/multiarray/int.rb
 - lib/multiarray/type.rb
 - lib/multiarray/storage.rb
+- lib/multiarray/int_.rb
 - lib/multiarray/memory.rb
 - lib/multiarray/sequence_operation.rb
 - test/ts_multiarray.rb
 - test/tc_int.rb
 - test/tc_sequence.rb
-has_rdoc: true
+has_rdoc: yard
 homepage: http://wedesoft.github.com/multiarray/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --exclude=/Makefile|.*\.(rb)/
-- --main
-- README
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement