object_table 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456118e9dd3562463800a5598c5155868025e8ff
-  data.tar.gz: c5a2853e7d278c7f8a910a8f0416d7773a90fad7
+  metadata.gz: fcf93afcb7a81c3a9fb40c8ffc7d8b1bd506c845
+  data.tar.gz: 9d6a155f502215a3f57639108bfe908ea4e853f8
 SHA512:
-  metadata.gz: 15fd49613ca84147fdccf70b7dfd8ec95432960bac7a3835cbca0a52e2de73743bdda7c2b050a61714172a8a21644c66e29ba50f5a2ccb8b8e1eadb1a78a0d0a
-  data.tar.gz: 965062babf9d465060d58e769968c11304b6982569c41aad05d6e7a62ce5a8a30ce66260e102ebb01f5154319887ec6a30d521947e1c6bb24ee57514de7b6591
+  metadata.gz: 0a4a23f3e527ee524e2d528637ed939caaa0e48bde230df277cfaccbb50a4f62824081be6990fd3307cc5108f485066ecb05f2d79563999b6365154ab04151e7
+  data.tar.gz: b23605bf82b78fb04fce0a4f0f4a8f6e049a2f3b15fbf3c9ee2029f71370f9b0fc2e064269edbe7bbb110cfa6a79ca8d3acfb2450292efe36df34a0c4676a23e

data/lib/object_table/grouped.rb

@@ -14,9 +14,9 @@ class ObjectTable::Grouped
 
   def _groups
     names, keys = _keys()
-    groups = (0...@parent.nrows).zip(keys).group_by{|row, key| key}
+    groups = keys.length.times.group_by{|i| keys[i]}
     groups.each do |k, v|
-      groups[k] = NArray.to_na(v.map(&:first))
+      groups[k] = NArray.to_na(v)
     end
     [names, groups]
   end
@@ -36,23 +36,24 @@ class ObjectTable::Grouped
     [names, keys]
   end
 
-  %w{ all? any? collect collect_concat count flat_map map none? one? }.each do |method|
-    define_method(method) do |*args, &block|
-      names, groups = _groups()
-      groups.send(method, *args) do |k, v|
+  def each(&block)
+    names, groups = _groups()
+    if block
+      groups.each do |k, v|
         keys = names.zip(k)
         __group_cls__.new(@parent, Hash[keys], v).apply &block
       end
+      return @parent
     end
-  end
 
-  def each(&block)
-    names, groups = _groups()
-    groups.each do |k, v|
-      keys = names.zip(k)
-      __group_cls__.new(@parent, Hash[keys], v).apply &block
+    Enumerator.new(groups.length) do |y|
+      groups.each do |k, v|
+        keys = names.zip(k)
+        y.yield __group_cls__.new(@parent, Hash[keys], v)
+      end
+      @parent
     end
-    @parent
+
   end
 
   def apply(&block)

data/lib/object_table/version.rb

@@ -1,3 +1,3 @@
 class ObjectTable
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/object_table/view.rb

@@ -27,8 +27,7 @@ class ObjectTable::View
   end
 
   def clone
-    cols = ObjectTable::BasicGrid[@parent.columns.map{|k, v| [k, v[indices]]}]
-    __table_cls__.new(cols)
+    __table_cls__.new(columns)
   end
 
   def inspect(*args)

data/lib/object_table.rb

@@ -46,6 +46,7 @@ class ObjectTable
       raise 'Mismatch in column names' unless (colnames | x.keys) == (colnames & x.keys)
 
       x.each do |k, v|
+        v = v.to_a if v.is_a?(Range)
         new_values[k].push NArray.to_na(v)
       end
     end
@@ -53,7 +54,6 @@ class ObjectTable
     return self if new_values.empty?
     new_rows = new_values.values.first.map{|x| x.shape[-1]}.reduce(:+)
     return self unless (new_rows and new_rows != 0)
-    new_rows += nrows
 
     new_values.each do |k, v|
       @columns[k] = @columns[k].stack(*v)
@@ -89,35 +89,36 @@ class ObjectTable
     type = (options[:type] || 'inner')
     key = [key] unless key.is_a?(Array)
 
+    right_cols = other.colnames - key
+    left_cols = colnames
+
     lkeys = key.map{|k| get_column(k).to_a}.transpose
     rkeys = key.map{|k| other[k].to_a}.transpose
 
-    rgroups = rkeys.each_with_index.group_by(&:first)
-    rgroups.each{|k, v| rgroups[k] = v.transpose[-1]}
-
+    rgroups = rkeys.length.times.group_by{|i| rkeys[i]}
     rindex = rgroups.values_at(*lkeys)
-    lindex = lkeys.each_with_index.zip(rindex).flat_map{|(k, i), r| [i] * r.length if r}
-    lindex.compact!
-
-    right_cols = other.colnames - key
-    left_cols = colnames
 
     if type == 'left' or type == 'outer'
-      lmissing = NArray.to_na(rindex.map{|x| x ? 0 : 1}).where.to_a
+      common, lmissing = rindex.each_with_index.partition(&:first)
+      lmissing = lmissing.transpose[-1]
+      lindex = common.flat_map{|r, i| [i] * r.length}
+      rindex.flatten!.compact!
+
       lindex += lmissing
       rindex += [-1] * lmissing.length
+    else
+      lindex = rindex.each_with_index.flat_map{|r, i| [i] * r.length if r}.compact
+      rindex.flatten!.compact!
     end
 
+
     if type == 'right' or type == 'outer'
       left_cols -= key
-      rmissing = rgroups.values - rindex
-      rmissing.flatten!
+      rmissing = (0...other.nrows).to_a - rindex
       lindex += [-1] * rmissing.length
       rindex += rmissing
     end
 
-    rindex.flatten!.compact!
-
     lindex = NArray.to_na(lindex)
     rindex = NArray.to_na(rindex)
     lblank = lindex.eq(-1)

data/spec/object_table/grouped_spec.rb

@@ -161,6 +161,21 @@ describe ObjectTable::Grouped do
 
       expect(keys).to match_array(correct_keys)
     end
+
+    context 'with no block' do
+      it 'should return an enumerator' do
+        expect(grouped.each).to be_a Enumerator
+      end
+
+      it 'should enumerate the groups' do
+        groups = [even_group, odd_group]
+        grouped.each.each do |group|
+          expect(groups).to include group
+          groups -= [group]
+        end
+      end
+
+    end
   end
 
   describe '#apply' do
@@ -236,54 +251,4 @@ describe ObjectTable::Grouped do
     end
   end
 
-  describe 'enumerators' do
-    shared_examples 'enumerator method' do |method, *args, block, _expected|
-      let(:expected){ _expected }
-
-      describe "##{method}" do
-
-        it 'should work with a block without args' do
-          result = grouped.send(method, *args){ block.call(self) }
-          if result.is_a? Array
-            expect(result).to match_array expected
-          else
-            expect(result).to eql expected
-          end
-        end
-
-        it 'should work with a block with args' do
-          result = grouped.send(method, *args, &block)
-          if result.is_a? Array
-            expect(result).to match_array expected
-          else
-            expect(result).to eql expected
-          end
-        end
-
-      end
-
-    end
-
-    it_behaves_like 'enumerator method', 'all?', lambda{|grp| grp.col1[0] == 1}, false
-    it_behaves_like 'enumerator method', 'any?', lambda{|grp| grp.col1[0] == 1}, true
-
-    it_behaves_like 'enumerator method', 'collect', lambda{|grp| grp.nrows} do
-      let(:expected){ [even.length, odd.length] }
-    end
-    it_behaves_like 'enumerator method', 'map', lambda{|grp| grp.nrows} do
-      let(:expected){ [even.length, odd.length] }
-    end
-
-    it_behaves_like 'enumerator method', 'collect_concat', lambda{|grp| grp.col1.to_a} do
-      let(:expected){ table.col1 }
-    end
-    it_behaves_like 'enumerator method', 'flat_map', lambda{|grp| grp.col1.to_a} do
-      let(:expected){ table.col1 }
-    end
-
-    it_behaves_like 'enumerator method', 'count', lambda{|grp| grp.col1[0] == 1}, 1
-    it_behaves_like 'enumerator method', 'none?', lambda{|grp| grp.col1[0] > 100}, true
-    it_behaves_like 'enumerator method', 'one?', lambda{|grp| grp.col1[0] < 100}, false
-  end
-
 end

data/spec/object_table_spec.rb

@@ -218,7 +218,7 @@ describe ObjectTable do
         ObjectTable.new(col1: [1, 2, 3], col2: 5),
         ObjectTable.new(col1: 10, col2: 50),
         ObjectTable.new(col2: [10, 30], col1: 15).where{col2.eq 10},
-        ObjectTable::BasicGrid[col2: [1, 2], col1: [3, 4]],
+        ObjectTable::BasicGrid[col2: [1, 2], col1: 3..4],
       ]
     end
 

data/spec/support/object_table_example.rb

@@ -345,7 +345,7 @@ EOS
     end
   end
 
-  describe '.clone' do
+  describe '#clone' do
     let(:table){ ObjectTable.new(col1: [1, 2, 3], col2: 5) }
     let(:clone){ subject.clone }
 
@@ -360,10 +360,18 @@ EOS
 
     it 'should have cloned columns' do
       subject.columns.each do |k, v|
-        expect(clone.columns[k].to_a).to eql v.to_a
+        expect(clone.columns[k]).to eq v
         expect(clone.columns[k]).to_not be v
       end
     end
+
+    context 'with matrixy columns' do
+      let(:table){ ObjectTable.new(col1: [1, 2, 3], col2: NArray.float(10, 3).random!) }
+
+      it 'should be equivalent to the original table' do
+        expect(clone).to eql subject
+      end
+    end
   end
 
   describe '#sort_by' do

data/spec/support/view_example.rb

@@ -110,7 +110,7 @@ RSpec.shared_examples 'a table view' do |cls|
       end
 
       context 'with an NArray' do
-        let(:value){ NArray.int(3, 4, view.nrows).random! }
+        let(:value){ NArray.float(3, 4, view.nrows).random! }
 
         it 'should use the narray parameters' do
           subject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_table
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Cheney Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray