jsvd-sequel_vectorized 0.0.5 → 0.1.0

data/ChangeLog

@@ -1,4 +1,12 @@
-== 0.0.5 / 2009-06-04
+== 0.1.0 / 2009-09-25
+
+* Prevent exception if trying to interpolate insufficient data
+
+== 0.0.6 / 2009-09-25
+
+* Prevent exception if trying to interpolate insufficient data
+
+== 0.0.5 / 2009-09-24
 
 * Axis range is now a ruby Range
 * Proper creation of data vectors if end of range is excluded or not

data/lib/sequel_vectorized.rb

@@ -53,12 +53,15 @@ class Sequel::Dataset
 
     new_size = (range.last - range.first)/step.to_f
     new_size +=1 unless range.exclude_end?
+
     raw_axis = data[axis_col]
+    interpolate = false if raw_axis.size <= 1 # turn off interpolation of insufficient data
+
     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[axis_col] = NArray.float(new_size).indgen!(range.first.to_f,step)
 
     data[:__raw_mask] = NArray.byte(new_size)
     data[:__raw_mask][(raw_axis - range.first)/step.to_f] = 1

data/sequel_vectorized.gemspec

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

data/spec/sequel_vectorized_spec.rb

@@ -145,9 +145,24 @@ describe Sequel::Dataset do
     @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
+  it "should not raise error if there's not enough data for interpolation" do
+
+    axis = {
+      :column => :ts,
+      :step => 60,
+      :range => Time.local(2008,1,1,12,30).to_f .. Time.local(2008,1,1,12,31).to_f,
+      :interpolate => true
+    }
+
+    lambda { @events.vectorize :axis => axis }.should_not raise_error
+    @events.vectorize(:axis => axis).should include :__value
+    @events.vectorize(:axis => axis).should include :__raw_mask
+    @events.vectorize(:axis => axis)[:__value].size.should == 1
+    @events.vectorize(:axis => axis)[:__raw_mask].size.should == 2
 
-    require 'lib/sequel_vectorized'
+  end
+
+  it "should not raise error for an interval" do
 
     @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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsvd-sequel_vectorized
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Jo\xC3\xA3o Duarte"