simple_time_series 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f5ca203967d4af50f16d5afa45797faf88de47
-  data.tar.gz: 1d6b4d7b3446fd5141150054fd9bd65fb8840980
+  metadata.gz: 0b73fd7c9b64515cb0d5c39ec11df549bd0f1ae4
+  data.tar.gz: 36f02c014942abfc3b83dbd766b1410df5952871
 SHA512:
-  metadata.gz: f3472c7f10c78314440774986600b67b1a00d1827abd68afae448602d1b3aec6249fbb87851f0651e2d3e2232effb6bc0e057a2da3fb044469bf531e8e4db2a5
-  data.tar.gz: c6cedd819610bcb1366e747afa536f8baea398493b5b94db1f707f5e76c040f59570163c1de75175d1b7d3e96957d01dde86d956fd32dc321a9610cad835bc00
+  metadata.gz: 8e71952e875add4b1f8a6801a1f16e6e460b1ba71c0ec61d4101c50835599aaf898a0f617f2962a8352b4febbccfa3cb0012620a241d0fdb0531716f0ddae0f4
+  data.tar.gz: 3a781828fcffcca857d2139ec7719961e7678c06415f564457bfa1a29dc910baafdcafe1b863243bf7ddbcdd160c047645bb392753b0f7a9f3c4513643bb8496

data/README.md

@@ -64,6 +64,15 @@ You can get the same values by calling SimpleTimeSeries#find with two arguments,
     puts "Tasks done on Wednesday: #{my_data.find('tasks_done', 'Wednesday')}" # prints 14
     puts "Tasks done on 2014-01-05: #{my_data.find('tasks_done', '2014-01-05')}" # prints 3
 
+You can also get ranges of values using SimpleTimeSeries#find with three arguments: 1) data_var name; 2) start time_var value; and, 3) end time_var value:
+
+    my_data.find('pizzas', 'Tuesday', 'Thursday') # returns [1, 0, 0.5]
+    my_data.find('pizzas', 'Thursday', '2014-01-07') # returns [0.5, 0, 2]
+    my_data.find('miles', 'Saturday', '2014-01-07') # returns 2.3 (a value, not an array, because the start/end dates are the same)
+    my_data.find('miles', 'Sunday', '2014-01-07') # returns [2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3]
+    my_data.find('miles', 'Jan 2, 2014','2014-01-06') # returns [3.1, 0.0, 4.3, 1.2, 12.2]
+    my_data.find('tasks_done', '2014-01-02', 'Friday') # returns [3, 0, 14, 3, 11]
+
 You can view all the values associated with any variable:
 
     my_data.miles # prints [2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3]
@@ -206,9 +215,8 @@ This began as a simple code example for a collague who had programmed something
 
 ## Todo
 
-1. Enable cumulative sum on any data_var
-2. Enable range extraction via data_var[start_time, end_time]. This currently works as data_var_subset(start_time, end_time).
-3. Enable setting values for a range via data_var[start_time, end_time]=
+1. Enable range extraction via data_var[start_time, end_time]. This currently works as data_var_subset(start_time, end_time) and data_var_diff(), data_var_cumsum(), etc. but would be nice to grab subsets using array ranges.
+2. Enable setting values for a range via data_var[start_time, end_time]=. You can do this with data_var_subset_set(start_time, end_time), but it would be nice to make this work using array ranges.
 
 ## Acknowledgements
 

data/lib/simple_time_series/simple_time_series.rb

@@ -9,8 +9,12 @@ class SimpleTimeSeries
     define_time_methods_and_set_values
   end
 
-  def find(what, date)
-    send (what + '_on').to_sym, date
+  def find(what, date, end_date=nil)
+    if end_date
+      send (what + '_on').to_sym, date, end_date
+    else
+      send (what + '_on').to_sym, date
+    end
   end
 
   def current(what)
@@ -74,13 +78,19 @@ class SimpleTimeSeries
           return answer.length == 1 ? answer[0] : answer
         end
       end
-      define_method(var_on) do |date|
+      define_method(var_on) do |first, last=nil|
         time_vars.each do |tv_key, tv_val|
           # tv_key is something like 'dows' or 'dates'
           # tv_val is an array of associated values
-          return eval(var)[tv_val.index(date)] if tv_val.include?(date)
+          start_idx = index_of_date_value(first) || 0
+          last_idx = index_of_date_value(last) || (first.nil? ? -1 : start_idx)
+          if start_idx != last_idx #&& tv_val.include?(last)
+            return eval(var)[start_idx..last_idx]
+          elsif tv_val.include?(first)
+            return eval(var)[start_idx]
+          end
         end
-        raise "Can't find #{var_on} for #{date}"
+        raise "Can't find #{var_on} for #{first}"
       end
     end
     instance_variable_set("@#{var}", vals) if vals

data/lib/simple_time_series/version.rb

@@ -1,3 +1,3 @@
 class SimpleTimeSeries
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/lib/simple_time_series_spec.rb

@@ -48,6 +48,15 @@ describe SimpleTimeSeries do
     @my_data.find('tasks_done', '2014-01-02').should == 3
   end
 
+  it "creates a #find method for finding any data values for a range of observations" do
+    @my_data.find('pizzas', 'Tuesday', 'Thursday').should == [1, 0, 0.5]
+    @my_data.find('pizzas', 'Thursday', '2014-01-07').should == [0.5, 0, 2]
+    @my_data.find('miles', 'Saturday', '2014-01-07').should == 2.3
+    @my_data.find('miles', 'Sunday', '2014-01-07').should == [2.2, 3.1, 0.0, 4.3, 1.2, 12.2, 2.3]
+    @my_data.find('miles', 'Jan 2, 2014','2014-01-06').should == [3.1, 0.0, 4.3, 1.2, 12.2]
+    @my_data.find('tasks_done', '2014-01-02', 'Friday').should == [3, 0, 14, 3, 11]
+  end
+
   it "creates setter methods for updating a data series" do
     @my_data.pizzas_on('Tuesday').should == 1
     @my_data.pizzas = [10, 11, 12, 13, 14, 15, 16]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_time_series
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - James Lavin