toji 1.1.0 → 1.2.0

data/lib/toji/graph/ab.rb

@@ -1,79 +0,0 @@
-module Toji
-  module Graph
-    class Ab
-      attr_reader :coef
-
-      def initialize(coef=1.5)
-        @coef = coef
-        @actuals = []
-        @expects = []
-      end
-
-      def actual(moromi, name=:actual)
-        @actuals << [moromi, name]
-        self
-      end
-
-      def expect(alcohol, nihonshudo)
-        @expects << [alcohol.to_f, nihonshudo.to_f]
-        self
-      end
-
-      def data
-        result = []
-
-        @actuals.each {|moromi, name|
-          data = moromi.map{|j| [j.time || j.elapsed_time + moromi.day_offset, j.alcohol, j.baume]}.select{|a| a[1] && a[2]}
-
-          xs = data.map{|a| a[1]}
-          ys = data.map{|a| a[2]}
-          texts = data.map{|a| "%s<br />alc=%s, be=%s" % a}
-
-          result << {x: xs, y: ys, text: texts, name: name}
-        }
-
-        @expects.each {|alcohol, nihonshudo|
-          ys = [0.0, 8.0]
-          xs = ys.map{|b| alcohol - (b - nihonshudo * -0.1) * @coef}
-
-          name = "%s%s %s" % [nihonshudo<0 ? "" : "+", nihonshudo, alcohol]
-
-          result << {x: xs, y: ys, name: name}
-        }
-
-        result
-      end
-
-      def min_baume
-        data.map{|h| h[:y].min}.min || 0
-      end
-
-      def max_baume
-        data.map{|h| h[:y].max}.max || 0
-      end
-
-      def plot
-        #_min_baume = [min_baume-1, 0].min
-        _min_baume = 0
-
-        _max_baume = [max_baume+1, 10].max
-
-        Plotly::Plot.new(
-          data: data,
-          layout: {
-            xaxis: {
-              title: "Alcohol",
-              dtick: 2,
-              range: [0, 20],
-            },
-            yaxis: {
-              title: "Baume",
-              dtick: 1,
-              range: [_min_baume, _max_baume],
-            }
-          }
-        )
-      end
-    end
-  end
-end

data/lib/toji/graph/bmd.rb

@@ -1,56 +0,0 @@
-module Toji
-  module Graph
-    class Bmd
-
-      def initialize
-        @actuals = []
-        @expects = []
-      end
-
-      def actual(moromi, name=:actual)
-        @actuals << [moromi, name]
-        self
-      end
-
-      def data
-        result = []
-
-        @actuals.each {|moromi, name|
-          jobs = moromi.select{|j| j.moromi_time && j.bmd}
-
-          xs = jobs.map(&:moromi_time)
-          ys = jobs.map(&:bmd)
-          texts = jobs.map{|j| "%s<br />moromi day=%d, be=%s, bmd=%s" % [j.time || j.elapsed_time + moromi.day_offset, j.moromi_day, j.baume, j.bmd]}
-
-          result << {x: xs, y: ys, text: texts, name: name}
-        }
-
-        result
-      end
-
-      def max_moromi_day
-        @actuals.map(&:first).map(&:moromi_days).max
-      end
-
-      def plot
-        _max_moromi_day = [max_moromi_day, 14].max
-
-        Plotly::Plot.new(
-          data: data,
-          layout: {
-            xaxis: {
-              title: "Moromi day",
-              dtick: Product::Job::DAY,
-              range: [1, _max_moromi_day].map{|d| d*Product::Job::DAY},
-              tickvals: _max_moromi_day.times.map{|d| d*Product::Job::DAY},
-              ticktext: _max_moromi_day.times.map(&:succ)
-            },
-            yaxis: {
-              title: "BMD",
-            }
-          }
-        )
-      end
-    end
-  end
-end

data/lib/toji/graph/progress.rb

@@ -1,87 +0,0 @@
-module Toji
-  module Graph
-    class Progress
-
-      attr_accessor :enable_annotations
-
-      def initialize(product, enable_annotations: true)
-        @product = product
-        @enable_annotations = enable_annotations
-      end
-
-      def data(keys=nil)
-        data = @product.map(&:to_h).map(&:compact)
-        if !keys
-          keys = data.map(&:keys).flatten.uniq
-        end
-
-        result = []
-
-        keys &= [:temps, :preset_temp, :room_temp, :room_psychrometry, :baume, :acid, :amino_acid, :alcohol]
-
-        keys.each {|key|
-          xs = []
-          ys = []
-          text = []
-          data.each {|h|
-            if h[key]
-              [h[key]].flatten.each_with_index {|v,i|
-                xs << h[:elapsed_time] + i + @product.day_offset
-                ys << v
-                text << h[:display_time]
-              }
-            end
-          }
-
-          line_shape = :linear
-          if key==:preset_temp
-            line_shape = :hv
-          end
-
-          result << {x: xs, y: ys, text: text, name: key, line: {shape: line_shape}}
-        }
-
-        if 0<@product.day_offset
-          result = result.map{|h|
-            h[:x].unshift(0)
-            h[:y].unshift(nil)
-            h[:text].unshift(nil)
-            h
-          }
-        end
-
-        result
-      end
-
-      def annotations
-        @product.select{|j| j.id}.map {|j|
-          {
-            x: j.elapsed_time + @product.day_offset,
-            y: j.temps.first || 0,
-            xref: 'x',
-            yref: 'y',
-            text: j.id,
-            showarrow: true,
-            arrowhead: 1,
-            ax: 0,
-            ay: -40
-          }
-        }
-      end
-
-      def plot
-        Plotly::Plot.new(
-          data: data,
-          layout: {
-            xaxis: {
-              dtick: Product::Job::DAY,
-              tickvals: @product.days.times.map{|d| d*Product::Job::DAY},
-              ticktext: @product.day_labels
-            },
-            annotations: @enable_annotations ? annotations : [],
-          }
-        )
-      end
-    end
-  end
-end

data/lib/toji/graph.rb

@@ -1,8 +0,0 @@
-require 'toji/graph/progress'
-require 'toji/graph/bmd'
-require 'toji/graph/ab'
-
-module Toji
-  module Graph
-  end
-end

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

@@ -1,21 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      class Actual
-        include Base
-        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
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      module ActualFermentable
-        def tanekoji_rate
-          tanekoji / raw
-        end
-
-        def dekoji_rate
-          (dekoji - raw) / raw
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      module Base
-        include Rice::Base
-
-        # 種麹
-        #
-        # 総破精麹を造るには、種麹の量を麹米100kgあたり種麹100gとする
-        # 突き破精麹を造るには、種麹の量を麹米100kgあたり種麹80gとする
-        #
-        # 出典: 酒造教本 P66
-        attr_reader :tanekoji_rate
-        attr_reader :tanekoji
-
-        # 出麹歩合
-        #
-        # 出麹歩合17〜19%のものが麹菌の繁殖のほどよい麹である
-        #
-        # 出典: 酒造教本 P67
-        attr_reader :dekoji_rate
-        attr_reader :dekoji
-      end
-    end
-  end
-end

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

@@ -1,51 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      class Expected
-        include Base
-        include Rice::ExpectedSteamable
-        include ExpectedFermentable
-
-        def initialize(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT, koji_rate: Recipe::KojiRate::DEFAULT)
-          @raw = raw.to_f
-
-          @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
-
-          @koji_rate = koji_rate
-          @tanekoji_rate = koji_rate.tanekoji_rate
-          @dekoji_rate = koji_rate.dekoji_rate
-        end
-
-        def self.create(x)
-          if self===x
-            x
-          else
-            new(x)
-          end
-        end
-
-        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)
-          else
-            x, y = other.coerce(self)
-            x + y
-          end
-        end
-
-        def *(other)
-          if Integer===other || Float===other
-            Expected.new(@raw * other, rice_rate: @rice_rate, koji_rate: @koji_rate)
-          else
-            x, y = other.coerce(self)
-            x * y
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Toji
-  module Ingredient
-    module Koji
-      module ExpectedFermentable
-        def tanekoji
-          @raw * @tanekoji_rate
-        end
-
-        def dekoji
-          @raw + @raw * @dekoji_rate
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/koji.rb

