toji 2.11.0 → 2.15.0

data/lib/toji/recipe/ab_expect.rb

@@ -1,8 +1,8 @@
 module Toji
   module Recipe
     module AbExpect
-      attr_accessor :alcohol
-      attr_accessor :nihonshudo
+      attr_reader :alcohol
+      attr_reader :nihonshudo
     end
   end
 end

data/lib/toji/recipe/action.rb

@@ -1,8 +1,8 @@
 module Toji
   module Recipe
     module Action
-      attr_accessor :type
-      attr_accessor :interval_days
+      attr_reader :type
+      attr_reader :interval_days
     end
   end
 end

data/lib/toji/recipe/step.rb

@@ -1,25 +1,33 @@
 module Toji
   module Recipe
     module Step
-      attr_accessor :koji
-      attr_accessor :koji_soaked_rate
-      attr_accessor :koji_steamed_rate
-      attr_accessor :koji_dekoji_rate
-      attr_accessor :koji_interval_days
-
-      attr_accessor :kake
-      attr_accessor :kake_soaked_rate
-      attr_accessor :kake_steamed_rate
-      attr_accessor :kake_interval_days
-
-      attr_accessor :water
-      attr_accessor :lactic_acid
-      attr_accessor :alcohol
-      attr_accessor :yeast
+      attr_reader :index
+      attr_reader :subindex
+      attr_accessor :kojis
+      attr_accessor :kakes
+      attr_accessor :waters
+      attr_accessor :lactic_acids
+      attr_accessor :alcohols
+      attr_accessor :yeasts
+
+      # 麹米
+      def koji_total
+        (kojis || []).map(&:weight).map(&:to_f).sum.to_f
+      end
+
+      # 掛米
+      def kake_total
+        (kakes || []).map(&:weight).map(&:to_f).sum.to_f
+      end
 
       # 総米
       def rice_total
-        kake.to_f + koji.to_f
+        koji_total + kake_total
+      end
+
+      # 汲水
+      def water_total
+        (waters || []).map(&:weight).map(&:to_f).sum.to_f
       end
 
       # 麹歩合
@@ -27,8 +35,8 @@ module Toji
       # 留め仕込みまでの総米重量の20〜22%が標準である
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
-      def koji_rate
-        val = koji.to_f / rice_total
+      def koji_ratio
+        val = koji_total / rice_total
         val.nan? ? 0.0 : val
       end
 
@@ -41,54 +49,90 @@ module Toji
       # 全体: 留までの総米に対し120〜130%、標準は125%、高級酒は130〜145%である
       #
       # 出典: 酒造教本 P96
-      def water_rate
-        val = water.to_f / rice_total
+      def water_ratio
+        val = water_total / rice_total
         val.nan? ? 0.0 : val
       end
 
-      def round(ndigit=0, mini_ndigit=nil, half: :up)
+      def scale!(ratio)
+        kojis&.each {|koji|
+          koji.weight *= ratio
+        }
+        kakes&.each {|kake|
+          kake.weight *= ratio
+        }
+        waters&.each {|water|
+          water.weight *= ratio
+        }
+        lactic_acids&.each {|lactic_acid|
+          lactic_acid.weight *= ratio
+        }
+        alcohols&.each {|alcohol|
+          alcohol.weight *= ratio
+        }
+        yeasts&.each {|yeast|
+          yeast.weight *= ratio
+        }
+        self
+      end
+
+      def scale(ratio)
+        Utils.check_dup(self)
+
+        dst = self.dup
+        dst.scale!(ratio)
+      end
+
+      def round!(ndigit=0, mini_ndigit=nil, half: :up)
         if !mini_ndigit
           mini_ndigit = ndigit + 3
         end
 
-        self.class.new.tap {|o|
-          o.koji = koji.to_f.round(ndigit, half: half)
-          o.koji_soaked_rate = koji_soaked_rate.to_f
-          o.koji_steamed_rate = koji_steamed_rate.to_f
-          o.koji_dekoji_rate = koji_dekoji_rate.to_f
-          o.koji_interval_days = koji_interval_days.to_i
-
-          o.kake = kake.to_f.round(ndigit, half: half)
-          o.kake_soaked_rate = kake_soaked_rate.to_f
-          o.kake_steamed_rate = kake_steamed_rate.to_f
-          o.kake_interval_days = kake_interval_days.to_i
-
-          o.water = water.to_f.round(ndigit, half: half)
-          o.lactic_acid = lactic_acid.to_f.round(mini_ndigit, half: half)
-          o.alcohol = alcohol.to_f.round(ndigit, half: half)
-          o.yeast = yeast.to_f.round(mini_ndigit, half: half)
+        kojis&.each {|koji|
+          koji.weight = koji.weight.to_f.round(ndigit, half: half)
+        }
+        kakes&.each {|kake|
+          kake.weight = kake.weight.to_f.round(ndigit, half: half)
+        }
+        waters&.each {|water|
+          water.weight = water.weight.to_f.round(ndigit, half: half)
         }
+        lactic_acids&.each {|lactic_acid|
+          lactic_acid.weight = lactic_acid.weight.to_f.round(mini_ndigit, half: half)
+        }
+        alcohols&.each {|alcohol|
+          alcohol.weight = alcohol.weight.to_f.round(ndigit, half: half)
+        }
+        yeasts&.each {|yeast|
+          yeast.weight = yeast.weight.to_f.round(mini_ndigit, half: half)
+        }
+
+        self
+      end
+
+      def round(ndigit=0, mini_ndigit=nil, half: :up)
+        Utils.check_dup(self)
+
+        dst = self.dup
+        dst.round!(ndigit, mini_ndigit, half: half)
       end
 
       def +(other)
         if Step===other
-          self.class.new.tap {|o|
-            o.koji = koji.to_f + other.koji.to_f
-            o.koji_soaked_rate = koji_soaked_rate.to_f
-            o.koji_steamed_rate = koji_steamed_rate.to_f
-            o.koji_dekoji_rate = koji_dekoji_rate.to_f
-            o.koji_interval_days = koji_interval_days.to_i
-
-            o.kake = kake.to_f + other.kake.to_f
-            o.kake_soaked_rate = kake_soaked_rate.to_f
-            o.kake_steamed_rate = kake_steamed_rate.to_f
-            o.kake_interval_days = kake_interval_days.to_i
-
-            o.water = water.to_f + other.water.to_f
-            o.lactic_acid = lactic_acid.to_f + other.lactic_acid.to_f
-            o.alcohol = alcohol.to_f + other.alcohol.to_f
-            o.yeast = yeast.to_f + other.yeast.to_f
-          }
+          Utils.check_dup(self)
+          Utils.check_dup(other)
+
+          dst = self.dup
+          other = other.dup
+
+          dst.kojis = Utils.merge_ingredients(dst.kojis, other.kojis)
+          dst.kakes = Utils.merge_ingredients(dst.kakes, other.kakes)
+          dst.waters = Utils.merge_ingredients(dst.waters, other.waters)
+          dst.lactic_acids = Utils.merge_ingredients(dst.lactic_acids, other.lactic_acids)
+          dst.alcohols = Utils.merge_ingredients(dst.alcohols, other.alcohols)
+          dst.yeasts = Utils.merge_ingredients(dst.yeasts, other.yeasts)
+
+          dst
         else
           x, y = other.coerce(self)
           x + y
@@ -97,23 +141,7 @@ module Toji
 
       def *(other)
         if Integer===other || Float===other
-          self.class.new.tap {|o|
-            o.koji = koji.to_f * other
-            o.koji_soaked_rate = koji_soaked_rate.to_f
-            o.koji_steamed_rate = koji_steamed_rate.to_f
-            o.koji_dekoji_rate = koji_dekoji_rate.to_f
-            o.koji_interval_days = koji_interval_days.to_i
-
-            o.kake = kake.to_f * other
-            o.kake_soaked_rate = kake_soaked_rate.to_f
-            o.kake_steamed_rate = kake_steamed_rate.to_f
-            o.kake_interval_days = kake_interval_days.to_i
-
-            o.water = water.to_f * other
-            o.lactic_acid = lactic_acid.to_f * other
-            o.alcohol = alcohol.to_f * other
-            o.yeast = yeast.to_f * other
-          }
+          scale(other)
         else
           x, y = other.coerce(self)
           x * y

data/lib/toji/schedule.rb

@@ -0,0 +1,5 @@
+require 'toji/schedule/base'
+require 'toji/schedule/rice_schedule'
+require 'toji/schedule/koji_schedule'
+require 'toji/schedule/kake_schedule'
+require 'toji/schedule/action_schedule'

data/lib/toji/schedule/action_schedule.rb

@@ -0,0 +1,9 @@
+module Toji
+  module Schedule
+    module ActionSchedule
+      include Base
+
+      attr_reader :index
+    end
+  end
+end

data/lib/toji/{event → schedule}/base.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Event
+  module Schedule
     module Base
       attr_reader :product
       attr_reader :date

data/lib/toji/schedule/kake_schedule.rb

@@ -0,0 +1,11 @@
+module Toji
+  module Schedule
+    module KakeSchedule
+      include RiceSchedule
+
+      def rice_type
+        :kake
+      end
+    end
+  end
+end

data/lib/toji/schedule/koji_schedule.rb

@@ -0,0 +1,11 @@
+module Toji
+  module Schedule
+    module KojiSchedule
+      include RiceSchedule
+
+      def rice_type
+        :koji
+      end
+    end
+  end
+end

data/lib/toji/schedule/rice_schedule.rb

@@ -0,0 +1,16 @@
+module Toji
+  module Schedule
+    module RiceSchedule
+      include Base
+
+      attr_reader :rice_type
+      attr_reader :step_indexes
+
+      attr_reader :expect
+
+      def type
+        :rice
+      end
+    end
+  end
+end

data/lib/toji/utils.rb

@@ -0,0 +1,43 @@
+module Toji
+  module Utils
+    def self.activerecord_defined?
+      Object.const_defined?(:ActiveRecord) && ActiveRecord.const_defined?(:Base)
+    end
+
+    def self.check_dup(obj)
+      if activerecord_defined? && ActiveRecord::Base===obj
+        if !obj.class.method_defined?(:initialize_dup, false)
+          raise Error, "implementation required: #{obj.class}.initialize_dup"
+        end
+      else
+        if !obj.class.private_method_defined?(:initialize_copy, false)
+          raise Error, "implementation required: #{obj.class}.initialize_copy"
+        end
+      end
+    end
+
+    def self.merge_ingredients(ingredients1, ingredients2)
+      result = {}
+
+      ingredients1&.each {|src|
+        dst = result[src.group_key]
+        if dst
+          dst.weight = dst.weight.to_f + src.weight.to_f
+        else
+          result[src.group_key] = src
+        end
+      }
+
+      ingredients2&.each {|src|
+        dst = result[src.group_key]
+        if dst
+          dst.weight = dst.weight.to_f + src.weight.to_f
+        else
+          result[src.group_key] = src.dup
+        end
+      }
+
+      result.values
+    end
+  end
+end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.11.0"
+  VERSION = "2.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,62 +115,76 @@ files:
 - example/example_core.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/moromi.ipynb
-- example/moromi.rb
-- example/moromi.yaml
-- example/moto.rb
-- example/moto.yaml
+- example/koji_progress.ipynb
+- example/koji_progress.rb
+- example/koji_progress.yaml
+- example/koji_progress_multi.ipynb
+- example/moromi_progress.ipynb
+- example/moromi_progress.rb
+- example/moromi_progress.yaml
+- example/moto_progress.ipynb
+- example/moto_progress.rb
+- example/moto_progress.yaml
 - example/recipe.rb
 - lib/toji.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/multi_progress.rb
-- lib/toji/brew/graph/progress.rb
-- lib/toji/brew/koji.rb
-- lib/toji/brew/moromi.rb
-- lib/toji/brew/moto.rb
-- lib/toji/brew/state.rb
-- lib/toji/brew/wrapped_state.rb
 - lib/toji/calendar.rb
 - lib/toji/calendar/date_column.rb
 - lib/toji/calendar/date_row.rb
-- lib/toji/event.rb
-- lib/toji/event/action_event.rb
-- lib/toji/event/base.rb
-- lib/toji/event/kake_event.rb
-- lib/toji/event/koji_event.rb
-- lib/toji/event/rice_event.rb
 - lib/toji/ingredient.rb
+- lib/toji/ingredient/alcohol.rb
+- lib/toji/ingredient/base.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/lactic_acid.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/ingredient/tanekoji.rb
+- lib/toji/ingredient/water.rb
+- lib/toji/ingredient/yeast.rb
+- lib/toji/processing.rb
+- lib/toji/processing/base.rb
+- lib/toji/processing/cooled_rice.rb
+- lib/toji/processing/cooled_rice_element.rb
+- lib/toji/processing/dekoji.rb
+- lib/toji/processing/dekoji_element.rb
+- lib/toji/processing/kake_processing.rb
+- lib/toji/processing/koji_processing.rb
+- lib/toji/processing/rice_processing.rb
+- lib/toji/processing/soaked_rice.rb
+- lib/toji/processing/soaked_rice_element.rb
+- lib/toji/processing/steamed_rice.rb
+- lib/toji/processing/steamed_rice_element.rb
 - lib/toji/product.rb
-- lib/toji/product/event_factory.rb
+- lib/toji/product/schedule_factory.rb
+- lib/toji/progress.rb
+- lib/toji/progress/base_progress.rb
+- lib/toji/progress/base_state.rb
+- lib/toji/progress/builder.rb
+- lib/toji/progress/graph.rb
+- lib/toji/progress/graph/ab.rb
+- lib/toji/progress/graph/bmd.rb
+- lib/toji/progress/graph/multi_progress_note.rb
+- lib/toji/progress/graph/progress_note.rb
+- lib/toji/progress/koji_progress.rb
+- lib/toji/progress/koji_state.rb
+- lib/toji/progress/moromi_progress.rb
+- lib/toji/progress/moromi_state.rb
+- lib/toji/progress/moto_progress.rb
+- lib/toji/progress/moto_state.rb
+- lib/toji/progress/progress.rb
+- lib/toji/progress/state.rb
+- lib/toji/progress/state/baume_to_nihonshudo.rb
+- lib/toji/progress/state/nihonshudo_to_baume.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
 - lib/toji/recipe/action.rb
 - lib/toji/recipe/step.rb
+- lib/toji/schedule.rb
+- lib/toji/schedule/action_schedule.rb
+- lib/toji/schedule/base.rb
+- lib/toji/schedule/kake_schedule.rb
+- lib/toji/schedule/koji_schedule.rb
+- lib/toji/schedule/rice_schedule.rb
+- lib/toji/utils.rb
 - lib/toji/version.rb
 - toji.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-toji
@@ -195,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.