toji 1.2.0 → 1.3.0

data/lib/toji/brew/base.rb

@@ -4,8 +4,34 @@ module Toji
       include Enumerable
       extend StateAccessor
 
+      REQUIRED_KEYS = [
+        :time,
+        :elapsed_time,
+        :day,
+        :day_label,
+        :display_time,
+      ].freeze
+
+      OPTIONAL_KEYS = [
+        :moromi_day,
+        :mark,
+        :temps,
+        :preset_temp,
+        :room_temp,
+        :room_psychrometry,
+        :baume,
+        :nihonshudo,
+        :display_baume,
+        :acid,
+        :amino_acid,
+        :alcohol,
+        :bmd,
+        :warming,
+        :warmings,
+        :note,
+      ].freeze
+
       attr_reader :day_offset
-      attr_accessor :day_labels
 
       def initialize(records, date_line)
         @date_line = date_line
@@ -14,8 +40,8 @@ module Toji
 
       def records=(records)
         records = records.map{|r| StateRecord.create(r)}
-        min_time = records.select{|j| j.time}.map(&:time).sort.first
-        @states = records.map{|j| State.new(j.elapsed_time, j, self)}
+        min_time = records.select{|r| r.time}.map(&:time).sort.first
+        @states = records.map{|r| State.new(r.elapsed_time, r, self)}
 
         # time
         if min_time
@@ -40,11 +66,6 @@ module Toji
         end
         @day_offset += ((24 - @date_line) % 24) * HOUR
 
-        # day_label
-        @states.each {|s|
-          s.day_label = s.day + 1
-        }
-
         # mark hash
         @hash = {}
         @states.select{|s| s.record.mark}.each {|s|
@@ -60,6 +81,10 @@ module Toji
         days.times.map(&:succ)
       end
 
+      def moromi_tome_day
+        nil
+      end
+
       def [](mark)
         @hash[mark]
       end
@@ -72,6 +97,14 @@ module Toji
         @states.each(&block)
       end
 
+      def has_keys
+        result = REQUIRED_KEYS.clone
+
+        result += OPTIONAL_KEYS.select {|k|
+          @states.find {|s| s.send(k).present?}
+        }
+      end
+
       def self.create(records, date_line: 0)
         if Base===records
           records

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

@@ -10,13 +10,9 @@ module Toji
           @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
+            keys = @data.has_keys
           end
 
           result = []
@@ -76,15 +72,16 @@ module Toji
 
         def table_data(keys=nil)
           if !keys
-            keys = has_keys
+            keys = @data.has_keys
             keys.delete(:elapsed_time)
             keys.delete(:time)
             keys.delete(:day)
             keys.delete(:moromi_day)
             keys.delete(:baume)
             keys.delete(:nihonshudo)
+            keys.delete(:warming)
           else
-            keys &= has_keys
+            keys &= @data.has_keys
           end
 
           cells = @data.map {|s|

data/lib/toji/brew/state.rb

@@ -7,7 +7,6 @@ module Toji
 
       attr_accessor :elapsed_time
       attr_accessor :time
-      attr_accessor :day_label
       attr_reader :record
       attr_reader :brew
 
@@ -23,23 +22,12 @@ module Toji
       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

data/lib/toji/recipe/ingredient/koji/actual.rb

@@ -16,6 +16,15 @@ module Toji
             @tanekoji = tanekoji
             @dekoji = dekoji
           end
+
+          def *(other)
+            if Integer===other || Float===other
+              Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
+            else
+              x, y = other.coerce(self)
+              x * y
+            end
+          end
         end
       end
     end

data/lib/toji/recipe/ingredient/koji/base.rb

@@ -21,6 +21,15 @@ module Toji
           # 出典: 酒造教本 P67
           attr_reader :dekoji_rate
           attr_reader :dekoji
+
+          def +(other)
+            if Base===other
+              Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled, tanekoji + other.tanekoji, dekoji + other.dekoji)
+            else
+              x, y = other.coerce(self)
+              x + y
+            end
+          end
         end
       end
     end

data/lib/toji/recipe/ingredient/koji/expected.rb

@@ -21,6 +21,10 @@ module Toji
             @dekoji_rate = koji_rate.dekoji_rate
           end
 
+          def round(ndigit=0, half: :up)
+            self.class.new(@raw.round(ndigit, half: half), rice_rate: @rice_rate, koji_rate: @koji_rate)
+          end
+
           def self.create(x)
             if self===x
               x
@@ -29,15 +33,6 @@ module Toji
             end
           end
 
-          def +(other)
-            if Base===other
-              Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled, tanekoji + other.tanekoji, dekoji + other.dekoji)
-            else
-              x, y = other.coerce(self)
-              x + y
-            end
-          end
-
           def *(other)
             if Integer===other || Float===other
               Expected.new(@raw * other, rice_rate: @rice_rate, koji_rate: @koji_rate)

