RubyGems - toji - Versions diffs - 2.12.0 → 2.13.0 - Mend

toji 2.12.0 → 2.13.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 (106) hide show

checksums.yaml +4 -4
data/example/calendar.ipynb +42 -51
data/example/calendar.yaml +6 -6
data/example/calendar_file.ipynb +35 -35
data/example/example_core.rb +850 -230
data/example/kake_ingredient.rb +21 -15
data/example/koji_ingredient.rb +31 -21
data/example/{koji_making.ipynb → koji_progress.ipynb} +14 -14
data/example/{koji_making.rb → koji_progress.rb} +3 -2
data/example/{koji_making.yaml → koji_progress.yaml} +8 -9
data/example/{koji_making_multi.ipynb → koji_progress_multi.ipynb} +21 -22
data/example/{moromi.ipynb → moromi_progress.ipynb} +22 -22
data/example/{moromi.rb → moromi_progress.rb} +3 -2
data/example/{moromi.yaml → moromi_progress.yaml} +0 -0
data/example/moto_progress.ipynb +121 -0
data/example/{moto.rb → moto_progress.rb} +3 -2
data/example/{moto.yaml → moto_progress.yaml} +14 -15
data/example/recipe.rb +44 -32
data/lib/toji.rb +4 -2
data/lib/toji/calendar.rb +12 -12
data/lib/toji/calendar/date_column.rb +8 -8
data/lib/toji/calendar/date_row.rb +6 -6
data/lib/toji/ingredient.rb +6 -2
data/lib/toji/ingredient/alcohol.rb +14 -0
data/lib/toji/ingredient/base.rb +11 -0
data/lib/toji/ingredient/kake.rb +3 -9
data/lib/toji/ingredient/koji.rb +19 -10
data/lib/toji/ingredient/lactic_acid.rb +14 -0
data/lib/toji/ingredient/rice.rb +50 -4
data/lib/toji/ingredient/tanekoji.rb +29 -0
data/lib/toji/ingredient/water.rb +18 -0
data/lib/toji/ingredient/yeast.rb +20 -0
data/lib/toji/processing.rb +18 -0
data/lib/toji/processing/base.rb +7 -0
data/lib/toji/processing/cooled_rice.rb +22 -0
data/lib/toji/processing/cooled_rice_element.rb +8 -0
data/lib/toji/processing/dekoji.rb +22 -0
data/lib/toji/processing/dekoji_element.rb +8 -0
data/lib/toji/processing/kake_processing.rb +7 -0
data/lib/toji/processing/koji_processing.rb +10 -0
data/lib/toji/processing/rice_processing.rb +19 -0
data/lib/toji/processing/soaked_rice.rb +49 -0
data/lib/toji/processing/soaked_rice_element.rb +18 -0
data/lib/toji/processing/steamed_rice.rb +22 -0
data/lib/toji/processing/steamed_rice_element.rb +8 -0
data/lib/toji/product.rb +11 -32
data/lib/toji/product/schedule_factory.rb +74 -0
data/lib/toji/progress.rb +23 -0
data/lib/toji/progress/base_progress.rb +37 -0
data/lib/toji/progress/base_state.rb +39 -0
data/lib/toji/progress/builder.rb +53 -0
data/lib/toji/progress/graph.rb +11 -0
data/lib/toji/{brew → progress}/graph/ab.rb +4 -4
data/lib/toji/{brew → progress}/graph/bmd.rb +2 -2
data/lib/toji/{brew/graph/multi_progress.rb → progress/graph/multi_progress_note.rb} +11 -11
data/lib/toji/{brew/graph/progress.rb → progress/graph/progress_note.rb} +20 -18
data/lib/toji/progress/koji_progress.rb +15 -0
data/lib/toji/progress/koji_state.rb +23 -0
data/lib/toji/{brew/moromi.rb → progress/moromi_progress.rb} +9 -5
data/lib/toji/progress/moromi_state.rb +77 -0
data/lib/toji/progress/moto_progress.rb +15 -0
data/lib/toji/progress/moto_state.rb +31 -0
data/lib/toji/progress/progress.rb +15 -0
data/lib/toji/progress/state.rb +9 -0
data/lib/toji/progress/state/baume_to_nihonshudo.rb +21 -0
data/lib/toji/progress/state/nihonshudo_to_baume.rb +21 -0
data/lib/toji/recipe.rb +53 -39
data/lib/toji/recipe/ab_expect.rb +2 -2
data/lib/toji/recipe/action.rb +2 -2
data/lib/toji/recipe/step.rb +97 -71
data/lib/toji/schedule.rb +5 -0
data/lib/toji/schedule/action_schedule.rb +9 -0
data/lib/toji/{event → schedule}/base.rb +1 -1
data/lib/toji/schedule/kake_schedule.rb +11 -0
data/lib/toji/schedule/koji_schedule.rb +11 -0
data/lib/toji/schedule/rice_schedule.rb +16 -0
data/lib/toji/utils.rb +43 -0
data/lib/toji/version.rb +1 -1
metadata +58 -44
data/lib/toji/brew.rb +0 -18
data/lib/toji/brew/base.rb +0 -55
data/lib/toji/brew/builder.rb +0 -98
data/lib/toji/brew/graph.rb +0 -11
data/lib/toji/brew/koji.rb +0 -11
data/lib/toji/brew/moto.rb +0 -11
data/lib/toji/brew/state.rb +0 -122
data/lib/toji/brew/wrapped_state.rb +0 -109
data/lib/toji/event.rb +0 -5
data/lib/toji/event/action_event.rb +0 -12
data/lib/toji/event/kake_event.rb +0 -13
data/lib/toji/event/koji_event.rb +0 -19
data/lib/toji/event/rice_event.rb +0 -34
data/lib/toji/ingredient/kake/actual.rb +0 -26
data/lib/toji/ingredient/kake/base.rb +0 -18
data/lib/toji/ingredient/kake/expected.rb +0 -40
data/lib/toji/ingredient/koji/actual.rb +0 -29
data/lib/toji/ingredient/koji/actual_fermentable.rb +0 -15
data/lib/toji/ingredient/koji/base.rb +0 -35
data/lib/toji/ingredient/koji/expected.rb +0 -45
data/lib/toji/ingredient/koji/expected_fermentable.rb +0 -15
data/lib/toji/ingredient/koji_rate.rb +0 -16
data/lib/toji/ingredient/rice/actual_steamable.rb +0 -27
data/lib/toji/ingredient/rice/base.rb +0 -40
data/lib/toji/ingredient/rice/expected_steamable.rb +0 -27
data/lib/toji/ingredient/rice_rate.rb +0 -23
data/lib/toji/product/event_factory.rb +0 -70

data/lib/toji/event/action_event.rb DELETED

@@ -1,12 +0,0 @@
-require 'toji/event/base'
-module Toji
-  module Event
-    module ActionEvent
-      include Event
-      attr_reader :index
-    end
-  end
-end

data/lib/toji/event/kake_event.rb DELETED

@@ -1,13 +0,0 @@
-require 'toji/event/rice_event'
-module Toji
-  module Event
-    module KakeEvent
-      include RiceEvent
-      def rice_type
-        :kake
-      end
-    end
-  end
-end

data/lib/toji/event/koji_event.rb DELETED

@@ -1,19 +0,0 @@
-require 'toji/event/rice_event'
-module Toji
-  module Event
-    module KojiEvent
-      include RiceEvent
-      attr_reader :dekoji
-      def rice_type
-        :koji
-      end
-      def dekoji_rate
-        (dekoji.to_f - raw.to_f) / raw.to_f
-      end
-    end
-  end
-end

data/lib/toji/event/rice_event.rb DELETED

@@ -1,34 +0,0 @@
-require 'toji/event/base'
-module Toji
-  module Event
-    module RiceEvent
-      include Base
-      attr_reader :rice_type
-      attr_reader :index
-      attr_reader :step_indexes
-      attr_reader :raw
-      attr_reader :soaked
-      attr_reader :steamed
-      attr_reader :cooled
-      def type
-        :rice
-      end
-      def soaked_rate
-        (soaked.to_f - raw.to_f) / raw.to_f
-      end
-      def steamed_rate
-        (steamed.to_f - raw.to_f) / raw.to_f
-      end
-      def cooled_rate
-        (cooled.to_f - raw.to_f) / raw.to_f
-      end
-    end
-  end
-end

data/lib/toji/ingredient/kake/actual.rb DELETED

@@ -1,26 +0,0 @@
-module Toji
-  module Ingredient
-    module Kake
-      class Actual
-        include Base
-        include Rice::ActualSteamable
-        def initialize(raw, soaked, steamed, cooled)
-          @raw = raw.to_f
-          @soaked = soaked.to_f
-          @steamed = steamed.to_f
-          @cooled = cooled.to_f
-        end
-        def *(other)
-          if Integer===other || Float===other
-            Actual.new(raw * other, soaked * other, steamed * other, cooled * other)
-          else
-            x, y = other.coerce(self)
-            x * y
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/kake/base.rb DELETED

@@ -1,18 +0,0 @@
-module Toji
-  module Ingredient
-    module Kake
-      module Base
-        include Rice::Base
-        def +(other)
-          if Base===other
-            Actual.new(raw + other.raw, soaked + other.soaked, steamed + other.steamed, cooled + other.cooled)
-          else
-            x, y = other.coerce(self)
-            x + y
-          end
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/kake/expected.rb DELETED

@@ -1,40 +0,0 @@
-module Toji
-  module Ingredient
-    module Kake
-      class Expected
-        include Base
-        include Rice::ExpectedSteamable
-        def initialize(raw, rice_rate: RiceRate::DEFAULT)
-          @raw = raw.to_f
-          @rice_rate = rice_rate
-          @soaked_rate = rice_rate.soaked_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

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

@@ -1,29 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      class Actual
-        include Base
-        include Rice::ActualSteamable
-        include ActualFermentable
-        def initialize(raw, soaked, steamed, cooled, tanekoji, dekoji)
-          @raw = raw.to_f
-          @soaked = soaked.to_f
-          @steamed = steamed.to_f
-          @cooled = cooled.to_f
-          @tanekoji = tanekoji.to_f
-          @dekoji = dekoji.to_f
-        end
-        def *(other)
-          if Integer===other || Float===other
-            Actual.new(raw * other, soaked * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
-          else
-            x, y = other.coerce(self)
-            x * y
-          end
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1,35 +0,0 @@
-module Toji
-  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, 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

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

@@ -1,45 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      class Expected
-        include Base
-        include Rice::ExpectedSteamable
-        include ExpectedFermentable
-        def initialize(raw, rice_rate: RiceRate::DEFAULT, koji_rate: KojiRate::DEFAULT)
-          @raw = raw.to_f
-          @rice_rate = rice_rate
-          @soaked_rate = rice_rate.soaked_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

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

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

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

@@ -1,16 +0,0 @@
-module Toji
-  module Ingredient
-    class KojiRate
-      attr_reader :tanekoji_rate
-      attr_reader :dekoji_rate
-      def initialize(tanekoji_rate, dekoji_rate)
-        @tanekoji_rate = tanekoji_rate
-        @dekoji_rate = dekoji_rate
-      end
-      DEFAULT = new(0.001, 0.18)
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      module ActualSteamable
-        def soaked_rate
-          soaking_water / raw
-        end
-        def soaking_water
-          soaked - raw
-        end
-        def steamed_rate
-          (steamed - raw) / raw
-        end
-        def steaming_water
-          steamed - raw
-        end
-        def cooled_rate
-          (cooled - raw) / raw
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-module Toji
-  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

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

@@ -1,27 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      module ExpectedSteamable
-        def soaking_water
-          raw * soaked_rate
-        end
-        def soaked
-          raw + raw * soaked_rate
-        end
-        def steaming_water
-          raw * steamed_rate
-        end
-        def steamed
-          raw + raw * steamed_rate
-        end
-        def cooled
-          raw + raw * cooled_rate
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-module Toji
-  module Ingredient
-    class RiceRate
-      # 浸漬米吸水率
-      attr_reader :soaked_rate
-      # 蒸米吸水率
-      attr_reader :steamed_rate
-      # 放冷後蒸米吸水率
-      attr_reader :cooled_rate
-      def initialize(soaked_rate, steamed_rate, cooled_rate)
-        @soaked_rate = soaked_rate
-        @steamed_rate = steamed_rate
-        @cooled_rate = cooled_rate
-      end
-      DEFAULT = new(0.33, 0.41, 0.33)
-    end
-  end
-end