toji 2.2.0 → 2.3.0

data/example/shubo.yaml

@@ -1,6 +1,7 @@
 date_line: 0
 states:
-- elapsed_time: 0
+- time: 2019-01-16
+  elapsed_time: 0
   mark: 水麹
   temps: 12.0
   acid: 13.0

data/lib/toji/brew.rb

@@ -1,12 +1,14 @@
 module Toji
   module Brew
-    HOUR = 60 * 60
+    SECOND = 1
+    MINUTE = 60 * SECOND
+    HOUR = 60 * MINUTE
     DAY = 24 * HOUR
   end
 end
 
 require 'toji/brew/base'
-require 'toji/brew/state_wrapper'
+require 'toji/brew/wrapped_state'
 require 'toji/brew/state'
 require 'toji/brew/builder'
 require 'toji/brew/graph'

data/lib/toji/brew/base.rb

@@ -1,6 +1,6 @@
 module Toji
   module Brew
-    class Base
+    module Base
       include Enumerable
 
       REQUIRED_KEYS = [
@@ -29,18 +29,12 @@ module Toji
         :note,
       ].freeze
 
-      attr_accessor :states
+      attr_accessor :wrapped_states
       attr_accessor :day_offset
-      attr_accessor :min_time
-
-      def initialize
-        @states = []
-        @day_offset = 0
-        @min_time = 0
-      end
+      attr_accessor :base_time
 
       def days
-        ((@states.last.elapsed_time_with_offset.to_f + 1) / DAY).ceil
+        ((wrapped_states.last.elapsed_time_with_offset.to_f + 1) / DAY).ceil
       end
 
       def day_labels
@@ -52,30 +46,16 @@ module Toji
       end
 
       def each(&block)
-        @states.each(&block)
+        wrapped_states.each(&block)
       end
 
       def has_keys
         result = REQUIRED_KEYS.dup
 
         result += OPTIONAL_KEYS.select {|k|
-          @states.find {|s| s.send(k).present?}
+          wrapped_states.find {|s| s.send(k).present?}
         }
       end
-
-      def to_h
-        {
-          states: map(&:to_h),
-          has_keys: has_keys,
-          day_offset: day_offset,
-          days: days,
-          day_labels: day_labels,
-        }
-      end
-
-      def self.builder
-        Builder.new(self)
-      end
     end
   end
 end

data/lib/toji/brew/builder.rb

@@ -7,6 +7,9 @@ module Toji
         @states = []
         @date_line = 0
         @prefix_day_labels = nil
+        @base_time = nil
+        @time_interpolation = false
+        @elapsed_time_interpolation = false
       end
 
       def <<(state)
@@ -17,8 +20,8 @@ module Toji
       end
       alias_method :add, :<<
 
-      def date_line(val)
-        @date_line = val
+      def date_line(val, unit=SECOND)
+        @date_line = (val * unit).to_i
         self
       end
 
@@ -27,39 +30,64 @@ module Toji
         self
       end
 
+      def time_interpolation(base_time)
+        @base_time = base_time&.to_time
+        @time_interpolation = true
+        #@elapsed_time_interpolation = false
+        self
+      end
+
+      def elapsed_time_interpolation
+        #@base_time = nil
+        #@time_interpolation = false
+        @elapsed_time_interpolation = true
+        self
+      end
+
       def build
         brew = @cls.new
 
-        min_time = @states.map(&:time).compact.sort.first
-        wrappers = @states.map{|r| StateWrapper.new(r.elapsed_time, r, brew)}
+        wrapped_states = @states.map{|s| WrappedState.new(s, brew)}
+
+        # time interpolation
+        if @time_interpolation
+          base_time = @base_time
+
+          base_state = wrapped_states.select{|w| w.time && w.elapsed_time}.first
+          if base_state
+            base_time = base_state.time - base_state.elapsed_time
+          end
+
+          wrapped_states.each {|w|
+            if w.elapsed_time
+              w.time = base_time + w.elapsed_time
+            end
+          }
+        end
 
-        # time
-        if min_time
-          wrappers.each {|w|
-            if w.state.time
-              w.elapsed_time = (w.state.time - min_time).to_i
-              w.time = w.state.time
-            else
-              #w.elapsed_time = w.state.elapsed_time
-              w.time = min_time + w.state.elapsed_time
+        # elapsed_time interpolation
+        if @elapsed_time_interpolation
+          base_time = wrapped_states.map(&:time).sort.first
+          wrapped_states.each {|w|
+            if w.time
+              w.elapsed_time = (w.time - base_time).to_i
             end
           }
         end
-        min_time = wrappers.first&.time
 
-        wrappers = wrappers.sort{|a,b| a.elapsed_time<=>b.elapsed_time}
+        wrapped_states = wrapped_states.sort_by(&:elapsed_time)
+        base_time = wrapped_states.first&.time
 
         # day_offset
-        t = wrappers.first&.time
         day_offset = 0
-        if t
-          day_offset = t - Time.mktime(t.year, t.month, t.day)
+        if base_time
+          day_offset = base_time - Time.mktime(base_time.year, base_time.month, base_time.day)
         end
-        day_offset = (((24 - @date_line) * HOUR) + day_offset) % DAY
+        day_offset = (DAY - @date_line + day_offset) % DAY
 
-        brew.states = wrappers
+        brew.wrapped_states = wrapped_states
         brew.day_offset = day_offset
-        brew.min_time = min_time
+        brew.base_time = base_time
         if Moromi===brew
           brew.prefix_day_labels = @prefix_day_labels
         end

data/lib/toji/brew/graph/bmd.rb

@@ -16,7 +16,7 @@ module Toji
           result = []
 
           @actuals.each {|moromi, name|
-            states = moromi.states.select{|s| s.moromi_day && s.bmd}
+            states = moromi.wrapped_states.select{|s| s.moromi_day && s.bmd}
 
             xs = states.map(&:moromi_day).map{|d| d*DAY}
             ys = states.map(&:bmd)

data/lib/toji/brew/graph/multi_progress.rb

@@ -69,127 +69,6 @@ module Toji
             }
           )
         end
-
-        def state_group_order(group_by)
-          result = {}
-
-          @progresses.map{|progress|
-            progress.state_group_by(group_by)
-          }.map{|group|
-            group.map{|key,states|
-              [key, states.first.elapsed_time_with_offset]
-            }.to_h
-          }.each {|group|
-            result.merge!(group) {|key,self_val,other_val|
-              [self_val, other_val].min
-            }
-          }
-
-          result.sort_by(&:last).map(&:first)
-        end
-
-        def state_group_count(group_by)
-          result = {}
-
-          @progresses.map{|progress|
-            progress.state_group_count(group_by)
-          }.each {|group|
-            result.merge!(group) {|key,self_val,other_val|
-              [self_val, other_val].max
-            }
-          }
-
-          state_group_order(group_by).map {|val|
-            [val, result[val]]
-          }.to_h
-        end
-
-        def table_data(group_by=nil, keys=nil)
-          case group_by
-          when :elapsed_time, :elapsed_time_with_offset, nil
-            table_data_group_by_elapsed_time(keys)
-          else
-            table_data_group_by(group_by, keys)
-          end
-        end
-
-        def table_data_group_by(group_by, keys=nil)
-          header = []
-          cells = []
-
-          group_count = state_group_count(group_by)
-
-          header << ["", group_by]
-          cells << group_count.inject([]) {|result,(group,num)|
-            if 0<num
-              result << group
-              (num-1).times {
-                result << ""
-              }
-            end
-            result
-          }
-
-          @progresses.each {|progress|
-            data = progress.table_data(keys, group_by, group_count)
-            header += data[:header].map.with_index{|h,i|
-              name = i==0 ? progress.name : ""
-              [name, h]
-            }
-            cells += data[:rows].transpose
-          }
-
-          {header: header, rows: cells.transpose}
-        end
-
-        def table_data_group_by_elapsed_time(keys=nil, date_format="%m/%d %H:%M")
-          header = []
-          cells = []
-
-          elapsed_times = state_group_count(:elapsed_time_with_offset)
-
-          header << ["", :elapsed_time]
-          utc_offset = Time.at(0).utc_offset
-
-          cells << elapsed_times.inject([]) {|result,(elapsed_time,num)|
-            if 0<num
-              result << Time.at(elapsed_time - utc_offset).strftime(date_format)
-              (num-1).times {
-                result << ""
-              }
-            end
-            result
-          }
-
-          @progresses.each {|progress|
-            data = progress.table_data(keys, :elapsed_time_with_offset, elapsed_times)
-            header += data[:header].map.with_index{|h,i|
-              name = i==0 ? progress.name : ""
-              [name, h]
-            }
-            cells += data[:rows].transpose
-          }
-
-          {header: header, rows: cells.transpose}
-        end
-
-        def table(group_by=nil, keys=nil)
-          data = table_data(group_by, keys)
-
-          Plotly::Plot.new(
-            data: [{
-              type: :table,
-              header: {
-                values: data[:header]
-              },
-              cells: {
-                values: data[:rows].transpose
-              },
-            }],
-            layout: {
-            }
-          )
-        end
       end
     end
   end

data/lib/toji/brew/graph/progress.rb

@@ -75,7 +75,7 @@ module Toji
             result << {x: xs, y: ys, text: text, name: "#{name}#{key}", line: {dash: @dash, shape: line_shape}, marker: {color: PLOT_COLORS[key]}}
           }
 
-          if 0<@brew.states.length && 0<@brew.day_offset
+          if 0<@brew.wrapped_states.length && 0<@brew.day_offset
             result = result.map{|h|
               h[:x].unshift(0)
               h[:y].unshift(nil)
@@ -84,8 +84,8 @@ module Toji
             }
           end
 
-          #if 0<@brew.states.length && @brew.states.last.time.strftime("%T")!="00:00:00"
-          #  t = @brew.states.last.elapsed_time_with_offset
+          #if 0<@brew.wrapped_states.length && @brew.wrapped_states.last.time.strftime("%T")!="00:00:00"
+          #  t = @brew.wrapped_states.last.elapsed_time_with_offset
           #  t -= (t % DAY) - DAY
           #
           #  result = result.map{|h|
@@ -117,28 +117,7 @@ module Toji
           }
         end
 
-        def state_group_by(group_by)
-          group = {}
-          prev = nil
-
-          @brew.each {|state|
-            val = state.send(group_by) || prev
-            prev = val
-
-            group[val] ||= []
-            group[val] << state
-          }
-
-          group
-        end
-
-        def state_group_count(group_by)
-          state_group_by(group_by).map{|val,states|
-            [val, states.length]
-          }.to_h
-        end
-
-        def table_data(keys=nil, group_by=nil, group_count=nil)
+        def table_data(keys=nil)
           if !keys
             keys = @brew.has_keys
             keys.delete(:elapsed_time)
@@ -151,33 +130,19 @@ module Toji
             keys &= @brew.has_keys
           end
 
-          if group_by && group_count
-            brew_hash = state_group_by(group_by)
-          else
-            group_count = state_group_count(:itself)
-            brew_hash = state_group_by(:itself)
-          end
-
           rows = []
-          group_count.each {|group_value,num|
-            states = brew_hash[group_value] || []
-            num ||= states.length
-
-            num.times {|i|
-              state = states[i]
-
-              rows << keys.map {|k|
-                v = state&.send(k)
-                if Array===v
-                  v.map(&:to_s).join(", ")
-                elsif Float===v
-                  v.round(3)
-                elsif v
-                  v
-                else
-                  ""
-                end
-              }
+          @brew.each {|state|
+            rows << keys.map {|k|
+              v = state&.send(k)
+              if Array===v
+                v.map(&:to_s).join(", ")
+              elsif Float===v
+                v.round(3).to_s
+              elsif v
+                v.to_s
+              else
+                ""
+              end
             }
           }
 

data/lib/toji/brew/koji.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Koji < Base
+    module Koji
+      include Base
 
       def progress(name: nil, dash: :solid, enable_annotations: true)
         Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)

data/lib/toji/brew/moromi.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Moromi < Base
+    module Moromi
+      include Base
 
       attr_accessor :prefix_day_labels
 

data/lib/toji/brew/shubo.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Shubo < Base
+    module Shubo
+      include Base
 
       def progress(name: nil, dash: :solid, enable_annotations: true)
         Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)