timesteps 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec2401e1d32acce3ddb048864c34b37de56ad5f83066fa617baeea8c65abc3a
-  data.tar.gz: '083c51a6c6fd1f295e7d2359960f5fe893ccc0847bcf014b7928f629c21e1a8e'
+  metadata.gz: 9f12b99565a7b2bdc24a8e9c6e3d2b38a439d3b273f73df6af514f1bee2c7905
+  data.tar.gz: e2680119ef10f30ea98803e89e9dd2e6f0b9d0b9291939100896ce3c192d0b86
 SHA512:
-  metadata.gz: e242891a7aed17ea1a3c0c138e80382b55422b5d6c9cbeec0c32e0b5725d5979a1e7631b110eb136ca4942c16023b93b325390f28be30792aa15f637a736c09b
-  data.tar.gz: 4da60d62efce29eeb13b1fe93d2621cdc616c6d8fe4d421922257bbb5e28c5695504d6804806430feb1dd42adbba7870de37b41758cf3df121dae59b57c1d3bf
+  metadata.gz: ffca26ce458c6867518d4804e50fa85e673c972e32941299697b19a49b20baba1731a9d512d566bffa4532870a4e0f229e154c61d20e8b3ad1ec94e95d3ba2fc
+  data.tar.gz: a1b3f59a940a30d3e7634cdbbb748fa39f45558ce0ac65412b8630c2a847293f708dc8fbe85760eb13f4462d82067e2c677dac84ba0b6cfafed48622b10cea90

data/README.md

@@ -195,6 +195,13 @@ ts = TimeStep.new("3 hours since 2001-01-01 09:00:00", calendar: "noleap")
 
 # specify origin time with DateTime object
 ts = TimeStep.new("3 hours", since: DateTime.parse("2001-01-01 09:00:00"))
+
+# hourly increments whose origin is the most recent convenient time to the current time
+ts = TimeStep.new("1 hour").new_origin(DateTime.now, truncate: true)
+
+# hourly increments whose origin is the most recent convenient time to the current time
+# with +0900 time offset
+ts = TimeStep.new("1 hour", offset: "+0900").new_origin(DateTime.now, truncate: true)
 ```
 
 ### Attributes of TimeStep object
@@ -296,5 +303,6 @@ conv.forward(0, 56, 81, with_time: true)
    #  "ts2"=>[-48, 8, 33],
    #  "ts3"=>[-72, -16, 9]}
 
+
 ```
 

data/lib/timesteps/timestep.rb

@@ -516,8 +516,9 @@ class TimeStep
   # @param time [DateTime, String]
   #
   # @return [TimeStep]
-  def new_origin (time)
+  def new_origin (time, truncate: false)
     time = @calendar.parse(time, offset: @origin.offset) if time.is_a?(String)
+    time = self.truncate(time) if truncate
     if @wday
       origin = time - time.wday + WDAY[@wday]
       origin -= 7 unless time >= origin
@@ -627,7 +628,7 @@ class TimeStep
   # @return [TimeStep::Pair]
   def in (unit)
     other = TimeStep.new(unit, since: @origin, calendar: @calendar)
-   return Pair.new(self, other)
+    return Pair.new(self, other)
   end
   
   # Creates new timestep pair object which refers `other` from `self`

data/lib/timesteps/timestep_range.rb

@@ -48,22 +48,24 @@ class TimeStep::Range
     end
 
     if include_start
-      @start = start.ceil
+      start = start.ceil
     else
-      @start = start.floor + 1
+      start = start.floor + 1
     end
     
     if include_last
-      @last = last.floor
+      last = last.floor
     else
-      @last = last.ceil - 1
+      last = last.ceil - 1
     end
 
-    @timestep = timestep.new_origin(timestep.time_at(@start))
-    @count = @last - @start + 1
-    
-    @start_time = @timestep.time_at(@start)
-    @last_time  = @timestep.time_at(@last)
+    @timestep   = timestep.new_origin(timestep.time_at(start))  
+    @start_time = timestep.time_at(start)
+    @last_time  = timestep.time_at(last)
+  
+    @start      = @timestep.index_at(@start_time)
+    @last       = @timestep.index_at(@last_time)
+    @count      = @last - @start + 1
   end
 
   attr_reader :timestep, :count, :start, :last, :start_time, :last_time
@@ -118,8 +120,8 @@ class TimeStep::Range
   # @param time [DateTime]
   #
   # @return [TimeStep]
-  def new_origin (time)
-    timestep = @timestep.new_origin(time)
+  def new_origin (time, truncate: false)
+    timestep = @timestep.new_origin(time, truncate: truncate)
     return TimeStep::Range.new(timestep, count: @count)
   end
 
@@ -127,12 +129,12 @@ class TimeStep::Range
   
   def each_time (&block)
     if block
-      @start.upto(@last) do |k|
+      (@start..@last).each do |k|
         block.call(@timestep.time_at(k))
       end
     else
       return Enumerator.new {|y|
-        @start.upto(@last) do |k|
+        (@start..@last).each do |k|
           y << @timestep.time_at(k)
         end
       }

data/timesteps.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.0"
+  version = "1.0.1"
 
   files = Dir.glob("**/*") + [".yardopts"] - [ 
                                Dir.glob("timesteps-*.gem"), 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timesteps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies: []
 description: "  A library for time conversion and intercomparison of multiple time
   series data \n  in the case of handling time series data of the type that specifies