data/lib/toji/recipe/ingredient/rice/actual.rb

@@ -2,7 +2,7 @@ module Toji
   module Recipe
     module Ingredient
       module Rice
-        class ActualRice
+        class Actual
           include Base
           include ActualSteamable
 
@@ -13,6 +13,15 @@ module Toji
             @steamed = steamed
             @cooled = cooled
           end
+
+          def *(other)
+            if Integer===other || Float===other
+              Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other)
+            else
+              x, y = other.coerce(self)
+              x * y
+            end
+          end
         end
       end
     end

data/lib/toji/recipe/ingredient/rice/base.rb

@@ -35,6 +35,15 @@ module Toji
           # 出典: 酒造教本 P59
           attr_reader :cooled_rate
           attr_reader :cooled
+
+          def +(other)
+            if Base===other
+              Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
+            else
+              x, y = other.coerce(self)
+              x + y
+            end
+          end
         end
       end
     end

data/lib/toji/recipe/ingredient/rice/expected.rb

@@ -16,13 +16,8 @@ module Toji
             @cooled_rate = rice_rate.cooled_rate
           end
 
-          def +(other)
-            if Base===other
-              Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
-            else
-              x, y = other.coerce(self)
-              x + y
-            end
+          def round(ndigit=0, half: :up)
+            self.class.new(@raw.round(ndigit, half: half), rice_rate: @rice_rate)
           end
 
           def *(other)

data/lib/toji/recipe/ingredient.rb

@@ -1,7 +1,6 @@
 require 'toji/recipe/ingredient/rice'
 require 'toji/recipe/ingredient/koji'
 require 'toji/recipe/ingredient/yeast'
-require 'toji/recipe/ingredient/lactic_acid'
 
 module Toji
   module Recipe

data/lib/toji/recipe/step.rb

@@ -1,14 +1,20 @@
 module Toji
   module Recipe
     class Step
+      attr_reader :name
       attr_reader :rice
       attr_reader :koji
       attr_reader :water
+      attr_reader :lactic_acid
+      attr_reader :alcohol
 
-      def initialize(rice, koji, water)
+      def initialize(name:, rice: 0, koji: 0, water: 0, lactic_acid: 0, alcohol: 0)
+        @name = name
         @rice = Ingredient::Rice::Expected.create(rice)
         @koji = Ingredient::Koji::Expected.create(koji)
         @water = water.to_f
+        @lactic_acid = lactic_acid.to_f
+        @alcohol = alcohol.to_f
       end
 
       # 総米
@@ -18,7 +24,7 @@ module Toji
 
       # 総重量
       def weight_total
-        @rice.cooled + @koji.dekoji + @water
+        @rice.cooled + @koji.dekoji + @water + @lactic_acid + @alcohol
       end
 
       # 麹歩合
@@ -43,9 +49,31 @@ module Toji
         @water / rice_total
       end
 
+      def round(ndigit=0, acid_ndigit=nil, half: :up)
+        if !acid_ndigit
+          acid_ndigit = ndigit + 3
+        end
+
+        self.class.new(
+          name: @name,
+          rice: @rice.round(ndigit, half: half),
+          koji: @koji.round(ndigit, half: half),
+          water: @water.round(ndigit, half: half),
+          lactic_acid: @lactic_acid.round(acid_ndigit, half: half),
+          alcohol: @alcohol.round(ndigit, half: half)
+        )
+      end
+
       def +(other)
         if Step===other
-          self.class.new(@rice + other.rice, @koji + other.koji, @water + other.water)
+          self.class.new(
+            name: nil,
+            rice: @rice + other.rice,
+            koji: @koji + other.koji,
+            water: @water + other.water,
+            lactic_acid: @lactic_acid + other.lactic_acid,
+            alcohol: @alcohol + other.alcohol
+          )
         else
           x, y = other.coerce(self)
           x + y
@@ -54,7 +82,14 @@ module Toji
 
       def *(other)
         if Integer===other || Float===other
-          self.class.new(@rice * other, @koji * other, @water * other)
+          self.class.new(
+            name: @name,
+            rice: @rice * other,
+            koji: @koji * other,
+            water: @water * other,
+            lactic_acid: @lactic_acid * other,
+            alcohol: @alcohol * other
+           )
         else
           x, y = other.coerce(self)
           x * y

data/lib/toji/recipe/three_step_mashing.rb

@@ -2,43 +2,45 @@ module Toji
   module Recipe
     class ThreeStepMashing
 
-      STEP_NAMES = ["酒母", "初添", "仲添", "留添"]
-
-      @@template = [
-        Step.new(93, 47, 170),
-        Step.new(217, 99, 270),
-        Step.new(423, 143, 670),
-        Step.new(813, 165, 1330),
-      ]
-      #@@template = [
-      #  Step.new(45, 20, 70),
-      #  Step.new(100, 40, 130),
-      #  Step.new(215, 60, 330),
-      #  Step.new(360, 80, 630),
-      #]
-
-      attr_reader :yeast
-      attr_reader :lactic_acid
       attr_reader :steps
+      attr_reader :yeast
+
+      attr_accessor :moto_days
+      attr_accessor :odori_days
 
-      def initialize(yeast_rate, lactic_acid_rate, total, template=@@template)
-        @total = total
-        rate = total / template.map(&:weight_total).sum
+      def initialize(steps, yeast_rate, moto_days: 1, odori_days: 1)
+        @steps = steps
 
-        @yeast = Ingredient::Yeast.new(total, rate: yeast_rate)
-        @lactic_acid = Ingredient::LacticAcid.new(total, rate: lactic_acid_rate)
+        @yeast_rate = yeast_rate
+        weight_total = @steps.map(&:weight_total).sum
+        @yeast = Ingredient::Yeast.new(weight_total, rate: yeast_rate)
 
-        @steps = template.map {|step|
+        @moto_days = moto_days
+        @odori_days = odori_days
+      end
+
+      def scale(rice_total, yeast_rate=@yeast_rate)
+        rate = rice_total / @steps.map(&:rice_total).sum
+        new_steps = @steps.map {|step|
           step * rate
         }
+
+        self.class.new(new_steps, yeast_rate, moto_days: @moto_days, odori_days: @odori_days)
+      end
+
+      def round(ndigit=0, half: :up)
+        new_steps = @steps.map {|step|
+          step.round(ndigit, half: half)
+        }
+        self.class.new(new_steps, @yeast_rate, moto_days: @moto_days, odori_days: @odori_days)
       end
 
       # 内容量の累計
       def cumulative_weight_totals
-        total = @steps.map(&:weight_total)
+        weight_total = @steps.map(&:weight_total)
 
-        total.map.with_index {|x,i|
-          total[0..i].inject(:+)
+        weight_total.map.with_index {|x,i|
+          weight_total[0..i].inject(:+)
         }
       end
 
@@ -84,6 +86,179 @@ module Toji
           step.rice_total / @steps[0].rice_total
         }
       end
+
+      def table_data
+        headers = [""] + @steps.map(&:name) + [:total]
+        keys = [:rice_total, :rice, :koji, :alcohol, :water, :lactic_acid]
+
+        cells = [keys]
+        cells += @steps.map {|step|
+          [step.rice_total, step.rice, step.koji, step.alcohol, step.water, step.lactic_acid]
+        }
+        cells << keys.map {|key|
+          @steps.map(&key).compact.sum
+        }
+
+        cells = cells.map {|cell|
+          cell.map {|c|
+            if Ingredient::Rice::Base===c
+              c = c.raw
+            end
+
+            case c
+            when NilClass
+              ""
+            when 0
+              ""
+            else
+              c
+            end
+          }
+        }
+
+        {header: headers, cells: cells}
+      end
+
+      def table
+        data = table_data
+
+        Plotly::Plot.new(
+          data: [{
+            type: :table,
+            header: {
+              values: data[:header]
+            },
+            cells: {
+              values: data[:cells]
+            },
+          }],
+          layout: {
+          }
+        )
+      end
+
+
+      # 乳酸は汲水100L当たり比重1.21の乳酸(90%乳酸と称される)を650〜720ml添加する。
+      # ここでは間をとって685mlとする
+      #
+      # 出典: 酒造教本 P38
+      TEMPLATES = {
+        # 酒造教本による標準型仕込配合
+        # 出典: 酒造教本 P97
+        sokujo_textbook: new(
+          [
+            Step.new(
+              name: :moto,
+              rice: 45,
+              koji: 20,
+              water: 70,
+              lactic_acid: 70*6.85/1000
+            ),
+            Step.new(
+              name: :soe,
+              rice: 100,
+              koji: 40,
+              water: 130
+            ),
+            Step.new(
+              name: :naka,
+              rice: 215,
+              koji: 60,
+              water: 330
+            ),
+            Step.new(
+              name: :tome,
+              rice: 360,
+              koji: 80,
+              water: 630
+            ),
+            Step.new(
+              name: :yodan,
+              rice: 80,
+              water: 120
+            ),
+          ],
+          YeastRate::RED_STAR,
+          moto_days: 14,
+          odori_days: 1,
+        ),
+        # 灘における仕込配合の平均値
+        # 出典: http://www.nada-ken.com/main/jp/index_shi/234.html
+        sokujo_nada: new(
+          [
+            Step.new(
+              name: :moto,
+              rice: 93,
+              koji: 47,
+              water: 170,
+              lactic_acid: 170*6.85/1000
+            ),
+            Step.new(
+              name: :soe,
+              rice: 217,
+              koji: 99,
+              water: 270
+            ),
+            Step.new(
+              name: :naka,
+              rice: 423,
+              koji: 143,
+              water: 670
+            ),
+            Step.new(
+              name: :tome,
+              rice: 813,
+              koji: 165,
+              water: 1330
+            ),
+            Step.new(
+              name: :alcohol,
+              alcohol: 900
+            ),
+          ],
+          YeastRate::RED_STAR,
+          moto_days: 14,
+          odori_days: 1,
+        ),
+        # 簡易酒母省略仕込
+        # 出典: https://www.jstage.jst.go.jp/article/jbrewsocjapan1915/60/11/60_11_999/_article/-char/ja/
+        simple_sokujo_himeno: new(
+          [
+            Step.new(
+              name: :moto,
+              rice: 0,
+              koji: 70,
+              water: 245,
+              lactic_acid: 1.6
+            ),
+            Step.new(
+              name: :soe,
+              rice: 130,
+              koji: 0,
+              water: 0
+            ),
+            Step.new(
+              name: :naka,
+              rice: 300,
+              koji: 100,
+              water: 400
+            ),
+            Step.new(
+              name: :tome,
+              rice: 490,
+              koji: 110,
+              water: 800
+            ),
+            Step.new(
+              name: :yodan,
+              water: 255
+            ),
+          ],
+          YeastRate::RED_STAR,
+          moto_days: 1,
+          odori_days: 2,
+        ),
+      }.freeze
     end
   end
 end

data/lib/toji/recipe.rb

@@ -2,7 +2,6 @@ require 'toji/recipe/ingredient'
 require 'toji/recipe/rice_rate'
 require 'toji/recipe/koji_rate'
 require 'toji/recipe/yeast_rate'
-require 'toji/recipe/lactic_acid_rate'
 require 'toji/recipe/step'
 require 'toji/recipe/three_step_mashing'