daru 0.0.2.1 → 0.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1106a4a4200cc9b58f8979f7e5c84549f88acf7
-  data.tar.gz: c57bc9be84f3821f2327a78d20619818da750b9e
+  metadata.gz: 6266fb09be80748530baa8b92aface148f47bac6
+  data.tar.gz: 37f2301d6b3fed23b15e11c5608892935befb04e
 SHA512:
-  metadata.gz: de39382a8aa349a97fdac79b9df6540a752095194adbae9a72a901401276d3ac9a200f658ce1c5af08936cefad2647494632e306710a7e1db7ed0f4827699b38
-  data.tar.gz: 8a8a1abb43f9f1d7b6fa0b524572f6a32a01e71462c12e7247189c207872db2b5b1af0f75693410af74cc314148de673ae4b32d8870518829358766d45b86668
+  metadata.gz: fa67c4506dea445619c1cf79270c5194cd189da302705b8d0dcad6689b3c3717f08bc11ce15af9670c7245fc746b3ce8feb0e82ea22c69aa06bf8da15003f947
+  data.tar.gz: 17d35384cf2daf28eca33aef370789edf7854da821094207e3eda9732933889ce23a44777e9aa451e62c732048a472d74378affb97e1a193cfe235426d83428e

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    daru (0.0.2)
+    daru (0.0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -31,7 +31,8 @@ Then switch to MRI, do a normal `bundle install` followed by `rspec` for testing
 
 ## Roadmap
 
-* Integration with IRuby
+* Print dataframe in same order as fields.
+* Return rows in same order as that of fields.
 * Automate testing for both MRI and JRuby.
 * Enable creation of DataFrame by only specifying an NMatrix/MDArray in initialize. Vector naming happens automatically (alphabetic) or is specified in an Array.
 * Add support for missing values in vectors.
@@ -43,3 +44,11 @@ Then switch to MRI, do a normal `bundle install` followed by `rspec` for testing
     - Creation of correlation, covariance matrices
     - Verification of data in a vector
     - Basic vector statistics - mean, median, variance, etc.
+* Add indexing on vectors.
+    - Creation of vector by supplying an index-value hash.
+    - Auto generation of real numbered indices for any vector.
+    - Ability to separately specify index for each element of a vector.
+    - Runtime alteration of index.
+* Indexing on DataFrame.
+* Vector arithmetic - elementwise addition, subtraction, multiplication, division.
+* Transpose a dataframe.

data/lib/daru/dataframe.rb

@@ -66,8 +66,24 @@ module Daru
       
     # end
 
-    def [](name)
-      column name
+    def [](*name)
+      unless name[1]
+        return column(name[0])
+      end
+
+      h = {}
+      req_fields = @fields & name
+
+      req_fields.each do |f|
+        h[f] = @vectors[f]
+      end
+
+      DataFrame.new h, req_fields, @name
+    end
+
+    def ==(other)
+      @name == other.name and @vectors == other.vectors and 
+      @size == other.size and @fields  == other.fields 
     end
 
     def []=(name, vector)
@@ -90,21 +106,35 @@ module Daru
     end
 
     def each_row
-      0.upto(@size) do |index|
+      0.upto(@size-1) do |index|
         yield row(index)
       end
+
+      self
     end
 
     def each_row_with_index
-      0.upto(@size) do |index|
+      0.upto(@size-1) do |index|
         yield row(index), index
       end
+
+      self
     end
 
     def each_column
-      @vectors.values.each do |column|
-        yield column
+      @fields.each do |field|
+        yield @vectors[field]
       end
+
+      self
+    end
+
+    def each_column_with_name
+      @fields.each do |field|
+        yield @vectors[field], field
+      end
+
+      self
     end
 
     def insert_vector name, vector
@@ -127,6 +157,10 @@ module Daru
     def to_html(threshold=15)
       html = '<table>'
 
+      html += '<tr>'
+      @fields.each { |f| html.concat('<td>' + f.to_s + '</td>') }
+      html += '</tr>'
+
       self.each_row_with_index do |row, index|
         break if index > threshold and index <= @size
         html += '<tr>'

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Daru
-  VERSION = "0.0.2.1"
+  VERSION = "0.0.2.2"
 end

data/spec/mri/dataframe_spec.rb

@@ -5,7 +5,8 @@ describe Daru::DataFrame do
     
     before :each do
       @df = Daru::DataFrame.new({a: Daru::Vector.new(1..3), 
-        b: (50..52).daru_vector, b_bad: ['Jesse', 'Walter', 'Hank'].daru_vector})
+        b: (50..52).daru_vector, b_bad: ['Jesse', 'Walter', 'Hank'].daru_vector}, 
+        [:b_bad, :a, :b], :muddler)
 
       @vector = Daru::Vector.new 1..3, :a
     end
@@ -35,14 +36,18 @@ describe Daru::DataFrame do
     it "returns a row" do
       r = @df.row 0
 
-      expect(r).to eq([1,50,'Jesse'])
+      expect(r).to eq(['Jesse',1,50])
     end
 
-    it "iterates over columns" do
-      @df.each_column do |col|
+    it "iterates over columns in the specified order" do
+      cols = []
+      df = @df.each_column do |col|
         expect(col.is_a?(Daru::Vector)).to be(true)
-        expect([:a, :b, :b_bad].include? col.name).to be(true)
+        cols << col.name
       end
+
+      expect(cols).to eq([:b_bad, :a, :b])
+      expect(df).to eq(@df)
     end
 
     it "iterates over rows" do
@@ -52,7 +57,7 @@ describe Daru::DataFrame do
     end
 
     it "shows column fields" do
-      expect(@df.fields).to eq([:a, :b, :b_bad])
+      expect(@df.fields).to eq([:b_bad, :a, :b])
     end
 
     it "inserts a new vector" do
@@ -62,7 +67,7 @@ describe Daru::DataFrame do
     end
 
     it "inserts a new row" do
-      @df.insert_row [6,6,"Fred"]
+      @df.insert_row ["Fred",6, 6]
 
       expect(@df.a.vector)    .to eq([1,2,3,6])
       expect(@df.b.vector)    .to eq([50,51,52,6])
@@ -78,6 +83,13 @@ describe Daru::DataFrame do
 
       expect(@df.fields.include? :a).to be(false)
     end
+
+    it "returns a DataFrame of requested fields" do
+      req = @df = Daru::DataFrame.new({a: Daru::Vector.new(1..3), 
+        b: (50..52).daru_vector}, [:a, :b], :muddler)
+
+      expect(@df[:a, :b]).to eq(req)
+    end
   end
 
   context "DataFrame loads from files" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daru
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors:
 - Sameer Deshmukh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile