ntable 0.1.4 → 0.1.5

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.1.5 / 2012-09-24
+
+* INCOMPATIBLE CHANGE: Renamed :postprocess option in NTable.from_nested_object to :postprocess_labels.
+* NTable.from_nested_object learned :postprocess_range, which postprocesses a range for an IndexedAxis.
+* NTable.from_nested_object raised NoSuchCellError if you used :postprocess_label to remove a label accessed in the data. Now the data is just thrown away silently.
+* Calling decompose on a "shared" table (i.e. a slice previously obtained from decompose or shared_slice) yielded the wrong table. (The offset into the original table was incorrect.) Fixed.
+* Implemented a slightly nicer inspect for each type.
+
 === 0.1.4 / 2012-09-24
 
 * NTable::Structure and NTable::AxisInfo are now Enumerable, letting you iterate over the axes and labels, respectively.

data/Version

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/ntable/construction.rb

@@ -119,13 +119,25 @@ module NTable
     #   proc is provided, the resulting axis will be a LabeledAxis.
     #   You can also pass true instead of a Proc; this will create an
     #   LabeledAxis and make the conversion a simple to_s.
-    # [<tt>:postprocess</tt>]
-    #   An optional Proc that postprocesses the final labels array.
-    #   It should take an array of labels and return a modified array
-    #   (which can be the original array modified in place). Called
-    #   after any sort has been completed.
+    # [<tt>:postprocess_labels</tt>]
+    #   An optional Proc that postprocesses the final labels array, if
+    #   a LabeledAxis or an ObjectAxis is being generated.
+    #   It should take an array of labels and return the desired array.
+    #   You may modify the array in place and return the original.
+    #   This is called after any sort has been completed.
     #   You can use this, for example, to "fill in" labels that were
     #   not present in the original data.
+    #   WARNING: if you remove labels from the array, any data in those
+    #   locations will silently be lost.
+    # [<tt>:postprocess_range</tt>]
+    #   An optional Proc that postprocesses the final integer range, if
+    #   an IndexedAxis is being generated.
+    #   It should take a Range of integer as an argument, and return
+    #   either the original or a different Range.
+    #   You can use this, for example, to extend the range of this axis
+    #   beyond that for which data exists.
+    #   WARNING: if you remove values from the range, any data in those
+    #   locations will silently be lost.
     #
     # The third argument is an optional hash of miscellaneous options.
     # The following keys are recognized:
@@ -195,11 +207,17 @@ module NTable
             end
             labels_.sort!(&func_)
           end
-          postprocess_ = field_[:postprocess]
-          labels_ = postprocess_.call(labels_) if postprocess_.respond_to?(:call)
+          postprocess_ = field_[:postprocess_labels]
+          labels_ = postprocess_.call(labels_) || labels_ if postprocess_.respond_to?(:call)
           axis_ = klass_.new(labels_)
         when ::Array
-          axis_ = IndexedAxis.new(ai_[1].to_i - ai_[0].to_i, ai_[0].to_i)
+          range_ = ((ai_[0].to_i)...(ai_[1].to_i))
+          postprocess_ = field_[:postprocess_range]
+          range_ = postprocess_.call(range_) || range_ if postprocess_.respond_to?(:call)
+          ai_[0] = range_.first.to_i
+          ai_[1] = range_.last.to_i
+          ai_[1] += 1 unless range_.exclude_end?
+          axis_ = IndexedAxis.new(ai_[1] - ai_[0], ai_[0])
         end
         struct_.add(axis_, name_) if axis_
       end
@@ -250,7 +268,10 @@ module NTable
 
     def _populate_nested_values(table_, path_, axis_data_, obj_)  # :nodoc:
       if path_.size == table_.dim
-        table_.set!(*path_, obj_)
+        begin
+          table_.set!(*path_, obj_)
+        rescue NoSuchCellError
+        end
       else
         case obj_
         when ::Hash

data/lib/ntable/structure.rb

@@ -75,6 +75,14 @@ module NTable
       end
 
 
+      # Basic output.
+
+      def inspect
+        "#<#{self.class}:0x#{object_id.to_s(16)} #{@axis_name}:#{@axis_object.class.name.sub('NTable::', '')}>"
+      end
+      alias_method :to_s, :inspect
+
+
       # The underlying axis implementation
       attr_reader :axis_object
 
@@ -178,6 +186,14 @@ module NTable
       end
 
 
+      # Basic output.
+
+      def inspect
+        "#<#{self.class}:0x#{object_id.to_s(16)} #{coord_array.inspect}>"
+      end
+      alias_method :to_s, :inspect
+
+
       # Standard equality check
 
       def eql?(obj_)
@@ -280,6 +296,15 @@ module NTable
     end
 
 
+    # Basic output.
+
+    def inspect
+      axes_ = @indexes.map{ |a_| "#{a_.axis_name}:#{a_.axis_object.class.name.sub('NTable::', '')}" }
+      "#<#{self.class}:0x#{object_id.to_s(16)} #{axes_.join(', ')}#{@parent ? ' (sub)' : ''}>"
+    end
+    alias_method :to_s, :inspect
+
+
     # Returns true if the two structures are equivalent, both in the
     # axes and in the parentage. The structure of a shared slice is not
     # equivalent, in this sense, to the "same" structure created from

data/lib/ntable/table.rb

@@ -84,6 +84,15 @@ module NTable
     end
 
 
+    # Basic output.
+
+    def inspect
+      axes_ = @structure.all_axes.map{ |a_| "#{a_.axis_name}:#{a_.axis_object.class.name.sub('NTable::', '')}" }
+      "#<#{self.class}:0x#{object_id.to_s(16)} #{axes_.join(', ')}#{@parent ? ' (sub)' : ''} #{@vals.inspect}>"
+    end
+    alias_method :to_s, :inspect
+
+
     # Returns true if the two tables are equivalent, both in the data
     # and in the parentage. The structure of a shared slice is not
     # equivalent, in this sense, to the "same" table created from
@@ -525,7 +534,7 @@ module NTable
       vec_ = ::Array.new(outer_struct_.dim, 0)
       tables_ = (0...outer_struct_.size).map do |i_|
         t_ = Table.new(inner_struct_, :acquire => @vals,
-          :offset => outer_struct_._compute_offset_for_vector(vec_),
+          :offset => @offset + outer_struct_._compute_offset_for_vector(vec_),
           :parent => self)
         outer_struct_._inc_vector(vec_)
         t_

data/test/tc_decompose.rb

@@ -98,6 +98,13 @@ module NTable
       end
 
 
+      def test_decompose_after_decompose
+        t1_ = Table.new(@structure_2d, :load => (2..21).to_a)
+        t2_ = t1_.decompose([1]).get(2).decompose([0]).get
+        assert_equal(Table.new(@structure_row, :load => [4, 5]), t2_)
+      end
+
+
     end
 
   end

data/test/tc_nested_object.rb

@@ -140,6 +140,14 @@ module NTable
       end
 
 
+      def test_from_level_1_start_1_indexed_with_postprocess
+        obj_ = (1..12).to_a
+        t1_ = Table.from_nested_object(obj_,
+          [{:postprocess_range => ->(r_){ (1..10) }}])
+        assert_equal(Table.new(Structure.add(@indexed_axis_10), :load => (2..11).to_a), t1_)
+      end
+
+
       def test_from_level_2_indexed
         obj_ = [[nil, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], []]
         t1_ = Table.from_nested_object(obj_)
@@ -219,7 +227,7 @@ module NTable
       def test_from_level_1_labeled_with_objectify_and_postprocess
         obj_ = {:one => 1, :two => 2}
         t1_ = Table.from_nested_object(obj_,
-          [{:sort => true, :objectify => true, :postprocess => ->(labels_){ labels_ << :three }}],
+          [{:sort => true, :objectify => true, :postprocess_labels => ->(labels_){ labels_ << :three }}],
           :fill => 0)
         assert_equal(Table.new(Structure.add(@object_axis_3), :load => [1,2,0]), t1_)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors: