toji 0.1.0 → 1.0.0

data/lib/toji/graph/ab.rb

@@ -9,27 +9,27 @@ module Toji
         @expects = []
       end
 
-      def actual(jobs, name=:actual)
-        data = jobs.map{|j| [j.time || j.elapsed_time + jobs.day_offset, j.alcohol, j.baume]}.select{|a| a[1] && a[2]}
-        xs = data.map{|a| a[1]}
-        ys = data.map{|a| a[2]}
-        texts = data.map{|a| "%s<br />alc=%s, be=%s" % a}
-        @actuals << {x: xs, y: ys, text: texts, name: name}
-
+      def actual(moromi, name=:actual)
+        @actuals << [moromi, name]
         self
       end
 
       def expect(alcohol, nihonshudo)
         @expects << [alcohol.to_f, nihonshudo.to_f]
-
         self
       end
 
       def data
         result = []
 
-        @actuals.each {|a|
-          result << a
+        @actuals.each {|moromi, name|
+          data = moromi.map{|j| [j.time || j.elapsed_time + moromi.day_offset, j.alcohol, j.baume]}.select{|a| a[1] && a[2]}
+
+          xs = data.map{|a| a[1]}
+          ys = data.map{|a| a[2]}
+          texts = data.map{|a| "%s<br />alc=%s, be=%s" % a}
+
+          result << {x: xs, y: ys, text: texts, name: name}
         }
 
         @expects.each {|alcohol, nihonshudo|
@@ -44,18 +44,22 @@ module Toji
         result
       end
 
-      def plot
-        d = data
+      def min_baume
+        data.map{|h| h[:y].min}.min || 0
+      end
+
+      def max_baume
+        data.map{|h| h[:y].max}.max || 0
+      end
 
-        #min_baume = d.map{|h| h[:y].min}.min || 0
-        #min_baume = [min_baume-1, 0].min
-        min_baume = 0
+      def plot
+        #_min_baume = [min_baume-1, 0].min
+        _min_baume = 0
 
-        max_baume = d.map{|h| h[:y].max}.max || 0
-        max_baume = [max_baume+1, 10].max
+        _max_baume = [max_baume+1, 10].max
 
         Plotly::Plot.new(
-          data: d,
+          data: data,
           layout: {
             xaxis: {
               title: "Alcohol",
@@ -65,7 +69,7 @@ module Toji
             yaxis: {
               title: "Baume",
               dtick: 1,
-              range: [min_baume, max_baume],
+              range: [_min_baume, _max_baume],
             }
           }
         )

data/lib/toji/graph/bmd.rb

@@ -0,0 +1,56 @@
+module Toji
+  module Graph
+    class Bmd
+
+      def initialize
+        @actuals = []
+        @expects = []
+      end
+
+      def actual(moromi, name=:actual)
+        @actuals << [moromi, name]
+        self
+      end
+
+      def data
+        result = []
+
+        @actuals.each {|moromi, name|
+          jobs = moromi.select{|j| j.moromi_time && j.bmd}
+
+          xs = jobs.map(&:moromi_time)
+          ys = jobs.map(&:bmd)
+          texts = jobs.map{|j| "%s<br />moromi day=%d, be=%s, bmd=%s" % [j.time || j.elapsed_time + moromi.day_offset, j.moromi_day, j.baume, j.bmd]}
+
+          result << {x: xs, y: ys, text: texts, name: name}
+        }
+
+        result
+      end
+
+      def max_moromi_day
+        @actuals.map(&:first).map(&:moromi_days).max
+      end
+
+      def plot
+        _max_moromi_day = [max_moromi_day, 14].max
+
+        Plotly::Plot.new(
+          data: data,
+          layout: {
+            xaxis: {
+              title: "Moromi day",
+              dtick: Product::Job::DAY,
+              range: [1, _max_moromi_day].map{|d| d*Product::Job::DAY},
+              tickvals: _max_moromi_day.times.map{|d| d*Product::Job::DAY},
+              ticktext: _max_moromi_day.times.map(&:succ)
+            },
+            yaxis: {
+              title: "BMD",
+            }
+          }
+        )
+      end
+    end
+  end
+end

data/lib/toji/graph/progress.rb

@@ -0,0 +1,84 @@
+module Toji
+  module Graph
+    class Progress
+
+      def initialize(product)
+        @product = product
+      end
+
+      def data(keys=nil)
+        data = @product.map(&:to_h).map(&:compact)
+        if !keys
+          keys = data.map(&:keys).flatten.uniq
+        end
+
+        result = []
+
+        keys &= [:temps, :preset_temp, :room_temp, :room_psychrometry, :baume, :acid, :amino_acid, :alcohol]
+
+        keys.each {|key|
+          xs = []
+          ys = []
+          text = []
+          data.each {|h|
+            if h[key]
+              [h[key]].flatten.each_with_index {|v,i|
+                xs << h[:elapsed_time] + i + @product.day_offset
+                ys << v
+                text << h[:display_time]
+              }
+            end
+          }
+
+          line_shape = :linear
+          if key==:preset_temp
+            line_shape = :hv
+          end
+
+          result << {x: xs, y: ys, text: text, name: key, line: {shape: line_shape}}
+        }
+
+        if 0<@product.day_offset
+          result = result.map{|h|
+            h[:x].unshift(0)
+            h[:y].unshift(nil)
+            h[:text].unshift(nil)
+            h
+          }
+        end
+
+        result
+      end
+
+      def annotations
+        @product.select{|j| j.id}.map {|j|
+          {
+            x: j.elapsed_time + @product.day_offset,
+            y: j.temps.first || 0,
+            xref: 'x',
+            yref: 'y',
+            text: j.id,
+            showarrow: true,
+            arrowhead: 1,
+            ax: 0,
+            ay: -40
+          }
+        }
+      end
+
+      def plot
+        Plotly::Plot.new(
+          data: data,
+          layout: {
+            xaxis: {
+              dtick: Product::Job::DAY,
+              tickvals: @product.days.times.map{|d| d*Product::Job::DAY},
+              ticktext: @product.day_labels
+            },
+            annotations: annotations,
+          }
+        )
+      end
+    end
+  end
+end

data/lib/toji/graph.rb

@@ -1,3 +1,5 @@
+require 'toji/graph/progress'
+require 'toji/graph/bmd'
 require 'toji/graph/ab'
 
 module Toji

data/lib/toji/product/base.rb

@@ -0,0 +1,74 @@
+module Toji
+  module Product
+    class Base
+      include Enumerable
+      extend JobAccessor
+
+      attr_accessor :date_line
+      attr_reader :day_offset
+
+      def initialize(arr=[], date_line: 0)
+        @_arr = []
+        @_hash = {}
+        @date_line = date_line
+        @day_offset = 0
+
+        arr.each {|j|
+          self << j
+        }
+      end
+
+      def [](id)
+        @_hash[id]
+      end
+
+      def <<(job)
+        job = Job.create(job)
+        if job.id
+          if @_hash[job.id]
+            @_arr.delete(@_hash[job.id])
+          end
+          @_hash[job.id] = job
+        end
+        @_arr << job
+        job.jobs = self
+        _normalization
+        self
+      end
+      alias_method :add, :<<
+
+      def _normalization
+        min_time = @_arr.select{|j| j.time}.map(&:time).sort.first
+
+        if min_time
+          @_arr.each {|j|
+            if j.time
+              j.elapsed_time = (j.time - min_time).to_i
+            else
+              j.time = min_time + j.elapsed_time
+            end
+          }
+        end
+
+        @_arr = @_arr.sort{|a,b| a.elapsed_time<=>b.elapsed_time}
+
+        t = @_arr.first&.time
+        if t
+          @day_offset = t - Time.mktime(t.year, t.month, t.day)
+        else
+          @day_offset = 0
+        end
+        @day_offset += ((24 - @date_line) % 24) * Job::HOUR
+      end
+
+      def each(&block)
+        _normalization
+        @_arr.each(&block)
+      end
+
+      def days
+        ((to_a.last.elapsed_time.to_f + @date_line * Job::HOUR) / Job::DAY).ceil + 1
+      end
+    end
+  end
+end

data/lib/toji/{progress → product}/job.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Progress
+  module Product
     class Job
       HOUR = 60 * 60
       DAY = 24 * HOUR
@@ -13,8 +13,7 @@ module Toji
       attr_accessor :time
       attr_accessor :elapsed_time
       attr_accessor :id
-      attr_accessor :before_temp
-      attr_accessor :after_temp
+      attr_accessor :temps
 
       attr_accessor :preset_temp
       attr_accessor :room_temp
@@ -30,15 +29,14 @@ module Toji
       attr_accessor :note
 
       def initialize(
-        time: nil, elapsed_time: nil, id: nil, before_temp: nil, after_temp: nil,
+        time: nil, elapsed_time: nil, id: nil, temps: nil,
         preset_temp: nil, room_temp: nil, room_psychrometry: nil,
         baume: nil, nihonshudo: nil, acid: nil, amino_acid: nil, alcohol: nil,
         warming: nil, note: nil)
         @time = time
         @elapsed_time = elapsed_time
         @id = id
-        @before_temp = before_temp
-        @after_temp = after_temp
+        self.temps = temps
 
         @preset_temp = preset_temp
         @room_temp = room_temp
@@ -54,18 +52,8 @@ module Toji
         @note = note
       end
 
-      def temps
-        result = []
-
-        if @before_temp
-          result << @before_temp
-        end
-
-        if @after_temp
-          result << @after_temp
-        end
-
-        result
+      def temps=(val)
+        @temps = [val].flatten.select{|t| t}
       end
 
       def baume
@@ -86,7 +74,7 @@ module Toji
         end
       end
 
-      def baume_display
+      def display_baume
         if @baume || @nihonshudo
           b = baume
           if b<3.0
@@ -97,6 +85,14 @@ module Toji
         end
       end
 
+      def display_time(format="%m/%d %H:%M")
+        if @time
+          time.strftime(format)
+        else
+          Time.at(elapsed_time).strftime(format)
+        end
+      end
+
       def moromi_time
         tome = jobs[:tome]
         if tome
@@ -124,6 +120,14 @@ module Toji
         end
       end
 
+      def expected_alcohol(target_alc, target_nihonshudo, coef)
+        _baume = baume
+
+        if _baume
+          target_alc - (_baume - target_nihonshudo * -0.1) * coef
+        end
+      end
+
       def warmings
         result = []
         if @warming & WARM_DAKI
@@ -142,10 +146,9 @@ module Toji
         {
           time: time,
           elapsed_time: elapsed_time,
+          display_time: display_time,
           id: id,
           preset_temp: preset_temp,
-          before_temp: before_temp,
-          after_temp: after_temp,
           temps: temps,
           room_temp: room_temp,
           room_psychrometry: room_psychrometry,
@@ -160,6 +163,14 @@ module Toji
           note: note,
         }
       end
+
+      def self.create(j)
+        if Job===j
+          j
+        else
+          new(**j.to_h)
+        end
+      end
     end
   end
 end

data/lib/toji/{progress → product}/job_accessor.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Progress
+  module Product
     module JobAccessor
       def job_reader(*args)
         args.each {|arg|

data/lib/toji/{progress/make_koji.rb → product/koji_making.rb}

@@ -1,67 +1,62 @@
 module Toji
-  module Progress
-    class MakeKoji
-      extend JobAccessor
+  module Product
+    class KojiMaking < Base
 
       TEMPLATES = {
         default: [
           Job.new(
             elapsed_time: 0 * Job::HOUR,
             id: :hikikomi,
-            after_temp: 35.0,
+            temps: 35.0,
             room_temp: 28.0,
             room_psychrometry: nil,
           ),
           Job.new(
             elapsed_time: 1 * Job::HOUR,
             id: :tokomomi,
-            after_temp: 32.0,
+            temps: 32.0,
             room_temp: 28.0,
             room_psychrometry: nil,
           ),
           Job.new(
             elapsed_time: 9 * Job::HOUR,
             id: :kirikaeshi,
-            before_temp: 32.0,
-            after_temp: 31.0,
+            temps: [32.0, 31.0],
             room_temp: 28.0,
             room_psychrometry: nil,
           ),
           Job.new(
             elapsed_time: 21 * Job::HOUR,
             id: :mori,
-            before_temp: 35.0,
-            after_temp: 33.0,
+            temps: [35.0, 33.0],
             room_temp: 28.0,
             room_psychrometry: 4,
           ),
           Job.new(
             elapsed_time: 29 * Job::HOUR,
             id: :naka_shigoto,
-            before_temp: 37.0,
-            after_temp: 35.0,
+            temps: [37.0, 35.0],
             room_temp: 28.0,
             room_psychrometry: 4,
           ),
           Job.new(
             elapsed_time: 35 * Job::HOUR,
             id: :shimai_shigoto,
-            before_temp: 38.0,
-            after_temp: 37.0,
+            temps: [38.0, 37.0],
             room_temp: 28.0,
             room_psychrometry: 5,
           ),
           Job.new(
             elapsed_time: 39 * Job::HOUR,
             id: :tsumikae,
-            after_temp: 40.0,
+            temps: 40.0,
             room_temp: 28.0,
             room_psychrometry: 5,
           ),
           Job.new(
             elapsed_time: 44 * Job::HOUR,
             id: :dekoji,
-            after_temp: 40.0,
+            temps: 40.0,
             room_temp: 28.0,
             room_psychrometry: 5,
           ),
@@ -79,17 +74,16 @@ module Toji
       job_reader :dekoji
 
 
-      def initialize(jobs=[])
-        @jobs = Jobs.new(jobs)
+      def initialize(jobs=[], date_line: 0)
+        super(jobs, date_line: date_line)
       end
 
-      def add(job)
-        @jobs << job
-        self
+      def day_labels
+        days.times.map(&:succ)
       end
 
-      def jobs
-        @jobs.to_a
+      def progress
+        Graph::Progress.new(self)
       end
 
       def self.template(key=:default)