object_table 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b283bc238922ed7b80fc82225cbb758c6a0bf44
-  data.tar.gz: 144b36aec60ae08d7ef391351dc6ec5e14d4c33c
+  metadata.gz: f10d601ed67075300f3995f95c7a1306f88bc5fd
+  data.tar.gz: 5f34487c7a30211f6c136a414eb95c7efc117417
 SHA512:
-  metadata.gz: 4ae62ff61696c06ab3c4edd2974dc68cd4508de97388a0194d347865c2f617a3cd1694f87f6afdaa6cafd4fadca011e131cebf2f09925e6ea46de959b5eab2ea
-  data.tar.gz: 38110c1fc518f9d8bc5d0ab4b964eab0a266fb94641ee71c636510bcd1ab710901f9af64c61a677800e4617ac993e74610e69e3eff704079e503d38e499e72ad
+  metadata.gz: ec0065ab83ec9d73a40cfab503b573af4ccee8b39909195a6ead7b769716f1bd7ffbb6aea6b8167aecbcf697a867999c8332762c6dcd201628d99b4e5cd48f03
+  data.tar.gz: f2d06e95a91c37418b62f96abe5e69d4d5bbadf53ea0a32b7b15d7a243bd620fad6eb23ca1cd129c103613d57cd9fff7b6a284647f1bdc211928d1152452715d

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0

data/lib/object_table/column.rb

@@ -13,11 +13,18 @@ module ObjectTable::Column
     end
   end
 
+
   def self.stack(*columns)
     columns = columns.reject(&:empty?)
     return NArray[] if columns.empty?
     return columns[0].clone if columns.length == 1
 
+    if columns.map{|x| x.shape}.uniq.length == 1
+      new_col = NArray.to_na(columns)
+      new_col = new_col.reshape(*new_col.shape[0...-2], new_col.shape[-2] * new_col.shape[-1])
+      return new_col
+    end
+
     new_rows = columns.map{|x| x.shape[-1]}.reduce(:+)
     first_col = columns.first
     new_col = NArray.new(first_col.typecode, *first_col.shape[0...-1], new_rows)

data/lib/object_table/masked_column.rb

@@ -40,6 +40,7 @@ class ObjectTable::MaskedColumn < NArray
   end
 
   def clone
+    return NArray.new(typecode, 0) if empty?
     NArray.cast(self).clone
   end
 

data/lib/object_table/stacker.rb

@@ -28,10 +28,6 @@ module ObjectTable::Stacker
       if segments.all?{|seg| seg.is_a? Array}
         column = NArray.to_na(segments.flatten(1))
 
-      elsif segments.all?{|seg| seg.is_a? NArray} and segments.map{|seg| seg.shape}.uniq.length == 1
-        column = NArray.to_na(segments)
-        column = column.reshape(*column.shape[0...-2], column.shape[-2] * column.shape[-1])
-
       else
         segments.map!{|seg| NArray.to_na seg}
         column = ObjectTable::Column.stack(*segments)

data/lib/object_table/version.rb

@@ -1,3 +1,3 @@
 class ObjectTable
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/object_table/view.rb

@@ -19,7 +19,11 @@ class ObjectTable::View
   end
 
   def clone
-    cols = ObjectTable::BasicGrid[@parent.columns.map{|k, v| [k, v[false, indices]]}]
+    if nrows == 0
+      cols = @parent.columns.map{|k, v| [k, NArray.new(v.typecode, 0)]}
+    else
+      cols = @parent.columns.map{|k, v| [k, v[false, indices]]}
+    end
     __table_cls__.new(cols)
   end
 

data/spec/object_table/column_spec.rb

@@ -70,6 +70,24 @@ describe ObjectTable::Column do
       end
     end
 
+    context 'when arguments all have the same dimensions' do
+      let(:columns) do
+        [
+          NArray.float(10, 20, 30).random!,
+          NArray.float(10, 20, 30).random!,
+          NArray.float(10, 20, 30).random!,
+          NArray.float(10, 20, 30).random!,
+        ]
+      end
+
+      it 'should stack them' do
+        expect(subject[false, 0...30]).to eq columns[0]
+        expect(subject[false, 30...60]).to eq columns[1]
+        expect(subject[false, 60...90]).to eq columns[2]
+        expect(subject[false, 90...120]).to eq columns[3]
+      end
+    end
+
   end
 
 end

data/spec/object_table/masked_column_spec.rb

@@ -169,6 +169,22 @@ describe ObjectTable::MaskedColumn do
     it 'should clone the data' do
       expect(clone.to_a).to eql subject.to_a
     end
+
+    context 'with an empty mask' do
+      let(:indices) { NArray[] }
+
+      it 'should clone the data' do
+        expect(clone.to_a).to eql subject.to_a
+      end
+
+      context 'with an empty parent' do
+        let(:parent) { NArray[] }
+
+        it 'should clone the data' do
+          expect(clone.to_a).to eql subject.to_a
+        end
+      end
+    end
   end
 
   describe 'operations' do

data/spec/support/view_example.rb

@@ -242,6 +242,31 @@ RSpec.shared_examples 'a table view' do |cls|
         expect(v).to_not be_a ObjectTable::MaskedColumn
       end
     end
+
+    context 'with an empty view' do
+      let(:block) { Proc.new{col1 > col1.max} }
+
+      it 'should clone the view' do
+        expect(clone).to eql subject
+        clone.columns.each do |k, v|
+          expect(v).to be_a NArray
+          expect(v).to_not be_a ObjectTable::MaskedColumn
+        end
+      end
+
+      context 'with an empty parent' do
+        let(:table) { ObjectTable.new(col1: [], col2: []) }
+
+        it 'should clone the view' do
+          expect(clone).to eql subject
+          clone.columns.each do |k, v|
+            expect(v).to be_a NArray
+            expect(v).to_not be_a ObjectTable::MaskedColumn
+          end
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_table
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Cheney Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray