toji 2.3.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec68ce9ca3d8e0b3414b7e5bc2407acd0c921dded8e2c81d803d7113faf16377
-  data.tar.gz: a87f5732226f22c2ffde9f1dd0390d33f4cbc82f6123a6dce317561e25933e18
+  metadata.gz: 31d789207932cd0399eaf06699ebd22bac870f4809cd112c53486ca5ca8e3164
+  data.tar.gz: aa1b306d160102b281101ac6651ffe94debe5364b335a1e09987622b025f10f0
 SHA512:
-  metadata.gz: 47a3a740eed016bf412dec866c68a4b64ca6ad026373a37c504993ea79912739b399691d13148b372d290adb00664c4a3e546b2b52be05f6c6d39fa3399bfaa0
-  data.tar.gz: 773cf147acf53eb4f3954d766c6d6f316a49b7614d58cb10d1214d5d6c20bd3d5f98418c46e5fdfa3666d0d3af43ea6e08a640a41d0937d19bf7cb888d87af87
+  metadata.gz: 31deda45a392f5a565d9074b6bcf35163ed21d9a69614cbff3669ec8dc36affa0587f8ba511695c7d33fad781ea2fcc205066be8c53f056349b40e384de18b92
+  data.tar.gz: daa506c803091bdc3bc6409f502419565308610642bd3c3d565234b624daf0fd13198044658dca7bf462348b5e8c2df3bdf0d9cd228a3a5199ec2f05e76ffc3f

data/example/calendar.ipynb

@@ -302,7 +302,7 @@
     "  name: \"仕1\",\n",
     "  description: \"姫野国夫による酒母省略仕込\",\n",
     "  recipe: Example::Recipe::TEMPLATES[:simple_sokujo_himeno].scale(600).round(0),\n",
-    "  start_date: Time.mktime(2020, 2, 24)\n",
+    "  base_date: Time.mktime(2020, 2, 24)\n",
     "))\n",
     ".add(Example::Product.create(\n",
     "  name: \"仕2\",\n",
@@ -311,7 +311,7 @@
     "    r.steps[0].kake_interval_days = 5\n",
     "    r.steps[2].kake_interval_days = 3\n",
     "  },\n",
-    "  start_date: Time.mktime(2020, 2, 27)\n",
+    "  base_date: Time.mktime(2020, 2, 27)\n",
     "))\n",
     ".add(Example::Product.create(\n",
     "  name: \"仕3\",\n",
@@ -320,13 +320,13 @@
     "    r.steps[1].koji_interval_days = 11\n",
     "    r.steps[1].kake_interval_days = 13\n",
     "  },\n",
-    "  start_date: Time.mktime(2020, 2, 20)\n",
+    "  base_date: Time.mktime(2020, 2, 20)\n",
     "))\n",
     ".add(Example::Product.create(\n",
     "  name: \"仕4\",\n",
     "  description: \"酒造教本による標準型仕込配合\",\n",
     "  recipe: Example::Recipe::TEMPLATES[:sokujo_textbook].scale(900).round(0),\n",
-    "  start_date: Time.mktime(2020, 2, 20)\n",
+    "  base_date: Time.mktime(2020, 2, 20)\n",
     "))\n",
     ".add(Example::Product.create(\n",
     "  name: \"仕5\",\n",
@@ -335,13 +335,13 @@
     "    r.steps[1].koji_interval_days = 11\n",
     "    r.steps[1].kake_interval_days = 13\n",
     "  },\n",
-    "  start_date: Time.mktime(2020, 2, 27)\n",
+    "  base_date: Time.mktime(2020, 2, 27)\n",
     "))\n",
     ".add(Example::Product.create(\n",
     "  name: \"仕6\",\n",
     "  description: \"酒造教本による標準型仕込配合\",\n",
     "  recipe: Example::Recipe::TEMPLATES[:sokujo_textbook].scale(900).round(0),\n",
-    "  start_date: Time.mktime(2020, 2, 27)\n",
+    "  base_date: Time.mktime(2020, 2, 27)\n",
     "))\n",
     "\n",
     "cal.products.each {|product|\n",

data/example/calendar.yaml

@@ -4,34 +4,34 @@ products:
   recipe: :simple_sokujo_himeno
   scale: 600
   round: 0
-  start_date: 2020-2-24
+  base_date: 2020-2-24
 - name: 仕2
   description: 姫野国夫による酒母省略仕込
   recipe: :simple_sokujo_himeno
   scale: 550
   round: 0
-  start_date: 2020-2-27
+  base_date: 2020-2-27
 - name: 仕3
   description: 灘における仕込配合
   recipe: :sokujo_nada
   scale: 900
   round: 0
-  start_date: 2020-2-20
+  base_date: 2020-2-20
 - name: 仕4
   description: 酒造教本による標準型仕込配合
   recipe: :sokujo_textbook
   scale: 900
   round: 0
-  start_date: 2020-2-20
+  base_date: 2020-2-20
 - name: 仕5
   description: 灘における仕込配合
   recipe: :sokujo_nada
   scale: 900
   round: 0
-  start_date: 2020-2-27
+  base_date: 2020-2-27
 - name: 仕6
   description: 酒造教本による標準型仕込配合
   recipe: :sokujo_textbook
   scale: 900
   round: 0
-  start_date: 2020-2-27
+  base_date: 2020-2-27

data/example/example_core.rb

@@ -69,25 +69,6 @@ module Example
   class Step
     include Toji::Recipe::Step
 
-    # 総重量
-    def weight_total
-      kake + koji + water + lactic_acid + alcohol + yeast
-    end
-
-    def to_h
-      {
-        name: name,
-        kake: kake,
-        koji: koji,
-        water: water,
-        lactic_acid: lactic_acid,
-        alcohol: alcohol,
-        yeast: yeast,
-        koji_interval_days: koji_interval_days,
-        kake_interval_days: kake_interval_days,
-      }
-    end
-
     def self.create(name:, kake: 0, koji: 0, water: 0, lactic_acid: 0, alcohol: 0, yeast: 0, koji_interval_days: 0, kake_interval_days: 0)
       new.tap {|o|
         o.name = name
@@ -111,16 +92,6 @@ module Example
       @steps = []
     end
 
-    #def to_h
-    #  {
-    #    steps: steps.map(&:to_h),
-    #    cumulative_rice_totals: cumulative_rice_totals,
-    #    cumulative_shubo_rates: cumulative_shubo_rates,
-    #    shubo_rate: shubo_rate,
-    #    rice_rates: rice_rates,
-    #  }
-    #end
-
     def self.create(steps)
       new.tap {|o|
         o.steps = steps
@@ -278,30 +249,15 @@ module Example
     attr_accessor :description
     attr_accessor :color
 
-    def initialize(reduce_key, name, description, recipe, start_date, color=nil)
+    def initialize(reduce_key, name, description, recipe, base_date, color=nil)
       @reduce_key = reduce_key || SecureRandom.uuid
       @name = name
       @description = description
       @recipe = recipe
-      @start_date = start_date
+      @base_date = base_date
       @color = color
     end
 
-    def to_h
-      {
-        id: id,
-        name: name,
-        description: @description,
-        recipe: @recipe.table_data,
-        start_date: @start_date,
-        koji_dates: koji_dates,
-        kake_dates: kake_dates,
-        events: events.map(&:to_h),
-        events_group: events_group,
-        color: @color,
-      }
-    end
-
     def self.create(args)
       if self===args
         args
@@ -322,7 +278,7 @@ module Example
           args[:name],
           args[:description],
           recipe,
-          args[:start_date],
+          args[:base_date],
           args[:color]
         )
       else

data/example/koji_making.rb

@@ -7,7 +7,7 @@ koji = Example::Brew::Koji.load_yaml_file(File.dirname(__FILE__)+"/koji_making.y
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "乾湿差(度)", "経過時間", "日時"]
   t << :separator
-  koji.each {|s|
+  koji.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.room_temp, s.room_psychrometry, s.elapsed_time, s.display_time]
   }

data/example/moromi.rb

@@ -3,12 +3,12 @@ require_relative 'example_core'
 require 'terminal-table'
 
 
-moromi = Toji::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.yaml")
+moromi = Example::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "ボーメ及び日本酒度", "アルコール度数", "BMD", "アルコール期待値(16.5 +3)", "経過時間", "日時"]
   t << :separator
-  moromi.each {|s|
+  moromi.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.room_temp, s.display_baume, s.alcohol, s.bmd&.round(2), s.expected_alcohol(16.5, +3, 1.5)&.round(2), s.elapsed_time, s.display_time]
   }

data/example/recipe.rb

@@ -2,30 +2,37 @@ require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
-recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale(900)
+recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale(900).round(2)
 step_names = recipe.steps.map(&:name)
 
 table = Terminal::Table.new do |t|
   t << [""] + step_names
   t << :separator
   t << ["[原料]"]
-  t << ["酵母(g or 本)"] + recipe.steps.map(&:yeast).map{|v| v&.round(2)}
-  t << ["乳酸(ml)"] + recipe.steps.map(&:lactic_acid).map{|v| v&.round(6)}
-  t << ["掛米(g)"] + recipe.steps.map(&:kake).map{|v| v&.round(2)}
-  t << ["麹米(g)"] + recipe.steps.map(&:koji).map{|v| v&.round(2)}
-  t << ["汲水(ml)"] + recipe.steps.map(&:water).map{|v| v&.round(2)}
-  t << ["醸造アルコール(ml)"] + recipe.steps.map(&:alcohol).map{|v| v&.round(2)}
+  t << ["酵母(g or 本)"] + recipe.steps.map(&:yeast)
+  t << ["乳酸(ml)"] + recipe.steps.map(&:lactic_acid)
+  t << ["掛米(g)"] + recipe.steps.map(&:kake)
+  t << ["麹米(g)"] + recipe.steps.map(&:koji)
+  t << ["汲水(ml)"] + recipe.steps.map(&:water)
+  t << ["醸造アルコール(ml)"] + recipe.steps.map(&:alcohol)
   t << :separator
   t << ["[合計]"]
-  t << ["総米(g)"] + recipe.steps.map(&:rice_total).map{|v| v&.round(2)}
+  t << ["総米(g)"] + recipe.steps.map(&:rice_total)
   t << ["麹歩合(%)"] + recipe.steps.map{|s| s.koji_rate * 100}.map{|v| v&.round(2)}
   t << ["汲水歩合(%)"] + recipe.steps.map{|s| s.water_rate * 100}.map{|v| v&.round(2)}
   t << :separator
   t << ["[累計]"]
-  t << ["総米(g)"] + recipe.cumulative_rice_totals.map{|v| v&.round(2)}
+  t << ["総米(g)"] + recipe.cumulative_rice_totals
   t << ["白米比率"] + recipe.rice_rates.map{|v| v&.round(2)}
   t << ["酒母歩合(%)"] + recipe.cumulative_shubo_rates.map{|s| s * 100}.map{|v| v&.round(2)}
-  t << ["タンク内容量(ml)"] + recipe.cumulative_weight_totals.map{|v| v&.round(2)}
+  t << ["タンク内容量(ml)"] + recipe.steps.map {|s|
+    kake = Toji::Ingredient::Kake::Expected.create(s.kake)
+    koji = Toji::Ingredient::Koji::Expected.create(s.koji)
+    s.yeast.to_f + s.lactic_acid.to_f + kake.steamed.to_f + koji.dekoji.to_f + s.water.to_f + s.alcohol.to_f
+  }.then {|a|
+    sum = 0.0
+    a.map {|x| sum += x}
+  }.map{|v| v&.round(2)}
 end
 puts table
 puts

data/example/shubo.rb

@@ -7,7 +7,7 @@ shubo = Example::Brew::Shubo.load_yaml_file(File.dirname(__FILE__)+"/shubo.yaml"
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "ボーメ", "酸度", "経過時間", "日時"]
   t << :separator
-  shubo.each {|s|
+  shubo.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.baume, s.acid, s.elapsed_time, s.display_time]
   }

data/lib/toji/brew/base.rb

@@ -1,8 +1,6 @@
 module Toji
   module Brew
     module Base
-      include Enumerable
-
       REQUIRED_KEYS = [
         :time,
         :elapsed_time,
@@ -45,10 +43,6 @@ module Toji
         nil
       end
 
-      def each(&block)
-        wrapped_states.each(&block)
-      end
-
       def has_keys
         result = REQUIRED_KEYS.dup
 

data/lib/toji/brew/graph/ab.rb

@@ -24,7 +24,7 @@ module Toji
           result = []
 
           @actuals.each {|moromi, name|
-            states = moromi.select{|s| s.alcohol && s.baume}
+            states = moromi.wrapped_states.select{|s| s.alcohol && s.baume}
 
             xs = states.map(&:alcohol)
             ys = states.map(&:baume)
@@ -47,13 +47,13 @@ module Toji
 
         def min_baume
           @actuals.map {|moromi, name|
-            moromi.map(&:baume).compact.min
+            moromi.wrapped_states.map(&:baume).compact.min
           }.compact.min || 0
         end
 
         def max_baume
           @actuals.map {|moromi, name|
-            moromi.map(&:baume).compact.max
+            moromi.wrapped_states.map(&:baume).compact.max
           }.compact.max || 0
         end
 

data/lib/toji/brew/graph/progress.rb

@@ -56,13 +56,13 @@ module Toji
             xs = []
             ys = []
             text = []
-            @brew.each {|r|
-              val = r.send(key)
+            @brew.wrapped_states.each {|s|
+              val = s.send(key)
               if val
                 [val].flatten.each_with_index {|v,i|
-                  xs << r.elapsed_time_with_offset + i
+                  xs << s.elapsed_time_with_offset + i
                   ys << v
-                  text << r.display_time
+                  text << s.display_time
                 }
               end
             }
@@ -102,7 +102,7 @@ module Toji
         def annotations
           return [] if !@enable_annotations
 
-          @brew.select{|s| s.mark}.map {|s|
+          @brew.wrapped_states.select{|s| s.mark}.map {|s|
             {
               x: s.elapsed_time_with_offset,
               y: s.temps.first || 0,
@@ -131,7 +131,7 @@ module Toji
           end
 
           rows = []
-          @brew.each {|state|
+          @brew.wrapped_states.each {|state|
             rows << keys.map {|k|
               v = state&.send(k)
               if Array===v

data/lib/toji/brew/wrapped_state.rb

@@ -104,33 +104,6 @@ module Toji
           target_alc - (_baume - target_nihonshudo * -0.1) * coef
         end
       end
-
-      def to_h
-        {
-          elapsed_time: elapsed_time,
-          time: time,
-          mark: mark,
-          temps: temps,
-          preset_temp: preset_temp,
-          room_temp: room_temp,
-          room_psychrometry: room_psychrometry,
-          acid: acid,
-          amino_acid: amino_acid,
-          alcohol: alcohol,
-          warmings: warmings,
-          note: note,
-
-          day: day,
-          day_label: day_label,
-          elapsed_time_with_offset: elapsed_time_with_offset,
-          baume: baume,
-          nihonshudo: nihonshudo,
-          display_baume: display_baume,
-          display_time: display_time,
-          moromi_day: moromi_day,
-          bmd: bmd,
-        }
-      end
     end
   end
 end

data/lib/toji/calendar.rb

@@ -10,7 +10,7 @@ module Toji
     end
 
     def <<(product)
-      @products << product
+      @products += [product].flatten
       self
     end
     alias_method :add, :<<

data/lib/toji/product.rb

@@ -5,17 +5,17 @@ module Toji
     attr_reader :reduce_key
     attr_accessor :name
     attr_accessor :recipe
-    attr_accessor :start_date
+    attr_accessor :base_date
 
     def koji_dates
-      date = start_date
+      date = base_date
       recipe.steps.map {|step|
         date = date.next_day(step.koji_interval_days)
       }
     end
 
     def kake_dates
-      date = start_date
+      date = base_date
       recipe.steps.map {|step|
         date = date.next_day(step.kake_interval_days)
       }

data/lib/toji/product/event.rb

@@ -39,16 +39,6 @@ module Toji
       def weight
         @product.recipe.steps[@index].send(@type)
       end
-
-      def to_h
-        {
-          date: date,
-          type: type,
-          index: index,
-          group_index: group_index,
-          weight: weight,
-        }
-      end
     end
   end
 end

data/lib/toji/recipe.rb

@@ -69,15 +69,15 @@ module Toji
     end
 
     def table_data
-      headers = [""] + @steps.map(&:name) + [:total]
+      headers = [""] + steps.map(&:name) + [:total]
       keys = [:rice_total, :kake, :koji, :alcohol, :water, :lactic_acid]
 
       cells = [keys]
-      cells += @steps.map {|step|
+      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
+        steps.map(&key).compact.sum
       }
 
       cells = cells.map {|cell|

data/lib/toji/recipe/step.rb

@@ -13,7 +13,7 @@ module Toji
 
       # 総米
       def rice_total
-        [kake, koji].compact.map(&:to_f).sum
+        kake.to_f + koji.to_f
       end
 
       # 麹歩合
@@ -22,7 +22,8 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        (koji || 0.0) / rice_total
+        val = koji.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
       # 汲水歩合
@@ -35,7 +36,8 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        (water || 0.0) / rice_total
+        val = water.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
       def round(ndigit=0, mini_ndigit=nil, half: :up)
@@ -45,14 +47,14 @@ module Toji
 
         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(mini_ndigit, half: half)
-          o.alcohol = alcohol.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
+          o.kake = kake.to_f.round(ndigit, half: half)
+          o.koji = koji.to_f.round(ndigit, half: half)
+          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)
+          o.koji_interval_days = koji_interval_days.to_i
+          o.kake_interval_days = kake_interval_days.to_i
         }
       end
 
@@ -60,14 +62,14 @@ module Toji
         if Step===other
           self.class.new.tap {|o|
             o.name = name
-            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
+            o.kake = kake.to_f + other.kake.to_f
+            o.koji = koji.to_f + other.koji.to_f
+            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
+            o.koji_interval_days = koji_interval_days.to_i
+            o.kake_interval_days = kake_interval_days.to_i
           }
         else
           x, y = other.coerce(self)
@@ -79,14 +81,14 @@ module Toji
         if Integer===other || Float===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
+            o.kake = kake.to_f * other
+            o.koji = koji.to_f * other
+            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
+            o.koji_interval_days = koji_interval_days.to_i
+            o.kake_interval_days = kake_interval_days.to_i
           }
         else
           x, y = other.coerce(self)

data/lib/toji/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport