multiarray 0.8.0 → 0.9.0

data/Rakefile

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

data/lib/multiarray/lambda.rb

@@ -83,8 +83,10 @@ module Hornetseye
     #
     # @private
     def subst( hash )
+      # subst_var = @index.subst hash
+      # Lambda.new subst_var, @term.subst( @index => subst_var ).subst( hash )
       subst_var = @index.subst hash
-      Lambda.new subst_var, @term.subst( @index => subst_var ).subst( hash )
+      Lambda.new subst_var, @term.subst( hash.merge( @index => subst_var ) )
     end
 
     # Lookup element of an array

data/lib/multiarray/node.rb

@@ -155,6 +155,10 @@ module Hornetseye
         self
       end
 
+      def rgb?
+        false
+      end
+
       # Get corresponding boolean-based datatype
       #
       # @return [Class] Returns +BOOL+.
@@ -376,6 +380,10 @@ module Hornetseye
       array_type.dimension
     end
 
+    def rgb?
+      array_type.rgb?
+    end
+
     # Extract native value if this is an element
     #
     # @return [Node,Object] Returns +self+.
@@ -636,11 +644,6 @@ module Hornetseye
         retval.demand.get
       else
         Store.new( array_type.new, self ).demand.get
-        #Hornetseye::lazy do
-        #  retval = array_type.new
-        #  retval[] = self
-        #  retval.get
-        #end
       end
     end
 
@@ -652,11 +655,6 @@ module Hornetseye
     #
     # @private
     def simplify
-      #if Thread.current[ :function ] and dimension == 0
-      #  demand.dup
-      #else
-      #  demand
-      #end
       dimension == 0 ? demand.dup : demand
     end
 

data/lib/multiarray/rgb.rb

@@ -315,6 +315,10 @@ module Hornetseye
         self == other
       end
 
+      def rgb?
+        true
+      end
+
     end
 
     def initialize( value = self.class.default )

data/lib/multiarray/sequence.rb

@@ -167,6 +167,10 @@ module Hornetseye
         element_type.dimension + 1
       end
 
+      def rgb?
+        element_type.rgb?
+      end
+
       def contiguous
         self
       end
@@ -232,10 +236,14 @@ module Hornetseye
       end
 
       def inspect
-        if dimension == 1
-          "Sequence(#{typecode.inspect},#{num_elements.inspect})"
+        if element_type and num_elements
+          if dimension == 1
+            "Sequence(#{typecode.inspect},#{num_elements.inspect})"
+          else
+            "MultiArray(#{typecode.inspect},#{shape.join ','})"
+          end
         else
-          "MultiArray(#{typecode.inspect},#{shape.join ','})"
+          'MultiArray(?,?)'
         end
       end
 
@@ -251,10 +259,14 @@ module Hornetseye
       #
       # @private
       def descriptor( hash )
-        if dimension == 1
-          "Sequence(#{typecode.descriptor( hash )},#{num_elements.to_s})"
+        if element_type and num_elements
+          if dimension == 1
+            "Sequence(#{typecode.descriptor( hash )},#{num_elements.to_s})"
+          else
+            "MultiArray(#{typecode.descriptor( hash )},#{shape.join ','})"
+          end
         else
-          "MultiArray(#{typecode.descriptor( hash )},#{shape.join ','})"
+          'MultiArray(?,?)'
         end
       end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +01:00
+date: 2010-10-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency