RubyGems - toji - Versions diffs - 1.6.8 → 2.3.0 - Mend

toji 1.6.8 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (86) hide show

checksums.yaml +4 -4
data/example/calendar.ipynb +383 -0
data/example/{schedule.yaml → calendar.yaml} +6 -30
data/example/calendar_file.ipynb +338 -0
data/example/example_core.rb +354 -0
data/example/kake_ingredient.rb +26 -0
data/example/{koji_recipe.rb → koji_ingredient.rb} +1 -2
data/example/koji_making.ipynb +16 -15
data/example/koji_making.rb +2 -1
data/example/koji_making.yaml +10 -9
data/example/koji_making_multi.ipynb +27 -61
data/example/moromi.ipynb +25 -24
data/example/moromi.rb +1 -0
data/example/moromi.yaml +10 -4
data/example/recipe.rb +75 -0
data/example/shubo.ipynb +15 -14
data/example/shubo.rb +2 -1
data/example/shubo.yaml +12 -11
data/lib/toji.rb +3 -1
data/lib/toji/brew.rb +4 -3
data/lib/toji/brew/base.rb +8 -92
data/lib/toji/brew/builder.rb +77 -6
data/lib/toji/brew/graph/bmd.rb +1 -2
data/lib/toji/brew/graph/multi_progress.rb +0 -121
data/lib/toji/brew/graph/progress.rb +17 -52
data/lib/toji/brew/koji.rb +2 -11
data/lib/toji/brew/moromi.rb +4 -37
data/lib/toji/brew/shubo.rb +2 -6
data/lib/toji/brew/state.rb +90 -103
data/lib/toji/brew/wrapped_state.rb +136 -0
data/lib/toji/calendar.rb +123 -0
data/lib/toji/{schedule → calendar}/date_column.rb +3 -6
data/lib/toji/{schedule → calendar}/date_row.rb +6 -6
data/lib/toji/ingredient.rb +10 -0
data/lib/toji/ingredient/kake.rb +17 -0
data/lib/toji/ingredient/kake/actual.rb +26 -0
data/lib/toji/ingredient/kake/base.rb +18 -0
data/lib/toji/ingredient/kake/expected.rb +40 -0
data/lib/toji/ingredient/koji.rb +19 -0
data/lib/toji/ingredient/koji/actual.rb +29 -0
data/lib/toji/ingredient/koji/actual_fermentable.rb +15 -0
data/lib/toji/ingredient/koji/base.rb +35 -0
data/lib/toji/ingredient/koji/expected.rb +45 -0
data/lib/toji/ingredient/koji/expected_fermentable.rb +15 -0
data/lib/toji/{recipe → ingredient}/koji_rate.rb +1 -1
data/lib/toji/ingredient/rice.rb +10 -0
data/lib/toji/ingredient/rice/actual_steamable.rb +27 -0
data/lib/toji/ingredient/rice/base.rb +40 -0
data/lib/toji/ingredient/rice/expected_steamable.rb +27 -0
data/lib/toji/ingredient/rice_rate.rb +23 -0
data/lib/toji/product.rb +65 -0
data/lib/toji/{schedule/product_event.rb → product/event.rb} +4 -4
data/lib/toji/recipe.rb +111 -5
data/lib/toji/recipe/step.rb +49 -64
data/lib/toji/version.rb +1 -1
metadata +33 -39
data/example/rice_recipe.rb +0 -28
data/example/schedule.ipynb +0 -393
data/example/schedule_file.ipynb +0 -337
data/example/three_step_mashing_recipe.rb +0 -67
data/lib/toji/brew/state_accessor.rb +0 -13
data/lib/toji/brew/state_record.rb +0 -72
data/lib/toji/recipe/ingredient.rb +0 -10
data/lib/toji/recipe/ingredient/koji.rb +0 -21
data/lib/toji/recipe/ingredient/koji/actual.rb +0 -32
data/lib/toji/recipe/ingredient/koji/actual_fermentable.rb +0 -17
data/lib/toji/recipe/ingredient/koji/base.rb +0 -37
data/lib/toji/recipe/ingredient/koji/expected.rb +0 -48
data/lib/toji/recipe/ingredient/koji/expected_fermentable.rb +0 -17
data/lib/toji/recipe/ingredient/rice.rb +0 -21
data/lib/toji/recipe/ingredient/rice/actual.rb +0 -29
data/lib/toji/recipe/ingredient/rice/actual_steamable.rb +0 -29
data/lib/toji/recipe/ingredient/rice/base.rb +0 -51
data/lib/toji/recipe/ingredient/rice/expected.rb +0 -43
data/lib/toji/recipe/ingredient/rice/expected_steamable.rb +0 -31
data/lib/toji/recipe/ingredient/yeast.rb +0 -21
data/lib/toji/recipe/rice_rate.rb +0 -10
data/lib/toji/recipe/rice_rate/base.rb +0 -21
data/lib/toji/recipe/rice_rate/cooked.rb +0 -67
data/lib/toji/recipe/rice_rate/steamed.rb +0 -30
data/lib/toji/recipe/three_step_mashing.rb +0 -274
data/lib/toji/recipe/yeast_rate.rb +0 -41
data/lib/toji/schedule.rb +0 -11
data/lib/toji/schedule/calendar.rb +0 -139
data/lib/toji/schedule/date_interval_enumerator.rb +0 -45
data/lib/toji/schedule/product.rb +0 -117

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

@@ -1,10 +0,0 @@
-require 'toji/recipe/ingredient/rice'
-require 'toji/recipe/ingredient/koji'
-require 'toji/recipe/ingredient/yeast'
-module Toji
-  module Recipe
-    module Ingredient
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-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/koji/actual.rb DELETED

@@ -1,32 +0,0 @@
-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
-          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
-  end
-end

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

@@ -1,17 +0,0 @@
-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 DELETED

@@ -1,37 +0,0 @@
-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
-          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
-  end
-end

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

@@ -1,48 +0,0 @@
-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 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
-            else
-              new(x)
-            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 DELETED

@@ -1,17 +0,0 @@
-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/rice.rb DELETED

@@ -1,21 +0,0 @@
-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/rice/actual.rb DELETED

@@ -1,29 +0,0 @@
-module Toji
-  module Recipe
-    module Ingredient
-      module Rice
-        class Actual
-          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
-          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
-  end
-end

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

@@ -1,29 +0,0 @@
-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 DELETED

@@ -1,51 +0,0 @@
-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
-          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
-  end
-end

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

@@ -1,43 +0,0 @@
-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 round(ndigit=0, half: :up)
-            self.class.new(@raw.round(ndigit, half: half), rice_rate: @rice_rate)
-          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 DELETED

@@ -1,31 +0,0 @@
-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/yeast.rb DELETED

@@ -1,21 +0,0 @@
-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/rice_rate.rb DELETED

@@ -1,10 +0,0 @@
-require 'toji/recipe/rice_rate/base'
-require 'toji/recipe/rice_rate/cooked'
-require 'toji/recipe/rice_rate/steamed'
-module Toji
-  module Recipe
-    module RiceRate
-    end
-  end
-end

data/lib/toji/recipe/rice_rate/base.rb DELETED

@@ -1,21 +0,0 @@
-module Toji
-  module Recipe
-    module RiceRate
-      module Base
-        # 浸漬米吸水率
-        attr_reader :soaked_rate
-        # 蒸し前浸漬米吸水率
-        # 炊飯の場合は水を追加
-        # 蒸しの場合は一晩経って蒸発した分を削減
-        attr_reader :before_steaming_rate
-        # 蒸米吸水率
-        attr_reader :steamed_rate
-        # 放冷後蒸米吸水率
-        attr_reader :cooled_rate
-      end
-    end
-  end
-end