toji 2.9.0 → 2.13.1

data/lib/toji/progress/state/nihonshudo_to_baume.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Progress
+    module State
+      module NihonshudoToBaume
+        def baume
+          if self.nihonshudo
+            self.nihonshudo / -10.0
+          end
+        end
+
+        def baume=(val)
+          if val
+            self.nihonshudo = val.to_f * -10
+          else
+            self.nihonshudo = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/recipe.rb

@@ -1,44 +1,45 @@
 require 'toji/recipe/step'
+require 'toji/recipe/action'
 require 'toji/recipe/ab_expect'
 
 module Toji
   module Recipe
-    attr_accessor :steps
-    attr_accessor :has_moto
-    attr_accessor :has_moromi
-    attr_accessor :ab_coef
-    attr_accessor :ab_expects
-    attr_accessor :squeeze_interval_days
-
-    def scale(rice_total)
-      rate = rice_total / steps.map(&:rice_total).sum
-      new_steps = steps.map {|step|
-        step * rate
+    attr_reader :steps
+    attr_reader :actions
+    attr_reader :ab_coef
+    attr_reader :ab_expects
+
+    def scale_rice_total(rice_total)
+      ratio = rice_total / steps.map(&:rice_total).sum
+      scale(ratio)
+    end
+
+    def scale!(ratio)
+      steps.each {|step|
+        step.scale!(ratio)
       }
+      self
+    end
+
+    def scale(ratio)
+      Utils.check_dup(self)
+
+      dst = self.dup
+      dst.scale!(ratio)
+    end
 
-      self.class.new.tap {|o|
-        o.steps = new_steps
-        o.has_moto = has_moto
-        o.has_moromi = has_moromi
-        o.ab_coef = ab_coef
-        o.ab_expects = ab_expects.deep_dup
-        o.squeeze_interval_days = squeeze_interval_days
+    def round!(ndigit=0, mini_ndigit=nil, half: :up)
+      steps.each {|step|
+        step.round!(ndigit, mini_ndigit, half: half)
       }
+      self
     end
 
     def round(ndigit=0, mini_ndigit=nil, half: :up)
-      new_steps = steps.map {|step|
-        step.round(ndigit, mini_ndigit, half: half)
-      }
+      Utils.check_dup(self)
 
-      self.class.new.tap {|o|
-        o.steps = new_steps
-        o.has_moto = has_moto
-        o.has_moromi = has_moromi
-        o.ab_coef = ab_coef
-        o.ab_expects = ab_expects.deep_dup
-        o.squeeze_interval_days = squeeze_interval_days
-      }
+      dst = self.dup
+      dst.round!(ndigit, mini_ndigit, half: half)
     end
 
     # 総米の累計
@@ -51,7 +52,7 @@ module Toji
     end
 
     # 酒母歩合の累計
-    def cumulative_moto_rates
+    def cumulative_moto_ratios
       rice_total = steps.map(&:rice_total)
       moto = rice_total.first
 
@@ -66,8 +67,8 @@ module Toji
     # 汲水歩合が大きい高温糖化酒母では6%程度である
     #
     # 出典: 酒造教本 P96
-    def moto_rate
-      cumulative_moto_rates.last || 0.0
+    def moto_ratio
+      cumulative_moto_ratios.last || 0.0
     end
 
     # 白米比率
@@ -78,22 +79,34 @@ module Toji
     #   湧き抑え型     1   2   4   7  長期醪、甘口、おだやかな酒質
     #
     # 出典: 酒造教本 P95
-    def rice_rates
+    def rice_ratios
       steps.map {|step|
         step.rice_total / steps.first.rice_total
       }
     end
 
     def table_data
-      headers = [""] + steps.map(&:name) + [:total]
-      keys = [:rice_total, :kake, :koji, :alcohol, :water, :lactic_acid]
+      headers = [""] + steps.map.with_index{|s,i| :"Step#{i}"} + [:total]
+      keys = [["RiceTotal", :rice_total], ["Kake", :kakes], ["Koji", :kojis], ["Alcohol", :alcohols], ["Water", :waters], ["LacticAcid", :lactic_acids]]
 
-      cells = [keys]
+      cells = [keys.map(&:first)]
       cells += steps.map {|step|
-        [step.rice_total, step.kake, step.koji, step.alcohol, step.water, step.lactic_acid]
+        keys.map(&:last).map {|key|
+          vals = step.send(key)
+          if Numeric===vals
+            vals
+          else
+            vals.compact.map(&:weight).sum
+          end
+        }
       }
-      cells << keys.map {|key|
-        steps.map(&key).compact.sum
+      cells << keys.map(&:last).map {|key|
+        vals = steps.map(&key)
+        if Numeric===vals[0]
+          vals.sum
+        else
+          vals.flatten.compact.map(&:weight).sum
+        end
       }
 
       cells = cells.map {|cell|

data/lib/toji/recipe/ab_expect.rb

@@ -1,8 +1,8 @@
 module Toji
   module Recipe
     module AbExpect
-      attr_accessor :alcohol
-      attr_accessor :nihonshudo
+      attr_reader :alcohol
+      attr_reader :nihonshudo
     end
   end
 end

data/lib/toji/recipe/action.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Recipe
+    module Action
+      attr_reader :type
+      attr_reader :interval_days
+    end
+  end
+end

data/lib/toji/recipe/step.rb

@@ -1,25 +1,31 @@
 module Toji
   module Recipe
     module Step
-      attr_accessor :koji
-      attr_accessor :koji_soaked_rate
-      attr_accessor :koji_steamed_rate
-      attr_accessor :koji_dekoji_rate
-      attr_accessor :koji_interval_days
-
-      attr_accessor :kake
-      attr_accessor :kake_soaked_rate
-      attr_accessor :kake_steamed_rate
-      attr_accessor :kake_interval_days
-
-      attr_accessor :water
-      attr_accessor :lactic_acid
-      attr_accessor :alcohol
-      attr_accessor :yeast
+      attr_accessor :kojis
+      attr_accessor :kakes
+      attr_accessor :waters
+      attr_accessor :lactic_acids
+      attr_accessor :alcohols
+      attr_accessor :yeasts
+
+      # 麹米
+      def koji_total
+        (kojis || []).map(&:weight).map(&:to_f).sum.to_f
+      end
+
+      # 掛米
+      def kake_total
+        (kakes || []).map(&:weight).map(&:to_f).sum.to_f
+      end
 
       # 総米
       def rice_total
-        kake.to_f + koji.to_f
+        koji_total + kake_total
+      end
+
+      # 汲水
+      def water_total
+        (waters || []).map(&:weight).map(&:to_f).sum.to_f
       end
 
       # 麹歩合
@@ -27,8 +33,8 @@ module Toji
       # 留め仕込みまでの総米重量の20〜22%が標準である
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
-      def koji_rate
-        val = koji.to_f / rice_total
+      def koji_ratio
+        val = koji_total / rice_total
         val.nan? ? 0.0 : val
       end
 
@@ -41,54 +47,90 @@ module Toji
       # 全体: 留までの総米に対し120〜130%、標準は125%、高級酒は130〜145%である
       #
       # 出典: 酒造教本 P96
-      def water_rate
-        val = water.to_f / rice_total
+      def water_ratio
+        val = water_total / rice_total
         val.nan? ? 0.0 : val
       end
 
-      def round(ndigit=0, mini_ndigit=nil, half: :up)
+      def scale!(ratio)
+        kojis&.each {|koji|
+          koji.weight *= ratio
+        }
+        kakes&.each {|kake|
+          kake.weight *= ratio
+        }
+        waters&.each {|water|
+          water.weight *= ratio
+        }
+        lactic_acids&.each {|lactic_acid|
+          lactic_acid.weight *= ratio
+        }
+        alcohols&.each {|alcohol|
+          alcohol.weight *= ratio
+        }
+        yeasts&.each {|yeast|
+          yeast.weight *= ratio
+        }
+        self
+      end
+
+      def scale(ratio)
+        Utils.check_dup(self)
+
+        dst = self.dup
+        dst.scale!(ratio)
+      end
+
+      def round!(ndigit=0, mini_ndigit=nil, half: :up)
         if !mini_ndigit
           mini_ndigit = ndigit + 3
         end
 
-        self.class.new.tap {|o|
-          o.koji = koji.to_f.round(ndigit, half: half)
-          o.koji_soaked_rate = koji_soaked_rate.to_f
-          o.koji_steamed_rate = koji_steamed_rate.to_f
-          o.koji_dekoji_rate = koji_dekoji_rate.to_f
-          o.koji_interval_days = koji_interval_days.to_i
-
-          o.kake = kake.to_f.round(ndigit, half: half)
-          o.kake_soaked_rate = kake_soaked_rate.to_f
-          o.kake_steamed_rate = kake_steamed_rate.to_f
-          o.kake_interval_days = kake_interval_days.to_i
-
-          o.water = water.to_f.round(ndigit, half: half)
-          o.lactic_acid = lactic_acid.to_f.round(mini_ndigit, half: half)
-          o.alcohol = alcohol.to_f.round(ndigit, half: half)
-          o.yeast = yeast.to_f.round(mini_ndigit, half: half)
+        kojis&.each {|koji|
+          koji.weight = koji.weight.to_f.round(ndigit, half: half)
+        }
+        kakes&.each {|kake|
+          kake.weight = kake.weight.to_f.round(ndigit, half: half)
+        }
+        waters&.each {|water|
+          water.weight = water.weight.to_f.round(ndigit, half: half)
         }
+        lactic_acids&.each {|lactic_acid|
+          lactic_acid.weight = lactic_acid.weight.to_f.round(mini_ndigit, half: half)
+        }
+        alcohols&.each {|alcohol|
+          alcohol.weight = alcohol.weight.to_f.round(ndigit, half: half)
+        }
+        yeasts&.each {|yeast|
+          yeast.weight = yeast.weight.to_f.round(mini_ndigit, half: half)
+        }
+
+        self
+      end
+
+      def round(ndigit=0, mini_ndigit=nil, half: :up)
+        Utils.check_dup(self)
+
+        dst = self.dup
+        dst.round!(ndigit, mini_ndigit, half: half)
       end
 
       def +(other)
         if Step===other
-          self.class.new.tap {|o|
-            o.koji = koji.to_f + other.koji.to_f
-            o.koji_soaked_rate = koji_soaked_rate.to_f
-            o.koji_steamed_rate = koji_steamed_rate.to_f
-            o.koji_dekoji_rate = koji_dekoji_rate.to_f
-            o.koji_interval_days = koji_interval_days.to_i
-
-            o.kake = kake.to_f + other.kake.to_f
-            o.kake_soaked_rate = kake_soaked_rate.to_f
-            o.kake_steamed_rate = kake_steamed_rate.to_f
-            o.kake_interval_days = kake_interval_days.to_i
-
-            o.water = water.to_f + other.water.to_f
-            o.lactic_acid = lactic_acid.to_f + other.lactic_acid.to_f
-            o.alcohol = alcohol.to_f + other.alcohol.to_f
-            o.yeast = yeast.to_f + other.yeast.to_f
-          }
+          Utils.check_dup(self)
+          Utils.check_dup(other)
+
+          dst = self.dup
+          other = other.dup
+
+          dst.kojis = Utils.merge_ingredients(dst.kojis, other.kojis)
+          dst.kakes = Utils.merge_ingredients(dst.kakes, other.kakes)
+          dst.waters = Utils.merge_ingredients(dst.waters, other.waters)
+          dst.lactic_acids = Utils.merge_ingredients(dst.lactic_acids, other.lactic_acids)
+          dst.alcohols = Utils.merge_ingredients(dst.alcohols, other.alcohols)
+          dst.yeasts = Utils.merge_ingredients(dst.yeasts, other.yeasts)
+
+          dst
         else
           x, y = other.coerce(self)
           x + y
@@ -97,23 +139,7 @@ module Toji
 
       def *(other)
         if Integer===other || Float===other
-          self.class.new.tap {|o|
-            o.koji = koji.to_f * other
-            o.koji_soaked_rate = koji_soaked_rate.to_f
-            o.koji_steamed_rate = koji_steamed_rate.to_f
-            o.koji_dekoji_rate = koji_dekoji_rate.to_f
-            o.koji_interval_days = koji_interval_days.to_i
-
-            o.kake = kake.to_f * other
-            o.kake_soaked_rate = kake_soaked_rate.to_f
-            o.kake_steamed_rate = kake_steamed_rate.to_f
-            o.kake_interval_days = kake_interval_days.to_i
-
-            o.water = water.to_f * other
-            o.lactic_acid = lactic_acid.to_f * other
-            o.alcohol = alcohol.to_f * other
-            o.yeast = yeast.to_f * other
-          }
+          scale(other)
         else
           x, y = other.coerce(self)
           x * y

data/lib/toji/schedule.rb

@@ -0,0 +1,5 @@
+require 'toji/schedule/base'
+require 'toji/schedule/rice_schedule'
+require 'toji/schedule/koji_schedule'
+require 'toji/schedule/kake_schedule'
+require 'toji/schedule/action_schedule'

data/lib/toji/schedule/action_schedule.rb

@@ -0,0 +1,9 @@
+module Toji
+  module Schedule
+    module ActionSchedule
+      include Base
+
+      attr_reader :index
+    end
+  end
+end

data/lib/toji/schedule/base.rb

@@ -0,0 +1,9 @@
+module Toji
+  module Schedule
+    module Base
+      attr_reader :product
+      attr_reader :date
+      attr_reader :type
+    end
+  end
+end

data/lib/toji/schedule/kake_schedule.rb

@@ -0,0 +1,11 @@
+module Toji
+  module Schedule
+    module KakeSchedule
+      include RiceSchedule
+
+      def rice_type
+        :kake
+      end
+    end
+  end
+end

data/lib/toji/schedule/koji_schedule.rb

@@ -0,0 +1,11 @@
+module Toji
+  module Schedule
+    module KojiSchedule
+      include RiceSchedule
+
+      def rice_type
+        :koji
+      end
+    end
+  end
+end

data/lib/toji/schedule/rice_schedule.rb

@@ -0,0 +1,16 @@
+module Toji
+  module Schedule
+    module RiceSchedule
+      include Base
+
+      attr_reader :rice_type
+      attr_reader :step_indexes
+
+      attr_reader :expect
+
+      def type
+        :rice
+      end
+    end
+  end
+end