@@ -1,19 +0,0 @@
-require 'toji/ingredient/koji/base'
-require 'toji/ingredient/koji/expected_fermentable'
-require 'toji/ingredient/koji/expected'
-require 'toji/ingredient/koji/actual_fermentable'
-require 'toji/ingredient/koji/actual'
-
-module Toji
-  module Ingredient
-    module Koji
-      def self.expected(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT, koji_rate: Recipe::KojiRate::DEFAULT)
-        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)
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      class ActualRice
-        include Base
-        include ActualSteamable
-
-        def initialize(raw, soaked, steaming_water, steamed, cooled)
-          @raw = raw
-          @soaked = soaked
-          @steaming_water = steaming_water
-          @steamed = steamed
-          @cooled = cooled
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      module ActualSteamable
-        def soaked_rate
-          soaking_water / raw
-        end
-
-        def soaking_water
-          soaked - raw
-        end
-
-        def before_steaming_rate
-          # TODO
-        end
-
-        def steamed_rate
-          (steamed - raw) / raw 
-        end
-
-        def cooled_rate
-          (cooled - raw) / raw
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      module Base
-        # 白米
-        attr_reader :raw
-
-        # 浸漬米吸水率
-        #
-        # 標準的な白米吸水率は掛米で30〜35%、麹米で33%前後で許容範囲はかなり狭い
-        #
-        # 出典: 酒造教本 P38
-        attr_reader :soaked_rate
-        attr_reader :soaking_water
-        attr_reader :soaked
-
-        # 蒸米吸水率
-        #
-        # 蒸しにより通常甑置き前の浸漬白米の重量よりさらに12〜13%吸水する
-        # 蒸しにより吸水の増加が13%を超える場合は、蒸米の表面が柔らかくべとつく蒸米になりやすい
-        # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
-        #
-        # 出典: 酒造教本 P48
-        attr_reader :steamed_rate
-        attr_reader :steaming_water
-        attr_reader :steamed
-
-        # 放冷
-        #
-        # 冷却法で若干異なるが蒸米の冷却により掛米で白米重量の10%、麹米で8%程度の水が失われる
-        # 出典: 酒造教本 P49
-        #
-        # 麹を造るのに適した蒸米は、引込時の吸水率が33%を理想とし、許容幅はプラスマイナス1%である
-        # 出典: 酒造教本 P59
-        attr_reader :cooled_rate
-        attr_reader :cooled
-      end
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      class Expected
-        include Base
-        include ExpectedSteamable
-
-        def initialize(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT)
-          @raw = raw.to_f
-
-          @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
-
-        def +(other)
-          if Base===other
-            Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
-          else
-            x, y = other.coerce(self)
-            x + y
-          end
-        end
-
-        def *(other)
-          if Integer===other || Float===other
-            self.class.new(@raw * other, rice_rate: @rice_rate)
-          else
-            x, y = other.coerce(self)
-            x * y
-          end
-        end
-
-        def self.create(x)
-          if self===x
-            x
-          else
-            new(x)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module Toji
-  module Ingredient
-    module Rice
-      module ExpectedSteamable
-        def soaking_water
-          @raw * @soaked_rate
-        end
-
-        def soaked
-          @raw + @raw * @soaked_rate
-        end
-
-        def steaming_water
-          if @before_steaming_rate
-            @raw * (@before_steaming_rate - @soaked_rate)
-          end
-        end
-
-        def steamed
-          @raw + @raw * @steamed_rate
-        end
-
-        def cooled
-          @raw + @raw * @cooled_rate
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/rice.rb

@@ -1,19 +0,0 @@
-require 'toji/ingredient/rice/base'
-require 'toji/ingredient/rice/expected_steamable'
-require 'toji/ingredient/rice/expected'
-require 'toji/ingredient/rice/actual_steamable'
-require 'toji/ingredient/rice/actual'
-
-module Toji
-  module Ingredient
-    module Rice
-      def self.expected(raw, rice_rate: Recipe::RiceRate::Cooked::DEFAULT)
-        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)
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module Toji
-  module Ingredient
-    module Yeast
-      module Base
-        # 1リットル醸造のために必要な酵母の量
-        attr_reader :yeast_rate
-
-        # 乾燥酵母を戻すのに必要な水の量
-        attr_reader :water_rate
-
-        def yeast
-          @total * yeast_rate / 1000.0
-        end
-
-        def water
-          yeast * water_rate
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/yeast/red_star.rb

@@ -1,30 +0,0 @@
-module Toji
-  module Ingredient
-    module Yeast
-      # RedStar酵母
-      #
-      # 容量        5g
-      # 醸造可能量  20〜23L
-      #
-      # ドライイーストは、生イーストの保存性を高めるために、その水分を大部分除いたものです。
-      # 使用時にはイーストの10倍以上の30-35℃の無菌のお湯（ミネラルウオーターや湯冷まし）で20-25分程度なじませてください。
-      # これにより水分を再吸収させると同 時に発酵力を回復させ、生イーストの状態にもどします。
-      # このときの温湯の温度が、イーストの発酵力に影響します
-      class RedStar
-        include Base
-
-        def initialize(total)
-          @total = total
-        end
-
-        def yeast_rate
-          5.0 / 20.0
-        end
-
-        def water_rate
-          10.0
-        end
-      end
-    end
-  end
-end

data/lib/toji/ingredient/yeast.rb

@@ -1,9 +0,0 @@
-require 'toji/ingredient/yeast/base'
-require 'toji/ingredient/yeast/red_star'
-
-module Toji
-  module Ingredient
-    module Yeast
-    end
-  end
-end

data/lib/toji/ingredient.rb

@@ -1,8 +0,0 @@
-require 'toji/ingredient/rice'
-require 'toji/ingredient/koji'
-require 'toji/ingredient/yeast'
-
-module Toji
-  module Ingredient
-  end
-end