jsvd-sequel_vectorized 0.0.3 → 0.0.5

data/ChangeLog

@@ -1,3 +1,13 @@
+== 0.0.5 / 2009-06-04
+
+* Axis range is now a ruby Range
+* Proper creation of data vectors if end of range is excluded or not
+
+== 0.0.4 / 2009-06-04
+
+* Now returns empty hash if result set is empty even if axis is passed
+* Added original data and raw mask to data array
+
 == 0.0.3 / 2009-01-28
 
 * No longer has module Sequel::Plugins::Vectorized

data/lib/sequel_vectorized.rb

@@ -1,12 +1,16 @@
 require 'narray'
+require 'gsl'
 
 class Sequel::Dataset
-  def vectorize 
+  def vectorize options={}
 
     result = {}
+    axis = (options[:axis] ||= {})
 
     # transform dataset to hash of arrays
-    map {|row| row.each{|att,value| (result[att] ||= []) << value}}
+    dataset = filter(axis[:column] => axis[:range])
+
+    dataset.map {|row| row.each{|att,value| (result[att] ||= []) << value}}
 
     # transform numeric and boolean arrays to narrays
     result.each do |k,v|
@@ -24,6 +28,67 @@ class Sequel::Dataset
         result[k][] = v.map {|i| (i == true) ? 1 : 0 }
 
       end
+
+    end
+
+    # add dot notation
+    columns.each do |col|
+      result.instance_eval %Q{def #{col}; self[:#{col}]; end}
+    end
+
+    if (axis.empty? || result.empty?) then
+      result
+    else
+      _process(result, axis)
     end
+
   end
+
+  private
+  def _process data, axis
+    axis_col = axis[:column]
+    step = axis[:step]
+    range = axis[:range]
+    interpolate = axis[:interpolate]
+
+    new_size = (range.last - range.first)/step.to_f
+    new_size +=1 unless range.exclude_end?
+    raw_axis = data[axis_col]
+    data["__#{axis_col}".to_sym] = raw_axis
+
+    interp = GSL::Interp.alloc("linear", raw_axis.size) if interpolate
+
+    data[axis_col] = NArray.float(new_size).indgen!(range.first,step)
+
+    data[:__raw_mask] = NArray.byte(new_size)
+    data[:__raw_mask][(raw_axis - range.first)/step.to_f] = 1
+    
+    data.keys.each do |k|
+
+      next if (k == axis_col || k == "__#{axis_col}".to_sym)
+
+      v = data[k]
+
+      # if first is a float, vector is a NArray and will be interpolated
+      if v[0].is_a? Float then
+        data["__#{k}".to_sym] = v #backup data in :__key
+        if interpolate
+          # problem with GSL lack of NArray support on compilation
+          raw_axis_vector = GSL::Vector[raw_axis.to_a]
+          v_vector = GSL::Vector[v.to_a]
+          data_vector = GSL::Vector[data[axis_col].to_a]
+
+          data[k] = interp.init(raw_axis_vector, v_vector)
+          data[k] = NArray.to_na data[k].eval(raw_axis_vector, v_vector, data_vector).to_a
+        else
+          data[k] = NArray.float(new_size)
+          data[k][(raw_axis - range.first)/step.to_f] = v
+        end
+      end
+    end
+
+    data
+    
+  end
+
 end

data/sequel_vectorized.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
 	s.name              = "sequel_vectorized"
-	s.version           = "0.0.3"
+	s.version           = "0.0.5"
 	s.platform          = Gem::Platform::RUBY
 	s.has_rdoc          = false
 	s.summary           = ""

data/spec/sequel_vectorized_spec.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'spec'
 require 'sequel'
 
@@ -72,4 +73,104 @@ describe Sequel::Dataset do
     }
   end
 
+  it "is possible to pass an :axis option" do
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2008,1,1,12).to_f ... Time.local(2008,1,1,15).to_f,
+      :interpolate => true
+    }
+
+    lambda {
+      @events.vectorize axis
+    }.should_not raise_error
+  end
+
+  it "returns new narrays of size (range.last-range.first)/step if :axis is given" do
+
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2008,1,1,12).to_f ... Time.local(2008,1,1,15).to_f,
+      :interpolate => false
+    }
+
+    ret = @events.vectorize :axis => axis
+
+    new_ret = ret.delete_if {|k,v| k.to_s.match(/__\w+/) }
+
+    new_ret.should == {
+      :value => NArray.to_na([[0]*30, 2.2, [0]*59, 1.1, [0]*59,3.3, [0]*29].flatten),
+      :ts => NArray.float(180).indgen(Time.local(2008,1,1,12).to_f,60)
+    }
+  end
+
+  it "interpolates NArrays if :axis option :interpolate is true" do
+    # TODO: not spec'ed
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2008,1,1,12).to_f ... Time.local(2008,1,1,15).to_f,
+      :interpolate => true
+    }
+
+    ret = @events.vectorize :axis => axis
+
+    ret[:ts].should == NArray.float(180).indgen(Time.local(2008,1,1,12).to_f,60)
+
+  end
+
+
+  it "returns a vectorized result set that inherits from Hash and has dot notation" do
+
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2008,1,1,12).to_f ... Time.local(2008,1,1,15).to_f,
+      :interpolate => false
+    }
+
+    ret = @events.vectorize :axis => axis
+
+    ret.should be_a_kind_of Hash
+
+    ret.should respond_to :ts
+    ret.should respond_to :value
+
+  end
+
+  it "should be empty if there is no data" do
+    @items.filter(:name => 'be').vectorize.should be_empty
+    @items.filter(:name => 'be').vectorize(:axis => {:column => :price, :range => 0 ... 100, :step => 20 }).should be_empty
+    @items.filter(:name => 'abc').vectorize(:axis => {:column => :price, :range => 0 ... 100, :step => 20 }).should_not be_empty
+  end
+
+  it "should not raise error for an interval" do
+
+    require 'lib/sequel_vectorized'
+
+    @events << {:value => 2.2, :ts => Time.local(2009,8,14,21,0).to_f}
+    @events << {:value => 2.2, :ts => Time.local(2009,8,14,22,0).to_f}
+    @events << {:value => 1.1, :ts => Time.local(2009,8,14,23,20).to_f}
+    @events << {:value => 3.3, :ts => Time.local(2009,8,15,0).to_f}
+    @events << {:value => 3.3, :ts => Time.local(2009,8,15,1).to_f}
+
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2009,8,14,22).to_f .. Time.local(2009,8,15,0).to_f,
+      :interpolate => false
+    }
+
+    lambda { @events.vectorize :axis => axis }.should_not raise_error
+    axis[:interpolate] = true
+    lambda { @events.vectorize :axis => axis }.should_not raise_error
+
+    axis[:range] = Time.local(2009,8,14,22).to_f .. Time.local(2009,8,15,0).to_f
+
+    lambda { @events.vectorize :axis => axis }.should_not raise_error
+    axis[:interpolate] = false
+    lambda { @events.vectorize :axis => axis }.should_not raise_error
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsvd-sequel_vectorized
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Jo\xC3\xA3o Duarte"
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: narray
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -46,6 +48,7 @@ files:
 - ChangeLog
 has_rdoc: false
 homepage: 
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -66,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: ""