toji 2.2.0 → 2.5.0

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
             }
@@ -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.states.length && 0<@brew.day_offset
+          if 0<@brew.wrapped_states.length && 0<@brew.day_offset
             result = result.map{|h|
               h[:x].unshift(0)
               h[:y].unshift(nil)
@@ -84,8 +84,8 @@ module Toji
             }
           end
 
-          #if 0<@brew.states.length && @brew.states.last.time.strftime("%T")!="00:00:00"
-          #  t = @brew.states.last.elapsed_time_with_offset
+          #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
           #  t -= (t % DAY) - DAY
           #
           #  result = result.map{|h|
@@ -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,
@@ -117,28 +117,7 @@ module Toji
           }
         end
 
-        def state_group_by(group_by)
-          group = {}
-          prev = nil
-
-          @brew.each {|state|
-            val = state.send(group_by) || prev
-            prev = val
-
-            group[val] ||= []
-            group[val] << state
-          }
-
-          group
-        end
-
-        def state_group_count(group_by)
-          state_group_by(group_by).map{|val,states|
-            [val, states.length]
-          }.to_h
-        end
-
-        def table_data(keys=nil, group_by=nil, group_count=nil)
+        def table_data(keys=nil)
           if !keys
             keys = @brew.has_keys
             keys.delete(:elapsed_time)
@@ -151,33 +130,19 @@ module Toji
             keys &= @brew.has_keys
           end
 
-          if group_by && group_count
-            brew_hash = state_group_by(group_by)
-          else
-            group_count = state_group_count(:itself)
-            brew_hash = state_group_by(:itself)
-          end
-
           rows = []
-          group_count.each {|group_value,num|
-            states = brew_hash[group_value] || []
-            num ||= states.length
-
-            num.times {|i|
-              state = states[i]
-
-              rows << keys.map {|k|
-                v = state&.send(k)
-                if Array===v
-                  v.map(&:to_s).join(", ")
-                elsif Float===v
-                  v.round(3)
-                elsif v
-                  v
-                else
-                  ""
-                end
-              }
+          @brew.wrapped_states.each {|state|
+            rows << keys.map {|k|
+              v = state&.send(k)
+              if Array===v
+                v.map(&:to_s).join(", ")
+              elsif Float===v
+                v.round(3).to_s
+              elsif v
+                v.to_s
+              else
+                ""
+              end
             }
           }
 

data/lib/toji/brew/koji.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Koji < Base
+    module Koji
+      include Base
 
       def progress(name: nil, dash: :solid, enable_annotations: true)
         Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)

data/lib/toji/brew/moromi.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Moromi < Base
+    module Moromi
+      include Base
 
       attr_accessor :prefix_day_labels
 

data/lib/toji/brew/shubo.rb

@@ -1,6 +1,7 @@
 module Toji
   module Brew
-    class Shubo < Base
+    module Shubo
+      include Base
 
       def progress(name: nil, dash: :solid, enable_annotations: true)
         Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)

data/lib/toji/brew/state.rb

@@ -98,7 +98,7 @@ module Toji
       def self.create(val)
         if State===val
           val
-        elsif StateWrapper==val
+        elsif WrappedState==val
           val.state
         #elsif Hash===val
         #  #s = Class.new {

data/lib/toji/brew/{state_wrapper.rb → wrapped_state.rb}

@@ -2,7 +2,7 @@ require 'forwardable'
 
 module Toji
   module Brew
-    class StateWrapper
+    class WrappedState
       extend Forwardable
 
       attr_accessor :elapsed_time
@@ -21,8 +21,9 @@ module Toji
       def_delegators :@state, :warmings
       def_delegators :@state, :note
 
-      def initialize(elapsed_time, state, brew)
-        @elapsed_time = elapsed_time
+      def initialize(state, brew)
+        @elapsed_time = state.elapsed_time
+        @time = state.time
         @state = state
         @brew = brew
       end
@@ -69,8 +70,8 @@ module Toji
       def display_time(format="%m/%d %H:%M")
         if @time
           @time.strftime(format)
-        elsif @brew.min_time
-          time = @brew.min_time + @elapsed_time
+        elsif @brew.base_time
+          time = @brew.base_time + @elapsed_time
           time.strftime(format)
         else
           utc_offset = Time.at(0).utc_offset
@@ -103,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/ingredient/kake.rb

@@ -9,8 +9,8 @@ module Toji
         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)
+      def self.actual(raw, soaked, steamed, cooled)
+        Actual.new(raw, soaked, steamed, cooled)
       end
     end
   end

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

@@ -5,17 +5,16 @@ module Toji
         include Base
         include Rice::ActualSteamable
 
-        def initialize(raw, soaked, steaming_water, steamed, cooled)
-          @raw = raw
-          @soaked = soaked
-          @steaming_water = steaming_water
-          @steamed = steamed
-          @cooled = cooled
+        def initialize(raw, soaked, steamed, cooled)
+          @raw = raw.to_f
+          @soaked = soaked.to_f
+          @steamed = steamed.to_f
+          @cooled = cooled.to_f
         end
 
         def *(other)
           if Integer===other || Float===other
-            Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other)
+            Actual.new(raw * other, soaked * other, steamed * other, cooled * other)
           else
             x, y = other.coerce(self)
             x * y

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

@@ -6,7 +6,7 @@ module Toji
 
         def +(other)
           if Base===other
-            Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
+            Actual.new(raw + other.raw, soaked + other.soaked, steamed + other.steamed, cooled + other.cooled)
           else
             x, y = other.coerce(self)
             x + y

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

@@ -10,7 +10,6 @@ module Toji
 
           @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

data/lib/toji/ingredient/koji.rb

@@ -11,8 +11,8 @@ module Toji
         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)
+      def self.actual(raw, soaked, steamed, cooled, tanekoji, dekoji)
+        Actual.new(raw, soaked, steamed, cooled, tanekoji, dekoji)
       end
     end
   end

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

@@ -6,19 +6,18 @@ module Toji
         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
+        def initialize(raw, soaked, steamed, cooled, tanekoji, dekoji)
+          @raw = raw.to_f
+          @soaked = soaked.to_f
+          @steamed = steamed.to_f
+          @cooled = cooled.to_f
+          @tanekoji = tanekoji.to_f
+          @dekoji = dekoji.to_f
         end
 
         def *(other)
           if Integer===other || Float===other
-            Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
+            Actual.new(raw * other, soaked * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
           else
             x, y = other.coerce(self)
             x * y

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

@@ -23,7 +23,7 @@ module Toji
 
         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)
+            Actual.new(raw + other.raw, soaked + other.soaked, steamed + other.steamed, cooled + other.cooled, tanekoji + other.tanekoji, dekoji + other.dekoji)
           else
             x, y = other.coerce(self)
             x + y

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

@@ -11,7 +11,6 @@ module Toji
 
           @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
 

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

@@ -10,14 +10,14 @@ module Toji
           soaked - raw
         end
 
-        def before_steaming_rate
-          # TODO
-        end
-
         def steamed_rate
           (steamed - raw) / raw 
         end
 
+        def steaming_water
+          steamed - raw
+        end
+
         def cooled_rate
           (cooled - raw) / raw
         end

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

@@ -21,7 +21,6 @@ module Toji
         # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
         #
         # 出典: 酒造教本 P48
-        attr_reader :before_steaming_rate
         attr_reader :steamed_rate
         attr_reader :steaming_water
         attr_reader :steamed

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

@@ -11,9 +11,7 @@ module Toji
         end
 
         def steaming_water
-          if before_steaming_rate
-            raw * (before_steaming_rate - soaked_rate)
-          end
+          raw * steamed_rate
         end
 
         def steamed

data/lib/toji/ingredient/rice_rate.rb

@@ -4,32 +4,20 @@ module Toji
       # 浸漬米吸水率
       attr_reader :soaked_rate
 
-      # 蒸し前浸漬米吸水率
-      # 炊飯の場合は水を追加
-      # 蒸しの場合は一晩経って蒸発した分を削減
-      attr_reader :before_steaming_rate
-
       # 蒸米吸水率
       attr_reader :steamed_rate
 
       # 放冷後蒸米吸水率
       attr_reader :cooled_rate
 
-      def initialize(soaked_rate, before_steaming_rate, steamed_rate, cooled_rate)
+      def initialize(soaked_rate, steamed_rate, cooled_rate)
         @soaked_rate = soaked_rate
-        @before_steaming_rate = before_steaming_rate
         @steamed_rate = steamed_rate
         @cooled_rate = cooled_rate
       end
 
-      def before_steaming_rate
-        @before_steaming_rate || begin
-          @soaked_rate - 0.04
-        end
-      end
-
 
-      DEFAULT = new(0.33, nil, 0.41, 0.33)
+      DEFAULT = new(0.33, 0.41, 0.33)
     end
   end
 end

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

@@ -15,9 +15,9 @@ module Toji
       }
     end
 
-    def round(ndigit=0, half: :up)
+    def round(ndigit=0, mini_ndigit=nil, half: :up)
       new_steps = steps.map {|step|
-        step.round(ndigit, half: half)
+        step.round(ndigit, mini_ndigit, half: half)
       }
 
       self.class.new.tap {|o|
@@ -25,15 +25,6 @@ module Toji
       }
     end
 
-    # 内容量の累計
-    def cumulative_weight_totals
-      weight_total = steps.map(&:weight_total)
-
-      weight_total.map.with_index {|x,i|
-        weight_total[0..i].inject(:+)
-      }
-    end
-
     # 総米の累計
     def cumulative_rice_totals
       rice_total = steps.map(&:rice_total)
@@ -78,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|