toji 2.2.0 → 2.3.0

data/lib/toji/brew/state.rb

@@ -98,7 +98,7 @@ module Toji
       def self.create(val)
         if State===val
           val
-        elsif StateWrapper==val
+        elsif WrappedState==val
           val.state
         #elsif Hash===val
         #  #s = Class.new {

data/lib/toji/brew/{state_wrapper.rb → wrapped_state.rb}

@@ -2,7 +2,7 @@ require 'forwardable'
 
 module Toji
   module Brew
-    class StateWrapper
+    class WrappedState
       extend Forwardable
 
       attr_accessor :elapsed_time
@@ -21,8 +21,9 @@ module Toji
       def_delegators :@state, :warmings
       def_delegators :@state, :note
 
-      def initialize(elapsed_time, state, brew)
-        @elapsed_time = elapsed_time
+      def initialize(state, brew)
+        @elapsed_time = state.elapsed_time
+        @time = state.time
         @state = state
         @brew = brew
       end
@@ -69,8 +70,8 @@ module Toji
       def display_time(format="%m/%d %H:%M")
         if @time
           @time.strftime(format)
-        elsif @brew.min_time
-          time = @brew.min_time + @elapsed_time
+        elsif @brew.base_time
+          time = @brew.base_time + @elapsed_time
           time.strftime(format)
         else
           utc_offset = Time.at(0).utc_offset

data/lib/toji/ingredient/kake.rb

@@ -9,8 +9,8 @@ module Toji
         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)
+      def self.actual(raw, soaked, steamed, cooled)
+        Actual.new(raw, soaked, steamed, cooled)
       end
     end
   end

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

@@ -5,17 +5,16 @@ module Toji
         include Base
         include Rice::ActualSteamable
 
-        def initialize(raw, soaked, steaming_water, steamed, cooled)
-          @raw = raw
-          @soaked = soaked
-          @steaming_water = steaming_water
-          @steamed = steamed
-          @cooled = cooled
+        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, steaming_water * other, steamed * other, cooled * other)
+            Actual.new(raw * other, soaked * other, steamed * other, cooled * other)
           else
             x, y = other.coerce(self)
             x * y

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

@@ -6,7 +6,7 @@ module Toji
 
         def +(other)
           if Base===other
-            Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
+            Actual.new(raw + other.raw, soaked + other.soaked, steamed + other.steamed, cooled + other.cooled)
           else
             x, y = other.coerce(self)
             x + y

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

@@ -10,7 +10,6 @@ module Toji
 
           @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

data/lib/toji/ingredient/koji.rb

@@ -11,8 +11,8 @@ module Toji
         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)
+      def self.actual(raw, soaked, steamed, cooled, tanekoji, dekoji)
+        Actual.new(raw, soaked, steamed, cooled, tanekoji, dekoji)
       end
     end
   end

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

@@ -6,19 +6,18 @@ module Toji
         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
+        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, steaming_water * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
+            Actual.new(raw * other, soaked * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
           else
             x, y = other.coerce(self)
             x * y

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

@@ -23,7 +23,7 @@ module Toji
 
         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)
+            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

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

@@ -11,7 +11,6 @@ module Toji
 
           @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
 

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

@@ -10,14 +10,14 @@ module Toji
           soaked - raw
         end
 
-        def before_steaming_rate
-          # TODO
-        end
-
         def steamed_rate
           (steamed - raw) / raw 
         end
 
+        def steaming_water
+          steamed - raw
+        end
+
         def cooled_rate
           (cooled - raw) / raw
         end

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

@@ -21,7 +21,6 @@ module Toji
         # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
         #
         # 出典: 酒造教本 P48
-        attr_reader :before_steaming_rate
         attr_reader :steamed_rate
         attr_reader :steaming_water
         attr_reader :steamed

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

@@ -11,9 +11,7 @@ module Toji
         end
 
         def steaming_water
-          if before_steaming_rate
-            raw * (before_steaming_rate - soaked_rate)
-          end
+          raw * steamed_rate
         end
 
         def steamed

data/lib/toji/ingredient/rice_rate.rb

@@ -4,32 +4,20 @@ module Toji
       # 浸漬米吸水率
       attr_reader :soaked_rate
 
-      # 蒸し前浸漬米吸水率
-      # 炊飯の場合は水を追加
-      # 蒸しの場合は一晩経って蒸発した分を削減
-      attr_reader :before_steaming_rate
-
       # 蒸米吸水率
       attr_reader :steamed_rate
 
       # 放冷後蒸米吸水率
       attr_reader :cooled_rate
 
-      def initialize(soaked_rate, before_steaming_rate, steamed_rate, cooled_rate)
+      def initialize(soaked_rate, steamed_rate, cooled_rate)
         @soaked_rate = soaked_rate
-        @before_steaming_rate = before_steaming_rate
         @steamed_rate = steamed_rate
         @cooled_rate = cooled_rate
       end
 
-      def before_steaming_rate
-        @before_steaming_rate || begin
-          @soaked_rate - 0.04
-        end
-      end
-
 
-      DEFAULT = new(0.33, nil, 0.41, 0.33)
+      DEFAULT = new(0.33, 0.41, 0.33)
     end
   end
 end

data/lib/toji/recipe.rb

@@ -15,9 +15,9 @@ module Toji
       }
     end
 
-    def round(ndigit=0, half: :up)
+    def round(ndigit=0, mini_ndigit=nil, half: :up)
       new_steps = steps.map {|step|
-        step.round(ndigit, half: half)
+        step.round(ndigit, mini_ndigit, half: half)
       }
 
       self.class.new.tap {|o|
@@ -25,15 +25,6 @@ module Toji
       }
     end
 
-    # 内容量の累計
-    def cumulative_weight_totals
-      weight_total = steps.map(&:weight_total)
-
-      weight_total.map.with_index {|x,i|
-        weight_total[0..i].inject(:+)
-      }
-    end
-
     # 総米の累計
     def cumulative_rice_totals
       rice_total = steps.map(&:rice_total)

data/lib/toji/recipe/step.rb

@@ -13,7 +13,7 @@ module Toji
 
       # 総米
       def rice_total
-        kake + koji
+        [kake, koji].compact.map(&:to_f).sum
       end
 
       # 麹歩合
@@ -22,8 +22,7 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        ret = koji / rice_total
-        ret.nan? ? 0.0 : ret
+        (koji || 0.0) / rice_total
       end
 
       # 汲水歩合
@@ -36,13 +35,12 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        ret = water / rice_total
-        ret.nan? ? 0.0 : ret
+        (water || 0.0) / rice_total
       end
 
-      def round(ndigit=0, acid_ndigit=nil, half: :up)
-        if !acid_ndigit
-          acid_ndigit = ndigit + 3
+      def round(ndigit=0, mini_ndigit=nil, half: :up)
+        if !mini_ndigit
+          mini_ndigit = ndigit + 3
         end
 
         self.class.new.tap {|o|
@@ -50,9 +48,9 @@ module Toji
           o.kake = kake.round(ndigit, half: half)
           o.koji = koji.round(ndigit, half: half)
           o.water = water.round(ndigit, half: half)
-          o.lactic_acid = lactic_acid.round(acid_ndigit, half: half)
+          o.lactic_acid = lactic_acid.round(mini_ndigit, half: half)
           o.alcohol = alcohol.round(ndigit, half: half)
-          o.yeast = yeast.round(ndigit, half: half)
+          o.yeast = yeast.round(mini_ndigit, half: half)
           o.koji_interval_days = koji_interval_days
           o.kake_interval_days = kake_interval_days
         }
@@ -61,7 +59,7 @@ module Toji
       def +(other)
         if Step===other
           self.class.new.tap {|o|
-            o.name = nil
+            o.name = name
             o.kake = kake + other.kake
             o.koji = koji + other.koji
             o.water = water + other.water

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,12 +113,12 @@ files:
 - example/calendar.yaml
 - example/calendar_file.ipynb
 - example/example_core.rb
-- example/kake_recipe.rb
+- example/kake_ingredient.rb
+- example/koji_ingredient.rb
 - example/koji_making.ipynb
 - example/koji_making.rb
 - example/koji_making.yaml
 - example/koji_making_multi.ipynb
-- example/koji_recipe.rb
 - example/moromi.ipynb
 - example/moromi.rb
 - example/moromi.yaml
@@ -139,7 +139,7 @@ files:
 - lib/toji/brew/moromi.rb
 - lib/toji/brew/shubo.rb
 - lib/toji/brew/state.rb
-- lib/toji/brew/state_wrapper.rb
+- lib/toji/brew/wrapped_state.rb
 - lib/toji/calendar.rb
 - lib/toji/calendar/date_column.rb
 - lib/toji/calendar/date_row.rb