toji 1.1.0 → 1.2.0

data/lib/toji/{product → brew}/moromi.rb

@@ -1,221 +1,230 @@
 module Toji
-  module Product
+  module Brew
     class Moromi < Base
 
       TEMPLATES = {
         default: [
-          Job.new(
+          {
             time: Time.mktime(2019, 1, 16),
-            id: :soe,
+            mark: :soe,
             room_temp: 9,
             temps: [14.8, 11.0],
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 17),
             room_temp: 9,
             temps: 14.3,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 18),
             room_temp: 8.5,
             temps: 11.3,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 19),
-            id: :naka,
+            mark: :naka,
             room_temp: 9,
             temps: [6.9, 10.6],
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 20),
-            id: :tome,
+            mark: :tome,
             room_temp: 6,
             temps: [7.5, 8.0],
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 21),
             room_temp: 7,
             temps: 9.1,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 22),
             room_temp: 7,
             temps: 10.4,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 23),
             room_temp: 8,
             temps: 11.9,
             baume: 8.6,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 24),
             room_temp: 8,
             temps: 12.3,
             baume: 8.0,
             alcohol: 4.8,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 25),
             room_temp: 7.5,
             temps: 13.1,
             baume: 7.2,
             alcohol: 6.75,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 26),
             room_temp: 7.5,
             temps: 13.1,
             baume: 5.8,
             alcohol: 7.992,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 27),
             room_temp: 7.5,
             temps: 12.9,
             baume: 4.8,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 28),
             room_temp: 7.0,
             temps: 12.8,
             baume: 4.0,
             alcohol: 10.7,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 29),
             room_temp: 8.0,
             temps: 12.9,
             baume: 3.4,
             alcohol: 11.6,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 30),
             room_temp: 8.0,
             temps: 12.6,
             nihonshudo: -27,
             alcohol: 12.7,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 1, 31),
             room_temp: 7.0,
             temps: 12.0,
             nihonshudo: -21,
             alcohol: 13.7,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 1),
             room_temp: 7.0,
             temps: 11.2,
             nihonshudo: -17,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 2),
             room_temp: 6.5,
             temps: 10.2,
             nihonshudo: -13,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 3),
             room_temp: 7.0,
             temps: 9.7,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 4),
             room_temp: 8.0,
             temps: 9.8,
             nihonshudo: -8,
             alcohol: 16.0,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 5),
             room_temp: 6.0,
             temps: 9.1,
             nihonshudo: -5,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 6),
             room_temp: 5.0,
             temps: 8.4,
             nihonshudo: -3,
             alcohol: 16.3,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 7),
             room_temp: 5.0,
             temps: 8.1,
             nihonshudo: -2,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 8),
             room_temp: 7.0,
             temps: 8.3,
             nihonshudo: 0,
-          ),
-          Job.new(
+          },
+          {
             time: Time.mktime(2019, 2, 9),
             room_temp: 6.0,
             temps: 8.1,
-          ),
+          },
         ],
       }
 
+      DAY_LABELS = {
+        default: [:soe, :odori, :naka, :tome].freeze,
+        moto1: [:moto, :soe, :odori, :naka, :tome].freeze,
+        odori2: [:soe, :odori, :odori, :naka, :tome].freeze,
+      }.freeze
 
-      job_reader :moto
-      job_reader :soe
-      job_reader :naka
-      job_reader :tome
+      state_reader :moto
+      state_reader :soe
+      state_reader :naka
+      state_reader :tome
+      state_reader :yodan
 
-      def initialize(jobs=[], date_line: 0, day_labels: nil)
-        super(jobs, date_line: date_line)
+      attr_writer :prefix_day_labels
 
-        if day_labels
-          @day_labels = [day_labels].flatten
-        end
-      end
-
-      def moromi_days
-        if @day_labels
-          days - @day_labels.length
-        else
-          tome = self[:tome]
-          if tome
-            tome_day = (tome.elapsed_time.to_f / Job::DAY).floor + 1
-            days - tome_day
-          end
-        end
-      end
-
-      def day_labels
-        if @day_labels
-          @day_labels + moromi_days.times.map{|i| i+2}
+      def prefix_day_labels
+        if @prefix_day_labels
+          @prefix_day_labels
+        elsif !self[:soe] && !self[:tome]
+          nil
         else
-          texts = Array.new(days)
-          [:soe, :naka, :tome].each {|id|
-            j = select{|j| j.id==id}.first
-            if j
-              i = ((j.elapsed_time + day_offset) / Job::DAY.to_f).floor
-              texts[i] = id
+          labels = []
+          [:soe, :naka, :tome].each {|mark|
+            s = self[mark]
+            if s
+              i = s.day - 1
+              labels[i] = mark
             end
           }
 
-          soe_i = texts.index(:soe)
-          tome_i = texts.index(:tome)
-          moromi_day = 1
-          texts.map.with_index {|text,i|
-            if text
-              text
+          soe_i = labels.index(:soe)
+          labels.map.with_index {|label,i|
+            if label
+              label
             elsif !soe_i || i<soe_i
               :moto
-            elsif !tome_i || i<tome_i
-              :odori
             else
-              moromi_day += 1
+              :odori
             end
           }
         end
       end
 
+      def moromi_tome_day
+        prefix_day_labels&.length
+      end
+
+      def moromi_days
+        _tome_day = moromi_tome_day
+        _days = self.days
+
+        if _tome_day && _tome_day<_days
+          _days - _tome_day + 1
+        end
+      end
+
+      def day_labels
+        _prefix = prefix_day_labels
+
+        if _prefix
+          _prefix + moromi_days.times.map{|i| i+2}
+        else
+          self.days.times.map{|i| i+1}
+        end
+      end
+
       def progress(enable_annotations: true)
         Graph::Progress.new(self, enable_annotations: enable_annotations)
       end
@@ -229,7 +238,7 @@ module Toji
       end
 
       def self.template(key=:default)
-        new(TEMPLATES[key])
+        create(TEMPLATES[key])
       end
     end
   end

data/lib/toji/brew/shubo.rb

@@ -0,0 +1,122 @@
+module Toji
+  module Brew
+    class Shubo < Base
+
+      TEMPLATES = {
+        default: [
+          {
+            elapsed_time: 0 * Brew::DAY,
+            mark: :mizukoji,
+            temps: 12.0,
+            acid: 13.0,
+          },
+          {
+            elapsed_time: 0 * Brew::DAY + 1 * Brew::HOUR,
+            mark: :shikomi,
+            temps: 20.0,
+            acid: 13.0,
+          },
+          {
+            elapsed_time: 1 * Brew::DAY,
+            mark: :utase,
+            temps: 14.0,
+            baume: 15.0,
+            acid: 13.0,
+          },
+          {
+            elapsed_time: 2 * Brew::DAY,
+            temps: [8.0, 11.0],
+            baume: 16.0,
+            acid: 13.0,
+            warming: WARM_DAKI,
+          },
+          {
+            elapsed_time: 3 * Brew::DAY,
+            temps: [10.0, 13.0],
+            baume: 16.5,
+            acid: 13.5,
+            warming: WARM_DAKI,
+          },
+          {
+            elapsed_time: 4 * Brew::DAY,
+            temps: [12.0, 15.0],
+            baume: 17.0,
+            acid: 13.5,
+            warming: WARM_DAKI,
+          },
+          {
+            elapsed_time: 5 * Brew::DAY,
+            temps: 14.0,
+            baume: 17.0,
+            acid: 14.0,
+            warming: WARM_ANKA,
+          },
+          {
+            elapsed_time: 6 * Brew::DAY,
+            temps: 20.0,
+            baume: 17.0,
+            acid: 14.5,
+            warming: WARM_ANKA,
+          },
+          {
+            elapsed_time: 7 * Brew::DAY,
+            temps: 20.0,
+            baume: 14.0,
+            acid: 15.5,
+          },
+          {
+            elapsed_time: 8 * Brew::DAY,
+            temps: 20.0,
+            baume: 12.0,
+            acid: 16.0,
+          },
+          {
+            elapsed_time: 9 * Brew::DAY,
+            mark: :wake,
+            temps: 20.0,
+            baume: 9.0,
+            acid: 16.0,
+          },
+          {
+            elapsed_time: 10 * Brew::DAY,
+            temps: 15.0,
+            baume: 8.0,
+            acid: 16.5,
+          },
+          {
+            elapsed_time: 11 * Brew::DAY,
+            temps: 12.0,
+            baume: 7.0,
+            acid: 17.0,
+          },
+          {
+            elapsed_time: 12 * Brew::DAY,
+            temps: 10.0,
+            baume: 6.0,
+            acid: 17.5,
+          },
+          {
+            elapsed_time: 13 * Brew::DAY,
+            temps: 9.0,
+            baume: 5.0,
+            acid: 17.5,
+          },
+        ],
+      }
+
+
+      state_reader :mizukoji
+      state_reader :shikomi
+      state_reader :utase
+      state_reader :wake
+
+      def progress(enable_annotations: true)
+        Graph::Progress.new(self, enable_annotations: enable_annotations)
+      end
+
+      def self.template(key=:default)
+        create(TEMPLATES[key])
+      end
+    end
+  end
+end

data/lib/toji/brew/state.rb

@@ -0,0 +1,117 @@
+require 'forwardable'
+
+module Toji
+  module Brew
+    class State
+      extend Forwardable
+
+      attr_accessor :elapsed_time
+      attr_accessor :time
+      attr_accessor :day_label
+      attr_reader :record
+      attr_reader :brew
+
+      def_delegators :@record, :mark
+      def_delegators :@record, :temps
+      def_delegators :@record, :preset_temp
+      def_delegators :@record, :room_temp
+      def_delegators :@record, :room_psychrometry
+      def_delegators :@record, :acid
+      def_delegators :@record, :amino_acid
+      def_delegators :@record, :alcohol
+      def_delegators :@record, :warming
+      def_delegators :@record, :warmings
+      def_delegators :@record, :note
+
+      def_delegators :@record, :has_keys
+
+      def initialize(elapsed_time, record, brew)
+        @elapsed_time = elapsed_time
+        @record = record
+        @brew = brew
+      end
+
+      def has_keys
+        result = [:elapsed_time, :time, :day, :day_label, :display_time]
+        keys = [:moromi_day, :display_baume, :bmd] + StateRecord::KEYS
+
+        result += keys.select {|k|
+          !!send(k)
+        }
+      end
+
+      def day
+        ((elapsed_time_with_offset.to_f + 1) / DAY).ceil
+      end
+
+      def day_label
+        @brew.day_labels[day - 1]
+      end
+
+      def elapsed_time_with_offset
+        @elapsed_time + @brew.day_offset
+      end
+
+      def baume
+        if @record.baume
+          @record.baume
+        elsif @record.nihonshudo
+          @record.nihonshudo * -0.1
+        end
+      end
+
+      def nihonshudo
+        if @record.nihonshudo
+          @record.nihonshudo
+        elsif @record.baume
+          @record.baume * -10
+        end
+      end
+
+      def display_baume
+        if @record.baume || @record.nihonshudo
+          b = baume
+          if b<3.0
+            nihonshudo
+          else
+            b
+          end
+        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_day
+        _tome_day = @brew.moromi_tome_day
+        _now_day = day
+
+        if _tome_day && _tome_day < _now_day
+          _now_day - _tome_day + 1
+        end
+      end
+
+      def bmd
+        _moromi_day = moromi_day
+        _baume = baume
+
+        if _moromi_day && _baume
+          _moromi_day * _baume
+        end
+      end
+
+      def expected_alcohol(target_alc, target_nihonshudo, coef)
+        _baume = baume
+
+        if _baume
+          target_alc - (_baume - target_nihonshudo * -0.1) * coef
+        end
+      end
+    end
+  end
+end

data/lib/toji/{product/job_accessor.rb → brew/state_accessor.rb}

@@ -1,10 +1,10 @@
 module Toji
-  module Product
-    module JobAccessor
-      def job_reader(*args)
+  module Brew
+    module StateAccessor
+      def state_reader(*args)
         args.each {|arg|
           define_method(arg) {
-            self[arg]
+            @data[arg]
           }
         }
       end

data/lib/toji/brew/state_record.rb

@@ -0,0 +1,82 @@
+module Toji
+  module Brew
+    class StateRecord
+      KEYS = [
+        :time,
+        :elapsed_time,
+        :mark,
+        :temps,
+        :preset_temp,
+        :room_temp,
+        :room_psychrometry,
+        :baume,
+        :nihonshudo,
+        :acid,
+        :amino_acid,
+        :alcohol,
+        :warming,
+        :note,
+      ].freeze
+
+      RO_KEYS = [
+        :warmings,
+      ].freeze
+
+      attr_accessor :time
+      attr_accessor :elapsed_time
+      attr_accessor :mark
+      attr_accessor :temps
+
+      attr_accessor :preset_temp
+      attr_accessor :room_temp
+      attr_accessor :room_psychrometry
+
+      attr_accessor :baume
+      attr_accessor :nihonshudo
+      attr_accessor :acid
+      attr_accessor :amino_acid
+      attr_accessor :alcohol
+
+      attr_accessor :warming
+      attr_accessor :note
+
+      def temps=(val)
+        @temps = [val].flatten.select{|t| t}
+      end
+
+      def warmings
+        result = []
+        if @warming & WARM_DAKI
+          result << :daki
+        end
+        if @warming & WARM_ANKA
+          result << :anka
+        end
+        if @warming & WARM_MAT
+          result << :mat
+        end
+        result
+      end
+
+      def self.create(r)
+        if StateRecord===r
+          r
+        elsif State==r
+          r.record
+        elsif Hash===r
+          record = new
+          KEYS.each {|k|
+            record.send("#{k}=", r[k])
+          }
+          record
+        else
+          record = new
+          KEYS.each {|k|
+            record.send("#{k}=", r.send(k))
+          }
+          record
+        end
+      end
+    end
+  end
+end

data/lib/toji/brew.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Brew
+    HOUR = 60 * 60
+    DAY = 24 * HOUR
+
+    WARM_DAKI = 1
+    WARM_ANKA = 1<<1
+    WARM_MAT = 1<<2
+  end
+end
+
+require 'toji/brew/state_accessor'
+require 'toji/brew/base'
+require 'toji/brew/state'
+require 'toji/brew/state_record'
+require 'toji/brew/builder'
+require 'toji/brew/graph'
+
+require 'toji/brew/koji'
+require 'toji/brew/shubo'
+require 'toji/brew/moromi'