toji 1.1.0 → 1.2.0

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

@@ -0,0 +1,23 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        class Actual
+          include Base
+          include Rice::ActualSteamable
+          include ActualFermentable
+
+          def initialize(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+            @raw = raw
+            @soaked = soaked
+            @steaming_water = steaming_water
+            @steamed = steamed
+            @cooled = cooled
+            @tanekoji = tanekoji
+            @dekoji = dekoji
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        module ActualFermentable
+          def tanekoji_rate
+            tanekoji / raw
+          end
+
+          def dekoji_rate
+            (dekoji - raw) / raw
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        module Base
+          include Rice::Base
+
+          # 種麹
+          #
+          # 総破精麹を造るには、種麹の量を麹米100kgあたり種麹100gとする
+          # 突き破精麹を造るには、種麹の量を麹米100kgあたり種麹80gとする
+          #
+          # 出典: 酒造教本 P66
+          attr_reader :tanekoji_rate
+          attr_reader :tanekoji
+
+          # 出麹歩合
+          #
+          # 出麹歩合17〜19%のものが麹菌の繁殖のほどよい麹である
+          #
+          # 出典: 酒造教本 P67
+          attr_reader :dekoji_rate
+          attr_reader :dekoji
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        class Expected
+          include Base
+          include Rice::ExpectedSteamable
+          include ExpectedFermentable
+
+          def initialize(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT, koji_rate: Recipe::KojiRate::DEFAULT)
+            @raw = raw.to_f
+
+            @rice_rate = rice_rate
+            @soaked_rate = rice_rate.soaked_rate
+            @before_steaming_rate = rice_rate.before_steaming_rate
+            @steamed_rate = rice_rate.steamed_rate
+            @cooled_rate = rice_rate.cooled_rate
+
+            @koji_rate = koji_rate
+            @tanekoji_rate = koji_rate.tanekoji_rate
+            @dekoji_rate = koji_rate.dekoji_rate
+          end
+
+          def self.create(x)
+            if self===x
+              x
+            else
+              new(x)
+            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)
+            else
+              x, y = other.coerce(self)
+              x * y
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        module ExpectedFermentable
+          def tanekoji
+            @raw * @tanekoji_rate
+          end
+
+          def dekoji
+            @raw + @raw * @dekoji_rate
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'toji/recipe/ingredient/koji/base'
+require 'toji/recipe/ingredient/koji/expected_fermentable'
+require 'toji/recipe/ingredient/koji/expected'
+require 'toji/recipe/ingredient/koji/actual_fermentable'
+require 'toji/recipe/ingredient/koji/actual'
+
+module Toji
+  module Recipe
+    module Ingredient
+      module Koji
+        def self.expected(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT, koji_rate: Recipe::KojiRate::DEFAULT)
+          Expected.new(raw, rice_rate: rice_rate, koji_rate: koji_rate)
+        end
+
+        def self.actual(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+          Actual.new(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+        end
+      end
+    end
+  end
+end

data/lib/toji/recipe/ingredient/lactic_acid.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Recipe
+    module Ingredient
+      class LacticAcid
+
+        def initialize(total, rate: Recipe::LacticAcidRate::SIMPLE_SOKUJO)
+          @total = total
+          @rate = rate
+        end
+
+        def moto
+          @total * @rate.moto_rate
+        end
+
+        def soe
+          @total * @rate.soe_rate
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        class ActualRice
+          include Base
+          include ActualSteamable
+
+          def initialize(raw, soaked, steaming_water, steamed, cooled)
+            @raw = raw
+            @soaked = soaked
+            @steaming_water = steaming_water
+            @steamed = steamed
+            @cooled = cooled
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        module ActualSteamable
+          def soaked_rate
+            soaking_water / raw
+          end
+
+          def soaking_water
+            soaked - raw
+          end
+
+          def before_steaming_rate
+            # TODO
+          end
+
+          def steamed_rate
+            (steamed - raw) / raw 
+          end
+
+          def cooled_rate
+            (cooled - raw) / raw
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        module Base
+          # 白米
+          attr_reader :raw
+
+          # 浸漬米吸水率
+          #
+          # 標準的な白米吸水率は掛米で30〜35%、麹米で33%前後で許容範囲はかなり狭い
+          #
+          # 出典: 酒造教本 P38
+          attr_reader :soaked_rate
+          attr_reader :soaking_water
+          attr_reader :soaked
+
+          # 蒸米吸水率
+          #
+          # 蒸しにより通常甑置き前の浸漬白米の重量よりさらに12〜13%吸水する
+          # 蒸しにより吸水の増加が13%を超える場合は、蒸米の表面が柔らかくべとつく蒸米になりやすい
+          # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
+          #
+          # 出典: 酒造教本 P48
+          attr_reader :steamed_rate
+          attr_reader :steaming_water
+          attr_reader :steamed
+
+          # 放冷
+          #
+          # 冷却法で若干異なるが蒸米の冷却により掛米で白米重量の10%、麹米で8%程度の水が失われる
+          # 出典: 酒造教本 P49
+          #
+          # 麹を造るのに適した蒸米は、引込時の吸水率が33%を理想とし、許容幅はプラスマイナス1%である
+          # 出典: 酒造教本 P59
+          attr_reader :cooled_rate
+          attr_reader :cooled
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        class Expected
+          include Base
+          include ExpectedSteamable
+
+          def initialize(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT)
+            @raw = raw.to_f
+
+            @rice_rate = rice_rate
+            @soaked_rate = rice_rate.soaked_rate
+            @before_steaming_rate = rice_rate.before_steaming_rate
+            @steamed_rate = rice_rate.steamed_rate
+            @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
+          end
+
+          def *(other)
+            if Integer===other || Float===other
+              self.class.new(@raw * other, rice_rate: @rice_rate)
+            else
+              x, y = other.coerce(self)
+              x * y
+            end
+          end
+
+          def self.create(x)
+            if self===x
+              x
+            else
+              new(x)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        module ExpectedSteamable
+          def soaking_water
+            @raw * @soaked_rate
+          end
+
+          def soaked
+            @raw + @raw * @soaked_rate
+          end
+
+          def steaming_water
+            if @before_steaming_rate
+              @raw * (@before_steaming_rate - @soaked_rate)
+            end
+          end
+
+          def steamed
+            @raw + @raw * @steamed_rate
+          end
+
+          def cooled
+            @raw + @raw * @cooled_rate
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'toji/recipe/ingredient/rice/base'
+require 'toji/recipe/ingredient/rice/expected_steamable'
+require 'toji/recipe/ingredient/rice/expected'
+require 'toji/recipe/ingredient/rice/actual_steamable'
+require 'toji/recipe/ingredient/rice/actual'
+
+module Toji
+  module Recipe
+    module Ingredient
+      module Rice
+        def self.expected(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT)
+          Expected.new(raw, rice_rate: rice_rate)
+        end
+
+        def self.actual(raw, soaked, steaming_water, steamed, cooled)
+          Actual.new(raw, soaked, steaming_water, steamed, cooled)
+        end
+      end
+    end
+  end
+end

data/lib/toji/recipe/ingredient/yeast.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Recipe
+    module Ingredient
+      class Yeast
+
+        def initialize(total, rate: Recipe::YeastRate::RED_STAR)
+          @total = total
+          @rate = rate
+        end
+
+        def yeast
+          @total * @rate.yeast_rate / 1000.0
+        end
+
+        def water
+          yeast * @rate.water_rate
+        end
+      end
+    end
+  end
+end

data/lib/toji/recipe/ingredient.rb

@@ -0,0 +1,11 @@
+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
+    module Ingredient
+    end
+  end
+end

data/lib/toji/recipe/lactic_acid_rate.rb

@@ -0,0 +1,17 @@
+module Toji
+  module Recipe
+    class LacticAcidRate
+      attr_reader :moto_rate
+      attr_reader :soe_rate
+
+      def initialize(moto_rate, soe_rate)
+        @moto_rate = moto_rate
+        @soe_rate = soe_rate
+      end
+
+      SOKUJO = new(0.007, 0.0)
+      SIMPLE_SOKUJO = new(0.006, 0.002)
+      KIMOTO = new(0.0, 0.0)
+    end
+  end
+end

data/lib/toji/recipe/three_step_mashing.rb

@@ -18,13 +18,15 @@ module Toji
       #]
 
       attr_reader :yeast
+      attr_reader :lactic_acid
       attr_reader :steps
 
-      def initialize(yeast_cls, total, template=@@template)
+      def initialize(yeast_rate, lactic_acid_rate, total, template=@@template)
         @total = total
         rate = total / template.map(&:weight_total).sum
 
-        @yeast = yeast_cls.new(total)
+        @yeast = Ingredient::Yeast.new(total, rate: yeast_rate)
+        @lactic_acid = Ingredient::LacticAcid.new(total, rate: lactic_acid_rate)
 
         @steps = template.map {|step|
           step * rate

data/lib/toji/recipe/yeast_rate.rb

@@ -0,0 +1,41 @@
+module Toji
+  module Recipe
+    class YeastRate
+
+      # 1リットル醸造のために必要な酵母の量
+      attr_reader :yeast_rate
+
+      # 乾燥酵母を戻すのに必要な水の量
+      attr_reader :water_rate
+
+      def initialize(yeast_rate, water_rate)
+        @yeast_rate = yeast_rate
+        @water_rate = water_rate
+      end
+
+      # RedStar酵母
+      #
+      # 容量        5g
+      # 醸造可能量  20〜23L
+      #
+      # ドライイーストは、生イーストの保存性を高めるために、その水分を大部分除いたものです。
+      # 使用時にはイーストの10倍以上の30-35℃の無菌のお湯（ミネラルウオーターや湯冷まし）で20-25分程度なじませてください。
+      # これにより水分を再吸収させると同 時に発酵力を回復させ、生イーストの状態にもどします。
+      # このときの温湯の温度が、イーストの発酵力に影響します
+      RED_STAR = new(5.0 / 20.0, 10.0)
+
+      # 酒粕
+      #
+      # 以下の計算式を用いて酒粕にどの程度水を足せば醪時点での緩さになるかを算出する。
+      # 計算が面倒なので麹歩合は無視して蒸米時点での重量とする。
+      #  (白米重量 * 蒸米歩合 + 白米重量 * 汲水歩合) / (粕歩合 * 100) - 1
+      #
+      # 蒸米歩合135%、汲水歩合130%、粕歩合30%の場合、酒粕に対して7.833倍の水を足せば理論上醪と同じ緩さになる。
+      #  (100 * 1.35 + 100 * 1.3) / (0.3 * 100) - 1
+      #   => 7.833333333333334
+      #
+      # しかし櫂入れ出来る程度の緩さになれば良いのではないだろうか。
+      SAKE_LEES = new(5.0, 3.0)
+    end
+  end
+end

data/lib/toji/recipe.rb

@@ -1,5 +1,8 @@
+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'
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/toji.rb

@@ -1,10 +1,8 @@
 require "toji/version"
 require 'active_support/all'
 
-require 'toji/ingredient'
 require 'toji/recipe'
-require 'toji/product'
-require 'toji/graph'
+require 'toji/brew'
 
 module Toji
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,41 +119,44 @@ files:
 - example/shubo.rb
 - example/three_step_mashing_recipe.rb
 - lib/toji.rb
-- lib/toji/graph.rb
-- lib/toji/graph/ab.rb
-- lib/toji/graph/bmd.rb
-- lib/toji/graph/progress.rb
-- lib/toji/ingredient.rb
-- lib/toji/ingredient/koji.rb
-- lib/toji/ingredient/koji/actual.rb
-- lib/toji/ingredient/koji/actual_fermentable.rb
-- lib/toji/ingredient/koji/base.rb
-- lib/toji/ingredient/koji/expected.rb
-- lib/toji/ingredient/koji/expected_fermentable.rb
-- lib/toji/ingredient/rice.rb
-- lib/toji/ingredient/rice/actual.rb
-- lib/toji/ingredient/rice/actual_steamable.rb
-- lib/toji/ingredient/rice/base.rb
-- lib/toji/ingredient/rice/expected.rb
-- lib/toji/ingredient/rice/expected_steamable.rb
-- lib/toji/ingredient/yeast.rb
-- lib/toji/ingredient/yeast/base.rb
-- lib/toji/ingredient/yeast/red_star.rb
-- lib/toji/product.rb
-- lib/toji/product/base.rb
-- lib/toji/product/job.rb
-- lib/toji/product/job_accessor.rb
-- lib/toji/product/koji_making.rb
-- lib/toji/product/moromi.rb
-- lib/toji/product/shubo.rb
+- lib/toji/brew.rb
+- lib/toji/brew/base.rb
+- lib/toji/brew/builder.rb
+- lib/toji/brew/graph.rb
+- lib/toji/brew/graph/ab.rb
+- lib/toji/brew/graph/bmd.rb
+- lib/toji/brew/graph/progress.rb
+- lib/toji/brew/koji.rb
+- lib/toji/brew/moromi.rb
+- lib/toji/brew/shubo.rb
+- lib/toji/brew/state.rb
+- lib/toji/brew/state_accessor.rb
+- lib/toji/brew/state_record.rb
 - lib/toji/recipe.rb
+- lib/toji/recipe/ingredient.rb
+- lib/toji/recipe/ingredient/koji.rb
+- lib/toji/recipe/ingredient/koji/actual.rb
+- lib/toji/recipe/ingredient/koji/actual_fermentable.rb
+- lib/toji/recipe/ingredient/koji/base.rb
+- lib/toji/recipe/ingredient/koji/expected.rb
+- lib/toji/recipe/ingredient/koji/expected_fermentable.rb
+- lib/toji/recipe/ingredient/lactic_acid.rb
+- lib/toji/recipe/ingredient/rice.rb
+- lib/toji/recipe/ingredient/rice/actual.rb
+- lib/toji/recipe/ingredient/rice/actual_steamable.rb
+- lib/toji/recipe/ingredient/rice/base.rb
+- lib/toji/recipe/ingredient/rice/expected.rb
+- lib/toji/recipe/ingredient/rice/expected_steamable.rb
+- lib/toji/recipe/ingredient/yeast.rb
 - lib/toji/recipe/koji_rate.rb
+- lib/toji/recipe/lactic_acid_rate.rb
 - lib/toji/recipe/rice_rate.rb
 - lib/toji/recipe/rice_rate/base.rb
 - lib/toji/recipe/rice_rate/cooked.rb
 - lib/toji/recipe/rice_rate/steamed.rb
 - lib/toji/recipe/step.rb
 - lib/toji/recipe/three_step_mashing.rb
+- lib/toji/recipe/yeast_rate.rb
 - lib/toji/version.rb
 - toji.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-toji