toji 2.17.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa76ef9b8f8a73ea20b84bf68c9480a1664888c08fb2d541cdfd6023b4f93a3
-  data.tar.gz: ce4f2d927d653d20a541d21a98954d27c70eba6e67022355e8cf9d887ca2842b
+  metadata.gz: 494121b64259737e8f8e942f688db54c630a5ae468d9a5530ad5e98b91d99ddb
+  data.tar.gz: 10585215b677950ecaebb9e4eccb7fa19fa0803e6e915c6d5d2dd2e1f0d1191d
 SHA512:
-  metadata.gz: 134dfc5763d67f9dda33917ad51dfb923631e503e296ab97eea6733fb809b656d73d702263a6a3b565b27a9ac3594d1fd1b3f7599259947098b0a36a7ce86f33
-  data.tar.gz: bd02c83d17c87aabfb3f24cc6386d48f7cc562dd61f5d66a75615dae70b93c100779e55772f7a821eae6ad6abc15c6c1e6dfc1ea51ab242ad84efd1459e13096
+  metadata.gz: 3b6b8d00a2f0b5f4494c07ab5c9eefb496db64eb1096e323c7d2f232ad32279a74da24c646b48ea0057ab3ac3a9bb3ec9548b9b66a1b995b2f4317d8471e9a23
+  data.tar.gz: 5dc4965df7dd65c8f3dafc41af8a884c557cb029875aa3694e9ff011402ac7614368c96aa9d55e592ae7fc0f52ba8a591152f414ad60dbd14d0d48de775868e8

data/example/example_core.rb

@@ -24,26 +24,28 @@ module Example
       @color = color
     end
 
-    def create_koji_schedule(date:, step_indexes:, kojis:)
+    def create_koji_schedule(date:, group_key:, step_weights:, kojis:)
       expect = kojis.first.dup
       expect.weight = kojis.map(&:weight).sum
 
       KojiSchedule.new(
         product: self,
         date: date,
-        step_indexes: step_indexes,
+        group_key: group_key,
+        step_weights: step_weights,
         expect: expect,
       )
     end
 
-    def create_kake_schedule(date:, step_indexes:, kakes:)
+    def create_kake_schedule(date:, group_key:, step_weights:, kakes:)
       expect = kakes.first.dup
       expect.weight = kakes.map(&:weight).sum
 
       KakeSchedule.new(
         product: self,
         date: date,
-        step_indexes: step_indexes,
+        group_key: group_key,
+        step_weights: step_weights,
         expect: expect,
       )
     end
@@ -134,6 +136,7 @@ module Example
     attr_reader :tanekojis
     attr_reader :dekoji_ratio
     attr_reader :interval_days
+    attr_reader :process_group
 
     def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, tanekojis:, dekoji_ratio:, interval_days:)
       @weight = weight
@@ -203,6 +206,7 @@ module Example
     attr_reader :steaming_ratio
     attr_reader :cooling_ratio
     attr_reader :interval_days
+    attr_reader :process_group
 
     def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, interval_days:)
       @weight = weight
@@ -939,14 +943,16 @@ module Example
 
     attr_reader :product
     attr_reader :date
+    attr_reader :group_key
 
-    attr_reader :step_indexes
+    attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_indexes:, expect:)
+    def initialize(product:, date:, group_key:, step_weights:, expect:)
       @product = product
       @date = date
-      @step_indexes = step_indexes
+      @group_key = group_key
+      @step_weights = step_weights
       @expect = expect
     end
   end
@@ -956,14 +962,16 @@ module Example
 
     attr_reader :product
     attr_reader :date
+    attr_reader :group_key
 
-    attr_reader :step_indexes
+    attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_indexes:, expect:)
+    def initialize(product:, date:, group_key:, step_weights:, expect:)
       @product = product
       @date = date
-      @step_indexes = step_indexes
+      @group_key = group_key
+      @step_weights = step_weights
       @expect = expect
     end
   end

data/lib/toji/calendar.rb

@@ -32,8 +32,8 @@ module Toji
       kake_schedules = @products.map{|product| product.kake_schedules}.flatten
       schedules = koji_schedules + kake_schedules
 
-      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
-      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
+      koji_len = koji_schedules.map{|schedule| schedule.step_weights.first[:index]}.max + 1
+      kake_len = kake_schedules.map{|schedule| schedule.step_weights.first[:index]}.max + 1
       min_date = schedules.map(&:date).min
       max_date = schedules.map(&:date).max
 

data/lib/toji/calendar/date_row.rb

@@ -14,11 +14,11 @@ module Toji
       def <<(schedule)
         case schedule.rice_type
         when :koji
-          index = schedule.step_indexes.first[:index]
+          index = schedule.step_weights.first[:index]
           @kojis[index] ||= DateColumn.new
           @kojis[index] << schedule
         when :kake
-          index = schedule.step_indexes.first[:index]
+          index = schedule.step_weights.first[:index]
           @kakes[index] ||= DateColumn.new
           @kakes[index] << schedule
         end

data/lib/toji/ingredient/alcohol.rb

@@ -6,8 +6,8 @@ module Toji
       # 醸造用アルコール
       # @dynamic weight
 
-      def group_key
-        ""
+      def ingredient_key
+        [].join(":")
       end
     end
   end

data/lib/toji/ingredient/base.rb

@@ -6,7 +6,7 @@ module Toji
       # @dynamic weight=
 
       # グループ識別子
-      # @dynamic group_key
+      # @dynamic ingredient_key
     end
   end
 end

data/lib/toji/ingredient/kake.rb

@@ -3,9 +3,13 @@ module Toji
     module Kake
       include Rice
 
-      def group_key
+      def ingredient_key
         [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio].join(":")
       end
+
+      def default_process_group
+        self.hash
+      end
     end
   end
 end

data/lib/toji/ingredient/koji.rb

@@ -18,11 +18,15 @@ module Toji
       end
 
       # Scheduleへのグループ識別子
-      def group_key
+      def ingredient_key
         keys1 = [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio]
-        keys2 = tanekojis&.map(&:group_key)&.sort || []
+        keys2 = tanekojis&.map(&:ingredient_key)&.sort || []
         (keys1 + keys2).join(":")
       end
+
+      def default_process_group
+        ""
+      end
     end
   end
 end

data/lib/toji/ingredient/lactic_acid.rb

@@ -6,8 +6,8 @@ module Toji
       # 乳酸
       # @dynamic weight
 
-      def group_key
-        ""
+      def ingredient_key
+        [].join(":")
       end
     end
   end

data/lib/toji/ingredient/rice.rb

@@ -52,6 +52,17 @@ module Toji
 
       # Product.base_dateからの日数差
       # @dynamic interval_days
+
+      # グループ識別子
+      # @dynamic process_group
+      # @dyanmic default_process_group
+
+      def group_key
+        [
+          ingredient_key,
+          process_group.presence || default_process_group,
+        ].join(":")
+      end
     end
   end
 end

data/lib/toji/ingredient/tanekoji.rb

@@ -21,7 +21,7 @@ module Toji
         koji.weight * ratio
       end
 
-      def group_key
+      def ingredient_key
         [brand, ratio].join(":")
       end
     end

data/lib/toji/ingredient/water.rb

@@ -10,7 +10,7 @@ module Toji
       # @dynamic calcium_hardness
       # @dynamic magnesium_hardness
 
-      def group_key
+      def ingredient_key
         [calcium_hardness, magnesium_hardness].join(":")
       end
     end

data/lib/toji/ingredient/yeast.rb

@@ -13,7 +13,7 @@ module Toji
       # 酵母名、協会酵母番号
       # @dynamic brand
 
-      def group_key
+      def ingredient_key
         [brand, unit].join(":")
       end
     end

data/lib/toji/processing/base.rb

@@ -1,7 +1,7 @@
 module Toji
   module Processing
     module Base
-      attr_reader :date
+      # @dynamic date
     end
   end
 end

data/lib/toji/processing/cooled_rice.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module CooledRice
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::CooledRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 放冷後蒸米総重量
       def weight

data/lib/toji/processing/cooled_rice_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module CooledRiceElement
       # 放冷後蒸米重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

data/lib/toji/processing/dekoji.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module Dekoji
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::DekojiElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 出麹総重量
       def weight

data/lib/toji/processing/dekoji_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module DekojiElement
       # 出麹重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

data/lib/toji/processing/koji_processing.rb

@@ -4,7 +4,7 @@ module Toji
       include RiceProcessing
 
       # 出麹実績値 (Toji::Processing::Dekoji)
-      attr_reader :dekoji
+      # @dynamic dekoji
     end
   end
 end

data/lib/toji/processing/rice_processing.rb

@@ -4,16 +4,16 @@ module Toji
       include Base
 
       # 目標値 (Toji::Ingredient::Rice)
-      attr_reader :expect
+      # @dynamic expect
 
       # 浸漬実績値 (Toji::Processing::SoakedRice)
-      attr_reader :soaked_rice
+      # @dynamic soaked_rice
 
       # 蒸米実績値 (Toji::Processing::SteamedRice)
-      attr_reader :steamed_rice
+      # @dynamic steamed_rice
 
       # 放冷実績値 (Toji::Processing::CooledRice)
-      attr_reader :cooled_rice
+      # @dynamic cooled_rice
     end
   end
 end

data/lib/toji/processing/soaked_rice.rb

@@ -2,25 +2,25 @@ module Toji
   module Processing
     module SoakedRice
       # 室内温度
-      attr_reader :room_temp
+      # @dynamic room_temp
 
       # 外気温
-      attr_reader :outside_temp
+      # @dynamic outside_temp
 
       # 白米の含水率
-      attr_reader :rice_water_content
+      # @dynamic rice_water_content
 
       # 洗米に用いる水の温度
-      attr_reader :washing_water_temp
+      # @dynamic washing_water_temp
 
       # 浸漬に用いる水の温度
-      attr_reader :soaking_water_temp
+      # @dynamic soaking_water_temp
 
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::SoakedRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 白米総重量
       def weight

data/lib/toji/processing/soaked_rice_element.rb

@@ -2,13 +2,13 @@ module Toji
   module Processing
     module SoakedRiceElement
       # 白米重量
-      attr_reader :weight
+      # @dynamic weight
 
       # 浸漬時間
-      attr_reader :soaking_time
+      # @dynamic soaking_time
 
       # 浸漬米重量
-      attr_reader :soaked
+      # @dynamic soaked
 
       def soaking_ratio
         (soaked.to_f - weight.to_f) / weight.to_f

data/lib/toji/processing/steamed_rice.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module SteamedRice
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::SteamedRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 蒸米総重量
       def weight

data/lib/toji/processing/steamed_rice_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module SteamedRiceElement
       # 蒸米重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

data/lib/toji/product/schedule_factory.rb

@@ -2,11 +2,14 @@ module Toji
   module Product
     module ScheduleFactory
 
-      def create_koji_schedule(date:, step_indexes:, kojis:)
+      # @dynamic recipe
+      # @dynamic base_date
+
+      def create_koji_schedule(date:, group_key:, step_weights:, kojis:)
         raise Error, "implement required: create_koji_schedule"
       end
 
-      def create_kake_schedule(date:, step_indexes:, kakes:)
+      def create_kake_schedule(date:, group_key:, step_weights:, kakes:)
         raise Error, "implement required: create_kake_schedule"
       end
 
@@ -18,9 +21,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kojis&.each {|koji|
             result << {
-              step_index: {
+              step_weight: {
                 index: step.index,
                 subindex: step.subindex,
+                weight: koji.weight,
               },
               date: base_date.next_day(koji.interval_days),
               koji: koji,
@@ -31,10 +35,11 @@ module Toji
           0<schedule[:koji]&.weight.to_f
         }.group_by {|schedule|
           [schedule[:date], schedule[:koji].group_key]
-        }.map {|(date, _group_key), schedules|
+        }.map {|(date, group_key), schedules|
           create_koji_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
+            group_key: group_key,
+            step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kojis: schedules.map{|schedule| schedule[:koji]},
           )
         }
@@ -44,9 +49,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kakes&.each {|kake|
             result << {
-              step_index: {
+              step_weight: {
                 index: step.index,
                 subindex: step.subindex,
+                weight: kake.weight,
               },
               date: base_date.next_day(kake.interval_days),
               kake: kake,
@@ -56,11 +62,12 @@ module Toji
         }.select {|schedule|
           0<schedule[:kake]&.weight.to_f
         }.group_by {|schedule|
-          [schedule[:date], schedule[:kake].group_key, schedule[:step_index]]
-        }.map {|(date, _group_key, _step_index), schedules|
+          [schedule[:date], schedule[:kake].group_key]
+        }.map {|(date, group_key), schedules|
           create_kake_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
+            group_key: group_key,
+            step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kakes: schedules.map{|schedule| schedule[:kake]},
           )
         }

data/lib/toji/recipe.rb

@@ -9,6 +9,16 @@ module Toji
     # @dynamic ab_coef
     # @dynamic ab_expects
 
+    def ingredients(&block)
+      Enumerator.new do|y|
+        steps&.each {|step|
+          step.ingredients.each {|ingredient|
+            y << [step, ingredient]
+          }
+        }
+      end.each(&block)
+    end
+
     def scale_rice_total(rice_total)
       ratio = rice_total.to_f / steps.map(&:rice_total).sum
       scale(ratio)
@@ -54,7 +64,7 @@ module Toji
     # 酒母歩合の累計
     def cumulative_moto_ratios
       rice_total = steps.map(&:rice_total)
-      moto = rice_total.first
+      moto = steps.select(&:moto?).map(&:rice_total).sum.to_f
 
       rice_total.map.with_index {|x,i|
         moto / rice_total[0..i].inject(&:+)
@@ -80,8 +90,10 @@ module Toji
     #
     # 出典: 酒造教本 P95
     def rice_ratios
+      moto = steps.select(&:moto?).map(&:rice_total).sum.to_f
+
       steps.map {|step|
-        step.rice_total / steps.first.rice_total
+        step.rice_total / moto
       }
     end
 

data/lib/toji/recipe/step.rb

@@ -17,6 +17,10 @@ module Toji
       # @dynamic yeasts
       # @dynamic yeasts=
 
+      def moto?
+        index==0
+      end
+
       # 麹米
       def koji_total
         (kojis || []).map(&:weight).map(&:to_f).sum.to_f
@@ -61,24 +65,32 @@ module Toji
         val.nan? ? 0.0 : val
       end
 
+      def ingredients(&block)
+        Enumerator.new do|y|
+          kojis&.each {|koji|
+            y << koji
+          }
+          kakes&.each {|kake|
+            y << kake
+          }
+          waters&.each {|water|
+            y << water
+          }
+          lactic_acids&.each {|lactic_acid|
+            y << lactic_acid
+          }
+          alcohols&.each {|alcohol|
+            y << alcohol
+          }
+          yeasts&.each {|yeast|
+            y << yeast
+          }
+        end.each(&block)
+      end
+
       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
+        ingredients.each {|ingredient|
+          ingredient.weight *= ratio
         }
         self
       end

data/lib/toji/schedule/rice_schedule.rb

@@ -4,7 +4,7 @@ module Toji
       include Base
 
       # @dynamic rice_type
-      # @dynamic step_indexes
+      # @dynamic step_weights
 
       # @dynamic expect
 

data/lib/toji/utils.rb

@@ -20,20 +20,20 @@ module Toji
       result = {}
 
       ingredients1&.each {|src|
-        dst = result[src.group_key]
+        dst = result[src.ingredient_key]
         if dst
           dst.weight = dst.weight.to_f + src.weight.to_f
         else
-          result[src.group_key] = src
+          result[src.ingredient_key] = src
         end
       }
 
       ingredients2&.each {|src|
-        dst = result[src.group_key]
+        dst = result[src.ingredient_key]
         if dst
           dst.weight = dst.weight.to_f + src.weight.to_f
         else
-          result[src.group_key] = src.dup
+          result[src.ingredient_key] = src.dup
         end
       }
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.17.0"
+  VERSION = "2.22.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport