toji 1.1.0 → 1.2.0

data/lib/toji/brew/builder.rb

@@ -0,0 +1,27 @@
+module Toji
+  module Brew
+    class Builder
+
+      def initialize(cls)
+        @cls = cls
+        @records = []
+        @date_line = 0
+      end
+
+      def <<(record)
+        @records += [record].flatten
+        self
+      end
+      alias_method :add, :<<
+
+      def date_line(val)
+        @date_line = val
+        self
+      end
+
+      def build
+        @cls.new(@records, @date_line)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+module Toji
+  module Brew
+    module Graph
+      class Ab
+        attr_reader :coef
+
+        def initialize(coef=1.5)
+          @coef = coef
+          @actuals = []
+          @expects = []
+        end
+
+        def actual(moromi, name=:actual)
+          @actuals << [moromi, name]
+          self
+        end
+
+        def expect(alcohol, nihonshudo)
+          @expects << [alcohol.to_f, nihonshudo.to_f]
+          self
+        end
+
+        def plot_data
+          result = []
+
+          @actuals.each {|moromi, name|
+            states = moromi.select{|s| s.alcohol && s.baume}
+
+            xs = states.map(&:alcohol)
+            ys = states.map(&:baume)
+            texts = states.map{|s| "%s<br />alc=%s, be=%s" % [s.display_time, s.alcohol, s.baume]}
+
+            result << {x: xs, y: ys, text: texts, name: name}
+          }
+
+          @expects.each {|alcohol, nihonshudo|
+            ys = [0.0, 8.0]
+            xs = ys.map{|b| alcohol - (b - nihonshudo * -0.1) * @coef}
+
+            name = "%s%s %s" % [nihonshudo<0 ? "" : "+", nihonshudo, alcohol]
+
+            result << {x: xs, y: ys, name: name}
+          }
+
+          result
+        end
+
+        def min_baume
+          @actuals.map {|moromi, name|
+            moromi.map(&:baume).compact.min
+          }.compact.min || 0
+        end
+
+        def max_baume
+          @actuals.map {|moromi, name|
+            moromi.map(&:baume).compact.max
+          }.compact.max || 0
+        end
+
+        def plot
+          #_min_baume = [min_baume-1, 0].min
+          _min_baume = 0
+
+          _max_baume = [max_baume+1, 10].max
+
+          Plotly::Plot.new(
+            data: plot_data,
+            layout: {
+              xaxis: {
+                title: "Alcohol",
+                dtick: 2,
+                range: [0, 20],
+              },
+              yaxis: {
+                title: "Baume",
+                dtick: 1,
+                range: [_min_baume, _max_baume],
+              }
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module Toji
+  module Brew
+    module Graph
+      class Bmd
+
+        def initialize
+          @actuals = []
+          @expects = []
+        end
+
+        def actual(moromi, name=:actual)
+          @actuals << [moromi, name]
+          self
+        end
+
+        def plot_data
+          result = []
+
+          @actuals.each {|moromi, name|
+            states = moromi.states.select{|s| s.moromi_day && s.bmd}
+
+            xs = states.map(&:moromi_day).map{|d| d*DAY}
+            ys = states.map(&:bmd)
+            texts = states.map{|s| "%s<br />moromi day=%d, be=%s, bmd=%s" % [s.display_time, s.moromi_day, s.baume, s.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: plot_data,
+            layout: {
+              xaxis: {
+                title: "Moromi day",
+                dtick: DAY,
+                range: [1, _max_moromi_day].map{|d| d*DAY},
+                tickvals: _max_moromi_day.times.map{|d| d*DAY},
+                ticktext: _max_moromi_day.times.map(&:succ)
+              },
+              yaxis: {
+                title: "BMD",
+              }
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,142 @@
+module Toji
+  module Brew
+    module Graph
+      class Progress
+
+        attr_accessor :enable_annotations
+
+        def initialize(data, enable_annotations: true)
+          @data = data
+          @enable_annotations = enable_annotations
+        end
+
+        def has_keys
+          @data.map(&:has_keys).flatten.uniq
+        end
+
+        def plot_data(keys=nil)
+          if !keys
+            keys = has_keys
+          end
+
+          result = []
+
+          keys &= [:temps, :preset_temp, :room_temp, :room_psychrometry, :baume, :acid, :amino_acid, :alcohol, :bmd]
+
+          keys.each {|key|
+            xs = []
+            ys = []
+            text = []
+            @data.each {|r|
+              val = r.send(key)
+              if val
+                [val].flatten.each_with_index {|v,i|
+                  xs << r.elapsed_time_with_offset + i
+                  ys << v
+                  text << r.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<@data.states.length && 0<@data.day_offset
+            result = result.map{|h|
+              h[:x].unshift(0)
+              h[:y].unshift(nil)
+              h[:text].unshift(nil)
+              h
+            }
+          end
+
+          result
+        end
+
+        def annotations
+          @data.select{|s| s.mark}.map {|s|
+            {
+              x: s.elapsed_time_with_offset,
+              y: s.temps.first || 0,
+              xref: 'x',
+              yref: 'y',
+              text: s.mark,
+              showarrow: true,
+              arrowhead: 1,
+              ax: 0,
+              ay: -40
+            }
+          }
+        end
+
+        def table_data(keys=nil)
+          if !keys
+            keys = has_keys
+            keys.delete(:elapsed_time)
+            keys.delete(:time)
+            keys.delete(:day)
+            keys.delete(:moromi_day)
+            keys.delete(:baume)
+            keys.delete(:nihonshudo)
+          else
+            keys &= has_keys
+          end
+
+          cells = @data.map {|s|
+            keys.map {|k|
+              v = s.send(k)
+              if Array===v
+                v.map(&:to_s).join(", ")
+              elsif Float===v
+                v.round(3)
+              elsif v
+                v
+              else
+                ""
+              end
+            }
+          }
+
+          {header: keys, cells: cells.transpose}
+        end
+
+        def plot(keys=nil)
+          Plotly::Plot.new(
+            data: plot_data(keys),
+            layout: {
+              xaxis: {
+                dtick: DAY,
+                tickvals: @data.days.times.map{|d| d*DAY},
+                ticktext: @data.day_labels
+              },
+              annotations: @enable_annotations ? annotations : [],
+            }
+          )
+        end
+
+        def table(keys=nil)
+          data = table_data(keys)
+
+          Plotly::Plot.new(
+            data: [{
+              type: :table,
+              header: {
+                values: data[:header]
+              },
+              cells: {
+                values: data[:cells]
+              },
+            }],
+            layout: {
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/toji/brew/graph.rb

@@ -0,0 +1,10 @@
+require 'toji/brew/graph/progress'
+require 'toji/brew/graph/bmd'
+require 'toji/brew/graph/ab'
+
+module Toji
+  module Brew
+    module Graph
+    end
+  end
+end

data/lib/toji/{product/koji_making.rb → brew/koji.rb}

@@ -1,93 +1,85 @@
 module Toji
-  module Product
-    class KojiMaking < Base
+  module Brew
+    class Koji < Base
 
       TEMPLATES = {
         default: [
-          Job.new(
-            elapsed_time: 0 * Job::HOUR,
+          {
+            elapsed_time: 0 * Brew::HOUR,
             id: :hikikomi,
             temps: 35.0,
             room_temp: 28.0,
             room_psychrometry: nil,
-          ),
-          Job.new(
-            elapsed_time: 1 * Job::HOUR,
+          },
+          {
+            elapsed_time: 1 * Brew::HOUR,
             id: :tokomomi,
             temps: 32.0,
             room_temp: 28.0,
             room_psychrometry: nil,
-          ),
-          Job.new(
-            elapsed_time: 9 * Job::HOUR,
+          },
+          {
+            elapsed_time: 9 * Brew::HOUR,
             id: :kirikaeshi,
             temps: [32.0, 31.0],
             room_temp: 28.0,
             room_psychrometry: nil,
-          ),
-          Job.new(
-            elapsed_time: 21 * Job::HOUR,
+          },
+          {
+            elapsed_time: 21 * Brew::HOUR,
             id: :mori,
             temps: [35.0, 33.0],
             room_temp: 28.0,
             room_psychrometry: 4,
-          ),
-          Job.new(
-            elapsed_time: 29 * Job::HOUR,
+          },
+          {
+            elapsed_time: 29 * Brew::HOUR,
             id: :naka_shigoto,
             temps: [37.0, 35.0],
             room_temp: 28.0,
             room_psychrometry: 4,
-          ),
-          Job.new(
-            elapsed_time: 35 * Job::HOUR,
+          },
+          {
+            elapsed_time: 35 * Brew::HOUR,
             id: :shimai_shigoto,
             temps: [38.0, 37.0],
             room_temp: 28.0,
             room_psychrometry: 5,
-          ),
-          Job.new(
-            elapsed_time: 39 * Job::HOUR,
+          },
+          {
+            elapsed_time: 39 * Brew::HOUR,
             id: :tsumikae,
             temps: 40.0,
             room_temp: 28.0,
             room_psychrometry: 5,
-          ),
-          Job.new(
-            elapsed_time: 44 * Job::HOUR,
+          },
+          {
+            elapsed_time: 44 * Brew::HOUR,
             id: :dekoji,
             temps: 40.0,
             room_temp: 28.0,
             room_psychrometry: 5,
-          ),
+          },
         ],
       }
 
 
-      job_reader :hikikomi
-      job_reader :tokomomi
-      job_reader :kirikaeshi
-      job_reader :mori
-      job_reader :naka_shigoto
-      job_reader :shimai_shigoto
-      job_reader :tsumikae
-      job_reader :dekoji
+      state_reader :hikikomi
+      state_reader :tokomomi
+      state_reader :kirikaeshi
+      state_reader :mori
+      state_reader :naka_shigoto
+      state_reader :shimai_shigoto
+      state_reader :tsumikae
+      state_reader :dekoji
 
 
-      def initialize(jobs=[], date_line: 0)
-        super(jobs, date_line: date_line)
-      end
-
-      def day_labels
-        days.times.map(&:succ)
-      end
-
       def progress(enable_annotations: true)
         Graph::Progress.new(self, enable_annotations: enable_annotations)
       end
 
       def self.template(key=:default)
-        new(TEMPLATES[key])
+        create(TEMPLATES[key])
       end
     end
   end