object_table 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f7e1642a2f1f8106f32e3b04f8cfebf8676d52
-  data.tar.gz: 0986af221eab29e6654f511cebd5534962d82412
+  metadata.gz: acf152a47e8843f2a66b5fea50a40ec7ccb50041
+  data.tar.gz: df4ce84293c425fced73a2f26eeb6970375b199e
 SHA512:
-  metadata.gz: d8ee1c4350da59156c2f17e23431969d126a5f8bac0a21348d048fb18486c765d1fe6f4f551a53ef18e03a9642e0704da93e997bb16c2d700003f5cde4f64079
-  data.tar.gz: d15636d515d1d5439f5233e58738b5ffdb273a4df77000a4fbdc5ba6ff5018e16e382eb487c6aa0d27e6a9b390e1d6b551a3010ca843123a227c4ccbdee0278d
+  metadata.gz: d5a47eb7cf71b2d4408d84b8b46d39b2d12a029e126c80f339cbdfd4741c045d472cc3d4a6167340a5e916b79e35f0870fc6bee2f9ebc476161fd5b5e5edddfa
+  data.tar.gz: 317c8402da17a577095f500f29e029495809ec7a1c95571d6adbfc464b8d64125347ef56ec4cb898313a458077dc148dd677cba02fe91ad915b7f5a08d8b2a7e

data/lib/object_table/masked_column.rb

@@ -23,18 +23,11 @@ class ObjectTable::MaskedColumn < NArray
     column
   end
 
-  def []=(*keys, value)
-    unless parent.nil? or ((value.is_a?(Array) or value.is_a?(NArray)) and value.empty?)
-      parent[false, indices[*keys]] = value
-    end
-    super
-  end
-
 #   make destructive methods affect parent
-  %w{ fill! indgen! indgen random! map! collect! conj! imag= mod! add! div! sbt! mul! }.each do |op|
+  %w{ []= fill! indgen! indgen random! map! collect! conj! imag= mod! add! div! sbt! mul! }.each do |op|
     define_method(op) do |*args, &block|
       result = super(*args, &block)
-      parent[false, indices] = result if parent
+      parent[false, indices] = self if parent
       result
     end
   end

data/lib/object_table/version.rb

@@ -1,3 +1,3 @@
 class ObjectTable
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/object_table/masked_column_spec.rb

@@ -8,15 +8,15 @@ shared_examples 'a NArray' do |operator, options={}|
   let(:x){ ObjectTable::MaskedColumn.mask(x_na, indices) }
   let(:y){ ObjectTable::MaskedColumn.mask(y_na, indices) }
 
-  let(:x_na){ NArray.to_na((0..10).to_a) }
-  let(:y_na){ NArray.to_na((5..15).to_a) }
+  let(:x_na){ (NArray.float(10, 20).random * 10).to_i + 1 }
+  let(:y_na){ (NArray.float(10, 20).random * 10).to_i + 1 }
 
   if unary
     subject{ x.send(operator) }
-    let(:expected_result){ x_na[indices].send(operator) }
+    let(:expected_result){ x_na[false, indices].send(operator) }
   else
     subject{ x.send(operator, y) }
-    let(:expected_result){ x_na.send(operator, y_na)[indices] }
+    let(:expected_result){ x_na.send(operator, y_na)[false, indices] }
   end
 
   describe "#{operator}" do
@@ -36,16 +36,16 @@ end
 
 describe ObjectTable::MaskedColumn do
 
-  let(:parent)    { NArray.float(10).random! }
+  let(:parent)    { NArray.float(10, 10).random! }
   let(:indices)   { NArray[1, 3, 4, 6] }
-  let(:other_indices) { NArray.to_na((0...parent.length).to_a - indices.to_a) }
+  let(:other_indices) { NArray.to_na((0...parent.shape[-1]).to_a - indices.to_a) }
   let(:masked)    { ObjectTable::MaskedColumn.mask(parent, indices) }
 
   subject{ masked }
 
   describe '.mask' do
     it 'should mask the parent' do
-      expect(subject.to_a).to eql parent[indices].to_a
+      expect(subject.to_a).to eql parent[false, indices].to_a
     end
 
     it 'should set the parent' do
@@ -78,35 +78,49 @@ describe ObjectTable::MaskedColumn do
 
 
   shared_examples '#[]=' do |slice|
-    let(:value) { 1000 }
-    let!(:original){ parent.clone }
-    let(:slice){ slice }
+    let(:value)     { 1000 }
+    let!(:original) { parent.clone }
+    #let(:slice)     { slice }
 
-    context "slicing with a #{slice.class}" do
+    context "slicing with a #{slice[-1].class}" do
 
       it "should modify the parent" do
-        subject[slice] = value
-        expect(parent[indices].to_a).to eql subject.to_a
-        expect(parent[other_indices].to_a).to eql original[other_indices].to_a
+        subject[*slice] = value
+        expect(parent[false, indices].to_a).to eql subject.to_a
+        expect(parent[false, other_indices].to_a).to eql original[false, other_indices].to_a
       end
 
       context 'without a parent' do
-        subject{ ObjectTable::MaskedColumn[1, 2, 3, 4] }
+        subject{ ObjectTable::MaskedColumn.to_na(parent[false, indices]) }
 
         it 'should still work' do
-          expect{subject[slice] = value}.to_not raise_error
+          expect{subject[*slice] = value}.to_not raise_error
         end
       end
 
     end
   end
 
-  include_examples '#[]=', 0
-  include_examples '#[]=', NArray.cast([1, 0, 0, 1], 'byte')
-  include_examples '#[]=', 1...4
-  include_examples '#[]=', [0, 2]
-  include_examples '#[]=', true
-  include_examples '#[]=', nil
+  context 'with a vector' do
+    let(:parent)    { NArray.float(10).random }
+    include_examples '#[]=', [0]
+    include_examples '#[]=', [NArray.cast([1, 0, 0, 1], 'byte')]
+    include_examples '#[]=', [1...4]
+    include_examples '#[]=', [[0, 2]]
+    include_examples '#[]=', [true]
+    include_examples '#[]=', [nil]
+  end
+
+  context 'when multi dimensional' do
+    let(:parent)  { NArray.float(10, 20).random }
+    include_examples '#[]=', [0]
+    include_examples '#[]=', [nil]
+    include_examples '#[]=', [true]
+    include_examples '#[]=', [0, 0]
+    include_examples '#[]=', [0, 1...4]
+    include_examples '#[]=', [0, [0, 2]]
+    include_examples '#[]=', [0, NArray.cast([1, 0, 0, 1], 'byte')]
+  end
 
 
   shared_examples 'destructive methods' do |method, *args|
@@ -122,12 +136,12 @@ describe ObjectTable::MaskedColumn do
 
     it "#{method} should affect the parent" do
       perform
-      expect(parent[indices].to_a).to eql subject.to_a
-      expect(parent[other_indices].to_a).to eql original[other_indices].to_a
+      expect(parent[false, indices].to_a).to eql subject.to_a
+      expect(parent[false, other_indices].to_a).to eql original[false, other_indices].to_a
     end
 
     context 'without a parent' do
-      subject{ ObjectTable::MaskedColumn[1, 2, 3, 4] }
+      subject{ ObjectTable::MaskedColumn.to_na(parent[false, indices]) }
 
       it "#{method} should still work" do
         expect{perform}.to_not raise_error

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: object_table
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Cheney Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Simple data table table implementation in ruby
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -136,12 +136,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []