toji 1.6.8 → 2.0.0

data/lib/toji/ingredient/rice_rate.rb

@@ -0,0 +1,35 @@
+module Toji
+  module Ingredient
+    class RiceRate
+      # 浸漬米吸水率
+      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)
+        @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)
+    end
+  end
+end

data/lib/toji/product.rb

@@ -0,0 +1,65 @@
+require 'toji/product/event'
+
+module Toji
+  module Product
+    attr_reader :reduce_key
+    attr_accessor :name
+    attr_accessor :recipe
+    attr_accessor :start_date
+
+    def koji_dates
+      date = start_date
+      recipe.steps.map {|step|
+        date = date.next_day(step.koji_interval_days)
+      }
+    end
+
+    def kake_dates
+      date = start_date
+      recipe.steps.map {|step|
+        date = date.next_day(step.kake_interval_days)
+      }
+    end
+
+    def events
+      events = []
+
+      koji_dates.length.times {|i|
+        events << Event.new(self, :koji, i)
+      }
+
+      kake_dates.length
+        .times.map {|i|
+          Event.new(self, :kake, i)
+        }
+        .delete_if {|e|
+          4<=e.index && e.weight==0
+        }
+        .each {|e|
+          events << e
+        }
+
+      events
+    end
+
+    def events_group
+      events.group_by{|event|
+        event.group_key
+      }.map {|group_key,events|
+        breakdown = events.map {|event|
+          {index: event.index, weight: event.weight}
+        }
+        if 1<breakdown.length
+          breakdown = breakdown.select{|event| 0<event[:weight]}
+        end
+
+        {
+          date: events.first.date,
+          type: events.first.type,
+          weight: events.map(&:weight).sum,
+          breakdown: breakdown,
+        }
+      }
+    end
+  end
+end

data/lib/toji/{schedule/product_event.rb → product/event.rb}

@@ -1,6 +1,6 @@
 module Toji
-  module Schedule
-    class ProductEvent
+  module Product
+    class Event
       attr_reader :product
       attr_reader :type
       attr_reader :index
@@ -30,14 +30,14 @@ module Toji
 
       def group_key
         a = []
-        a << (product.id || product.name)
+        a << product.reduce_key
         a << type
         a << group_index
         a.map(&:to_s).join(":")
       end
 
       def weight
-        @product.recipe.steps[@index].send(@type).raw
+        @product.recipe.steps[@index].send(@type)
       end
 
       def to_h

data/lib/toji/recipe.rb

@@ -1,11 +1,126 @@
-require 'toji/recipe/ingredient'
-require 'toji/recipe/rice_rate'
-require 'toji/recipe/koji_rate'
-require 'toji/recipe/yeast_rate'
 require 'toji/recipe/step'
-require 'toji/recipe/three_step_mashing'
 
 module Toji
   module Recipe
+    attr_accessor :steps
+
+    def scale(rice_total)
+      rate = rice_total / steps.map(&:rice_total).sum
+      new_steps = steps.map {|step|
+        step * rate
+      }
+
+      self.class.new.tap {|o|
+        o.steps = new_steps
+      }
+    end
+
+    def round(ndigit=0, half: :up)
+      new_steps = steps.map {|step|
+        step.round(ndigit, half: half)
+      }
+
+      self.class.new.tap {|o|
+        o.steps = new_steps
+      }
+    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)
+
+      rice_total.map.with_index {|x,i|
+        rice_total[0..i].inject(&:+)
+      }
+    end
+
+    # 酒母歩合の累計
+    def cumulative_shubo_rates
+      rice_total = steps.map(&:rice_total)
+      shubo = rice_total.first
+
+      rice_total.map.with_index {|x,i|
+        shubo / rice_total[0..i].inject(&:+)
+      }
+    end
+
+    # 酒母歩合
+    #
+    # 7%が標準である
+    # 汲水歩合が大きい高温糖化酒母では6%程度である
+    #
+    # 出典: 酒造教本 P96
+    def shubo_rate
+      cumulative_shubo_rates.last || 0.0
+    end
+
+    # 白米比率
+    #
+    # 発酵型と白米比率
+    #   発酵の型    酒母  添  仲  留  特徴
+    #   湧き進め型     1   2   4   6  短期醪、辛口、軽快な酒質
+    #   湧き抑え型     1   2   4   7  長期醪、甘口、おだやかな酒質
+    #
+    # 出典: 酒造教本 P95
+    def rice_rates
+      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]
+
+      cells = [keys]
+      cells += @steps.map {|step|
+        [step.rice_total, step.kake, step.koji, step.alcohol, step.water, step.lactic_acid]
+      }
+      cells << keys.map {|key|
+        @steps.map(&key).compact.sum
+      }
+
+      cells = cells.map {|cell|
+        cell.map {|c|
+          case c
+          when NilClass
+            ""
+          when 0
+            ""
+          else
+            c
+          end
+        }
+      }
+
+      {header: headers, rows: cells.transpose}
+    end
+
+    def table
+      data = table_data
+
+      Plotly::Plot.new(
+        data: [{
+          type: :table,
+          header: {
+            values: data[:header]
+          },
+          cells: {
+            values: data[:rows].transpose
+          },
+        }],
+        layout: {
+        }
+      )
+    end
   end
 end

data/lib/toji/recipe/step.rb

@@ -1,30 +1,19 @@
 module Toji
   module Recipe
-    class Step
-      attr_reader :name
-      attr_reader :rice
-      attr_reader :koji
-      attr_reader :water
-      attr_reader :lactic_acid
-      attr_reader :alcohol
-
-      def initialize(name:, rice: 0, koji: 0, water: 0, lactic_acid: 0, alcohol: 0)
-        @name = name
-        @rice = Ingredient::Rice::Expected.create(rice)
-        @koji = Ingredient::Koji::Expected.create(koji)
-        @water = water.to_f
-        @lactic_acid = lactic_acid.to_f
-        @alcohol = alcohol.to_f
-      end
+    module Step
+      attr_accessor :name
+      attr_accessor :kake
+      attr_accessor :koji
+      attr_accessor :water
+      attr_accessor :lactic_acid
+      attr_accessor :alcohol
+      attr_accessor :yeast
+      attr_accessor :koji_interval_days
+      attr_accessor :kake_interval_days
 
       # 総米
       def rice_total
-        @rice.raw + @koji.raw
-      end
-
-      # 総重量
-      def weight_total
-        @rice.cooled + @koji.dekoji + @water + @lactic_acid + @alcohol
+        kake + koji
       end
 
       # 麹歩合
@@ -33,7 +22,7 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        ret = @koji.raw / rice_total
+        ret = koji / rice_total
         ret.nan? ? 0.0 : ret
       end
 
@@ -47,7 +36,7 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        ret = @water / rice_total
+        ret = water / rice_total
         ret.nan? ? 0.0 : ret
       end
 
@@ -56,26 +45,32 @@ module Toji
           acid_ndigit = ndigit + 3
         end
 
-        self.class.new(
-          name: @name,
-          rice: @rice.round(ndigit, half: half),
-          koji: @koji.round(ndigit, half: half),
-          water: @water.round(ndigit, half: half),
-          lactic_acid: @lactic_acid.round(acid_ndigit, half: half),
-          alcohol: @alcohol.round(ndigit, half: half)
-        )
+        self.class.new.tap {|o|
+          o.name = name
+          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.alcohol = alcohol.round(ndigit, half: half)
+          o.yeast = yeast.round(ndigit, half: half)
+          o.koji_interval_days = koji_interval_days
+          o.kake_interval_days = kake_interval_days
+        }
       end
 
       def +(other)
         if Step===other
-          self.class.new(
-            name: nil,
-            rice: @rice + other.rice,
-            koji: @koji + other.koji,
-            water: @water + other.water,
-            lactic_acid: @lactic_acid + other.lactic_acid,
-            alcohol: @alcohol + other.alcohol
-          )
+          self.class.new.tap {|o|
+            o.name = nil
+            o.kake = kake + other.kake
+            o.koji = koji + other.koji
+            o.water = water + other.water
+            o.lactic_acid = lactic_acid + other.lactic_acid
+            o.alcohol = alcohol + other.alcohol
+            o.yeast = yeast + other.yeast
+            o.koji_interval_days = koji_interval_days
+            o.kake_interval_days = kake_interval_days
+          }
         else
           x, y = other.coerce(self)
           x + y
@@ -84,30 +79,22 @@ module Toji
 
       def *(other)
         if Integer===other || Float===other
-          self.class.new(
-            name: @name,
-            rice: @rice * other,
-            koji: @koji * other,
-            water: @water * other,
-            lactic_acid: @lactic_acid * other,
-            alcohol: @alcohol * other
-           )
+          self.class.new.tap {|o|
+            o.name = name
+            o.kake = kake * other
+            o.koji = koji * other
+            o.water = water * other
+            o.lactic_acid = lactic_acid * other
+            o.alcohol = alcohol * other
+            o.yeast = yeast * other
+            o.koji_interval_days = koji_interval_days
+            o.kake_interval_days = kake_interval_days
+          }
         else
           x, y = other.coerce(self)
           x * y
         end
       end
-
-      def to_h
-        {
-          name: name,
-          rice: rice.raw,
-          koji: koji.raw,
-          water: water,
-          lactic_acid: lactic_acid,
-          alcohol: alcohol,
-        }
-      end
     end
   end
 end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.6.8"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/calendar.ipynb
+- example/calendar.yaml
+- example/calendar_file.ipynb
+- example/example_core.rb
+- example/kake_recipe.rb
 - example/koji_making.ipynb
 - example/koji_making.rb
 - example/koji_making.yaml
@@ -117,14 +122,10 @@ files:
 - example/moromi.ipynb
 - example/moromi.rb
 - example/moromi.yaml
-- example/rice_recipe.rb
-- example/schedule.ipynb
-- example/schedule.yaml
-- example/schedule_file.ipynb
+- example/recipe.rb
 - example/shubo.ipynb
 - example/shubo.rb
 - example/shubo.yaml
-- example/three_step_mashing_recipe.rb
 - lib/toji.rb
 - lib/toji/brew.rb
 - lib/toji/brew/base.rb
@@ -138,38 +139,31 @@ files:
 - 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/brew/state_wrapper.rb
+- lib/toji/calendar.rb
+- lib/toji/calendar/date_column.rb
+- lib/toji/calendar/date_row.rb
+- lib/toji/ingredient.rb
+- lib/toji/ingredient/kake.rb
+- lib/toji/ingredient/kake/actual.rb
+- lib/toji/ingredient/kake/base.rb
+- lib/toji/ingredient/kake/expected.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/koji_rate.rb
+- lib/toji/ingredient/rice.rb
+- lib/toji/ingredient/rice/actual_steamable.rb
+- lib/toji/ingredient/rice/base.rb
+- lib/toji/ingredient/rice/expected_steamable.rb
+- lib/toji/ingredient/rice_rate.rb
+- lib/toji/product.rb
+- lib/toji/product/event.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/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/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/schedule.rb
-- lib/toji/schedule/calendar.rb
-- lib/toji/schedule/date_column.rb
-- lib/toji/schedule/date_interval_enumerator.rb
-- lib/toji/schedule/date_row.rb
-- lib/toji/schedule/product.rb
-- lib/toji/schedule/product_event.rb
 - lib/toji/version.rb
 - toji.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-toji
@@ -194,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.