toji 2.12.0 → 2.16.0

data/lib/toji/{brew/graph/progress.rb → progress/graph/progress_note.rb}

@@ -1,7 +1,7 @@
 module Toji
-  module Brew
+  module Progress
     module Graph
-      class Progress
+      class ProgressNote
 
         PLOT_KEYS = [:temps, :preset_temp, :room_temp, :room_psychrometry, :baume, :acid, :amino_acid, :alcohol, :bmd].freeze
 
@@ -26,13 +26,13 @@ module Toji
           :dashdot,
         ].freeze
 
-        attr_reader :brew
+        attr_reader :progress
         attr_accessor :name
         attr_accessor :dash
         attr_accessor :enable_annotations
 
-        def initialize(brew, name: nil, dash: :solid, enable_annotations: true)
-          @brew = brew
+        def initialize(progress, name: nil, dash: :solid, enable_annotations: true)
+          @progress = progress
           @name = name
           @dash = dash
           @enable_annotations = enable_annotations
@@ -40,7 +40,7 @@ module Toji
 
         def plot_data(keys=nil, use_name=false)
           if !keys
-            keys = @brew.has_keys
+            keys = @progress.has_keys
           end
 
           name = ""
@@ -56,7 +56,7 @@ module Toji
             xs = []
             ys = []
             text = []
-            @brew.wrapped_states.each {|s|
+            @progress.states.each {|s|
               val = s.send(key)
               if val
                 [val].flatten.each_with_index {|v,i|
@@ -75,7 +75,7 @@ module Toji
             result << {x: xs, y: ys, text: text, name: "#{name}#{key}", line: {dash: @dash, shape: line_shape}, marker: {color: PLOT_COLORS[key]}}
           }
 
-          if 0<@brew.wrapped_states.length && 0<@brew.day_offset
+          if 0<@progress.states.length && 0<@progress.day_offset
             result = result.map{|h|
               h[:x].unshift(0)
               h[:y].unshift(nil)
@@ -84,8 +84,8 @@ module Toji
             }
           end
 
-          #if 0<@brew.wrapped_states.length && @brew.wrapped_states.last.time.strftime("%T")!="00:00:00"
-          #  t = @brew.wrapped_states.last.elapsed_time_with_offset
+          #if 0<@progress.states.length && @progress.states.last.time.strftime("%T")!="00:00:00"
+          #  t = @progress.states.last.elapsed_time_with_offset
           #  t -= (t % DAY) - DAY
           #
           #  result = result.map{|h|
@@ -102,7 +102,7 @@ module Toji
         def annotations
           return [] if !@enable_annotations
 
-          @brew.wrapped_states.select{|s| s.mark}.map {|s|
+          @progress.states.select{|s| s.mark}.map {|s|
             {
               x: s.elapsed_time_with_offset,
               y: s.temps.first || 0,
@@ -119,19 +119,21 @@ module Toji
 
         def table_data(keys=nil)
           if !keys
-            keys = @brew.has_keys
+            keys = @progress.has_keys
             keys.delete(:elapsed_time)
             keys.delete(:time)
             keys.delete(:day)
             keys.delete(:moromi_day)
-            keys.delete(:baume)
-            keys.delete(:nihonshudo)
+            if keys.include?(:display_baume)
+              keys.delete(:baume)
+              keys.delete(:nihonshudo)
+            end
           else
-            keys &= @brew.has_keys
+            keys &= @progress.has_keys
           end
 
           rows = []
-          @brew.wrapped_states.each {|state|
+          @progress.states.each {|state|
             rows << keys.map {|k|
               v = state&.send(k)
               if Array===v
@@ -155,8 +157,8 @@ module Toji
             layout: {
               xaxis: {
                 dtick: DAY,
-                tickvals: @brew.days.times.map{|d| d*DAY},
-                ticktext: @brew.day_labels
+                tickvals: @progress.days.times.map{|d| d*DAY},
+                ticktext: @progress.day_labels
               },
               annotations: annotations,
             }

data/lib/toji/progress/koji_progress.rb

@@ -0,0 +1,15 @@
+module Toji
+  module Progress
+    module KojiProgress
+      include BaseProgress
+
+      def all_keys
+        KojiState::REQUIRED_KEYS + KojiState::OPTIONAL_KEYS
+      end
+
+      def progress_note(name: nil, dash: :solid, enable_annotations: true)
+        Graph::ProgressNote.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
+      end
+    end
+  end
+end

data/lib/toji/progress/koji_state.rb

@@ -0,0 +1,23 @@
+module Toji
+  module Progress
+    module KojiState
+      include BaseState
+
+      OPTIONAL_KEYS = [
+        :temps,
+        :preset_temp,
+        :room_temp,
+        :room_psychrometry,
+
+        :note,
+      ].freeze
+
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
+
+      # @dynamic note
+    end
+  end
+end

data/lib/toji/{brew/moromi.rb → progress/moromi_progress.rb}

@@ -1,9 +1,9 @@
 module Toji
-  module Brew
-    module Moromi
-      include Base
+  module Progress
+    module MoromiProgress
+      include BaseProgress
 
-      attr_accessor :prefix_day_labels
+      # @dynamic prefix_day_labels
 
       def moromi_tome_day
         prefix_day_labels&.length
@@ -28,8 +28,12 @@ module Toji
         end
       end
 
-      def progress(name: nil, dash: :solid, enable_annotations: true)
-        Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
+      def all_keys
+        MoromiState::REQUIRED_KEYS + MoromiState::OPTIONAL_KEYS
+      end
+
+      def progress_note(name: nil, dash: :solid, enable_annotations: true)
+        Graph::ProgressNote.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
       end
 
       def bmd

data/lib/toji/progress/moromi_state.rb

@@ -0,0 +1,77 @@
+module Toji
+  module Progress
+    module MoromiState
+      include BaseState
+
+      OPTIONAL_KEYS = [
+        :moromi_day,
+        :temps,
+        :preset_temp,
+        :room_temp,
+        :room_psychrometry,
+
+        :baume,
+        :nihonshudo,
+        :display_baume,
+        :acid,
+        :amino_acid,
+        :alcohol,
+        :bmd,
+
+        :warmings,
+        :note,
+      ].freeze
+
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
+
+      # @dynamic baume
+      # @dynamic nihonshudo
+      # @dynamic acid
+      # @dynamic amino_acid
+      # @dynamic alcohol
+
+      # @dynamic warmings
+      # @dynamic note
+
+      def moromi_day
+        _tome_day = progress.moromi_tome_day
+        _now_day = day
+
+        if _tome_day && _tome_day < _now_day
+          _now_day - _tome_day + 1
+        end
+      end
+
+      def display_baume
+        _baume = baume
+        if _baume
+          if _baume<3.0
+            nihonshudo
+          else
+            _baume
+          end
+        end
+      end
+
+      def bmd
+        _moromi_day = moromi_day
+        _baume = baume
+
+        if _moromi_day && _baume
+          _moromi_day * _baume
+        end
+      end
+
+      def expected_alcohol(target_alc, target_nihonshudo, coef)
+        _baume = baume
+
+        if _baume
+          target_alc - (_baume - target_nihonshudo * -0.1) * coef
+        end
+      end
+    end
+  end
+end

data/lib/toji/progress/moto_progress.rb

@@ -0,0 +1,15 @@
+module Toji
+  module Progress
+    module MotoProgress
+      include BaseProgress
+
+      def all_keys
+        MotoState::REQUIRED_KEYS + MotoState::OPTIONAL_KEYS
+      end
+
+      def progress_note(name: nil, dash: :solid, enable_annotations: true)
+        Graph::ProgressNote.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
+      end
+    end
+  end
+end

data/lib/toji/progress/moto_state.rb

@@ -0,0 +1,31 @@
+module Toji
+  module Progress
+    module MotoState
+      include BaseState
+
+      OPTIONAL_KEYS = [
+        :temps,
+        :preset_temp,
+        :room_temp,
+        :room_psychrometry,
+
+        :baume,
+        :acid,
+
+        :warmings,
+        :note,
+      ].freeze
+
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
+
+      # @dynamic baume
+      # @dynamic acid
+
+      # @dynamic warmings
+      # @dynamic note
+    end
+  end
+end

data/lib/toji/progress/progress.rb

@@ -0,0 +1,16 @@
+module Toji
+  module Progress
+    module Progress
+      # @dynamic states
+      # @dynamic date_line
+
+      # @dynamic base_time
+      # @dynamic day_offset
+      # @dynamic days
+      # @dynamic day_labels
+
+      # @dynamic all_keys
+      # @dynamic has_keys
+    end
+  end
+end

data/lib/toji/progress/state.rb

@@ -0,0 +1,22 @@
+require 'toji/progress/state/baume_to_nihonshudo'
+require 'toji/progress/state/nihonshudo_to_baume'
+
+module Toji
+  module Progress
+    module State
+      # @dynamic progress
+      # @dynamic progress=
+
+      # @dynamic time
+      # @dynamic time=
+      # @dynamic mark
+      # @dynamic mark=
+
+      # @dynamic elapsed_time
+      # @dynamic elapsed_time_with_offset
+      # @dynamic day
+      # @dynamic day_label
+      # @dynamic display_time
+    end
+  end
+end

data/lib/toji/progress/state/baume_to_nihonshudo.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Progress
+    module State
+      module BaumeToNihonshudo
+        def nihonshudo
+          if self.baume
+            self.baume * -10
+          end
+        end
+
+        def nihonshudo=(val)
+          if val
+            self.baume = val.to_f / -10.0
+          else
+            self.baume = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/progress/state/nihonshudo_to_baume.rb

@@ -0,0 +1,21 @@
+module Toji
+  module Progress
+    module State
+      module NihonshudoToBaume
+        def baume
+          if self.nihonshudo
+            self.nihonshudo / -10.0
+          end
+        end
+
+        def baume=(val)
+          if val
+            self.nihonshudo = val.to_f * -10
+          else
+            self.nihonshudo = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/recipe.rb

@@ -4,42 +4,42 @@ require 'toji/recipe/ab_expect'
 
 module Toji
   module Recipe
-    attr_accessor :steps
-    attr_accessor :actions
-    attr_accessor :has_moto
-    attr_accessor :has_moromi
-    attr_accessor :ab_coef
-    attr_accessor :ab_expects
-
-    def scale(rice_total)
-      rate = rice_total / steps.map(&:rice_total).sum
-      new_steps = steps.map {|step|
-        step * rate
+    # @dynamic steps
+    # @dynamic actions
+    # @dynamic ab_coef
+    # @dynamic ab_expects
+
+    def scale_rice_total(rice_total)
+      ratio = rice_total.to_f / steps.map(&:rice_total).sum
+      scale(ratio)
+    end
+
+    def scale!(ratio)
+      steps.each {|step|
+        step.scale!(ratio)
       }
+      self
+    end
+
+    def scale(ratio)
+      Utils.check_dup(self)
+
+      dst = self.dup
+      dst.scale!(ratio)
+    end
 
-      self.class.new.tap {|o|
-        o.steps = new_steps
-        o.actions = actions.deep_dup
-        o.has_moto = has_moto
-        o.has_moromi = has_moromi
-        o.ab_coef = ab_coef
-        o.ab_expects = ab_expects.deep_dup
+    def round!(ndigit=0, mini_ndigit=nil, half: :up)
+      steps.each {|step|
+        step.round!(ndigit, mini_ndigit, half: half)
       }
+      self
     end
 
     def round(ndigit=0, mini_ndigit=nil, half: :up)
-      new_steps = steps.map {|step|
-        step.round(ndigit, mini_ndigit, half: half)
-      }
+      Utils.check_dup(self)
 
-      self.class.new.tap {|o|
-        o.steps = new_steps
-        o.actions = actions.deep_dup
-        o.has_moto = has_moto
-        o.has_moromi = has_moromi
-        o.ab_coef = ab_coef
-        o.ab_expects = ab_expects.deep_dup
-      }
+      dst = self.dup
+      dst.round!(ndigit, mini_ndigit, half: half)
     end
 
     # 総米の累計
@@ -52,7 +52,7 @@ module Toji
     end
 
     # 酒母歩合の累計
-    def cumulative_moto_rates
+    def cumulative_moto_ratios
       rice_total = steps.map(&:rice_total)
       moto = rice_total.first
 
@@ -67,8 +67,8 @@ module Toji
     # 汲水歩合が大きい高温糖化酒母では6%程度である
     #
     # 出典: 酒造教本 P96
-    def moto_rate
-      cumulative_moto_rates.last || 0.0
+    def moto_ratio
+      cumulative_moto_ratios.last || 0.0
     end
 
     # 白米比率
@@ -79,22 +79,34 @@ module Toji
     #   湧き抑え型     1   2   4   7  長期醪、甘口、おだやかな酒質
     #
     # 出典: 酒造教本 P95
-    def rice_rates
+    def rice_ratios
       steps.map {|step|
         step.rice_total / steps.first.rice_total
       }
     end
 
     def table_data
-      headers = [""] + steps.map.with_index{|s,i| :"step#{i}"} + [:total]
-      keys = [:rice_total, :kake, :koji, :alcohol, :water, :lactic_acid]
+      headers = [""] + steps.map.with_index{|s,i| :"Step#{i}"} + [:total]
+      keys = [["RiceTotal", :rice_total], ["Kake", :kakes], ["Koji", :kojis], ["Alcohol", :alcohols], ["Water", :waters], ["LacticAcid", :lactic_acids]]
 
-      cells = [keys]
+      cells = [keys.map(&:first)]
       cells += steps.map {|step|
-        [step.rice_total, step.kake, step.koji, step.alcohol, step.water, step.lactic_acid]
+        keys.map(&:last).map {|key|
+          vals = step.send(key)
+          if Numeric===vals
+            vals
+          else
+            vals.compact.map(&:weight).sum
+          end
+        }
       }
-      cells << keys.map {|key|
-        steps.map(&key).compact.sum
+      cells << keys.map(&:last).map {|key|
+        vals = steps.map(&key)
+        if Numeric===vals[0]
+          vals.sum
+        else
+          vals.flatten.compact.map(&:weight).sum
+        end
       }
 
       cells = cells.map {|cell|